claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not allow mouse capturing if no mouse configured, patch from VARCem;

Browse Source 
Reimplemented saving of all the non-volatile things of the Toshiba T1000 and T1200;
Applied the latest T1200 patch from John Elliott;
Applied the latest ATI Korean VGA patch from greatpsycho.
This commit is contained in:
OBattler
2018-03-19 04:19:19 +01:00
parent 089041a5f3
commit 473fd383d2
10 changed files with 234 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
src/machine/m_xt_t1000.c
View File

@@ -51,7 +51,7 @@
* NOTE: Still need to figure out a way to load/save ConfigSys and
* HardRAM stuff. Needs to be linked in to the NVR code.
*
* Version: @(#)m_xt_t1000.c 1.0.3 2018/03/18
* Version: @(#)m_xt_t1000.c 1.0.4 2018/03/19
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -96,6 +96,7 @@
#include "../device.h"
#include "../keyboard.h"
#include "../lpt.h"
#include "../mem.h"
#include "../floppy/fdd.h"
#include "../floppy/fdc.h"
#include "../game/gameport.h"
@@ -141,7 +142,8 @@ typedef struct {
mem_mapping_t rom_mapping;
/* CONFIG.SYS drive. */
uint8_t config[160];
uint8_t t1000_nvram[160];
uint8_t t1200_nvram[160];
/* System control registers */
uint8_t sys_ctl[16];
@@ -153,6 +155,7 @@ typedef struct {
uint8_t nvr_tick;
int nvr_addr;
uint8_t nvr_active;
mem_mapping_t nvr_mapping; /* T1200 NVRAM mapping */
/* EMS data */
uint8_t ems_reg[4];
@@ -662,7 +665,7 @@ t1000_read_nvram(uint16_t addr, void *priv)
switch (addr) {
case 0xc2: /* Read next byte from NVRAM */
if (sys->nvr_addr >= 0 && sys->nvr_addr < 160)
if (sys->nvr_addr >= 0 && sys->nvr_addr < 160)
tmp = sys->t1000_nvram[sys->nvr_addr];
sys->nvr_addr++;
break;
@@ -696,9 +699,9 @@ t1000_write_nvram(uint16_t addr, uint8_t val, void *priv)
break;
case 0xc1: /* Write next byte to NVRAM */
if (sys->nvr_addr >= 0 && sys->nvr_addr < 160) {
if (sys->nvr_addr >= 0 && sys->nvr_addr < 160) {
if (sys->t1000_nvram[sys->nvr_addr] != val)
nvr_dosave = 1;
nvr_dosave = 1;
sys->t1000_nvram[sys->nvr_addr] = val;
}
sys->nvr_addr++;
@@ -722,6 +725,26 @@ t1000_write_nvram(uint16_t addr, uint8_t val, void *priv)
}
}
static
uint8_t read_t1200_nvram(uint32_t addr, void *priv)
{
t1000_t *sys = (t1000_t *)priv;
return sys->t1200_nvram[addr & 0x7FF];
}
static void write_t1200_nvram(uint32_t addr, uint8_t value, void *priv)
{
t1000_t *sys = (t1000_t *)priv;
if (sys->t1200_nvram[addr & 0x7FF] != value)
nvr_dosave = 1;
sys->t1200_nvram[addr & 0x7FF] = value;
}
/* Port 0xC8 controls the ROM drive */
static uint8_t
@@ -898,6 +921,12 @@ machine_xt_t1200_init(const machine_t *model)
read_ctl,NULL,NULL, write_ctl,NULL,NULL, &t1000);
machine_common_init(model);
mem_mapping_add(&t1000.nvr_mapping,
0x000f0000, 2048,
read_t1200_nvram, NULL, NULL,
write_t1200_nvram, NULL, NULL,
NULL, 0, &t1000);
pit_set_out_func(&pit, 1, pit_refresh_timer_xt);
device_add(&keyboard_xt_device);
@@ -918,36 +947,62 @@ t1000_syskey(uint8_t andmask, uint8_t ormask, uint8_t xormask)
t1000.syskeys ^= xormask;
}
#if 0
static void
t1000_configsys_load(void)
{
FILE *f;
memset(t1000.t1000_nvram, 0x1a, sizeof(t1000.t1000_nvram));
f = plat_fopen(nvr_path(L"t1000_config.nvr"), L"rb");
if (f != NULL) {
if (f != NULL) {
fread(t1000.t1000_nvram, sizeof(t1000.t1000_nvram), 1, f);
fclose(f);
}
}
static void
t1000_configsys_save(void)
{
FILE *f;
f = plat_fopen(nvr_path(L"t1000_config.nvr"), L"wb");
if (f != NULL) {
if (f != NULL) {
fwrite(t1000.t1000_nvram, sizeof(t1000.t1000_nvram), 1, f);
fclose(f);
}
}
static void
t1200_state_load(void)
{
FILE *f;
memset(t1000.t1200_nvram, 0x1a, sizeof(t1000.t1200_nvram));
f = plat_fopen(nvr_path(L"t1200_state.nvr"), L"rb");
if (f != NULL) {
fread(t1000.t1200_nvram, sizeof(t1000.t1200_nvram), 1, f);
fclose(f);
}
}
static void
t1200_state_save(void)
{
FILE *f;
f = plat_fopen(nvr_path(L"t1200_state.nvr"), L"wb");
if (f != NULL) {
fwrite(t1000.t1200_nvram, sizeof(t1000.t1200_nvram), 1, f);
fclose(f);
}
}
/* All RAM beyond 512k is non-volatile */
/* All RAM beyond 512k is non-volatile */
static void
t1000_emsboard_load(void)
{
@@ -962,7 +1017,7 @@ t1000_emsboard_load(void)
}
}
static void
t1000_emsboard_save(void)
{
@@ -975,4 +1030,35 @@ t1000_emsboard_save(void)
fclose(f);
}
}
}
}
void
t1000_nvr_load(void)
{
t1000_emsboard_load();
t1000_configsys_load();
}
void
t1000_nvr_save(void)
{
t1000_emsboard_save();
t1000_configsys_save();
}
void
t1200_nvr_load(void)
{
t1000_emsboard_load();
t1200_state_load();
}
void
t1200_nvr_save(void)
{
t1000_emsboard_save();
t1200_state_save();

10
src/machine/m_xt_t1000.h
View File

@@ -8,7 +8,7 @@
*
* Definitions for the Toshiba T1000/T1200 machines.
*
* Version: @(#)m_xt_t1000.h 1.0.3 2018/03/18
* Version: @(#)m_xt_t1000.h 1.0.4 2018/03/19
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -49,11 +49,11 @@ extern void t1000_display_set(uint8_t internal);
extern void t1000_syskey(uint8_t amask, uint8_t omask, uint8_t xmask);
extern void t1000_configsys_load(void);
extern void t1000_configsys_save(void);
extern void t1000_nvr_load(void);
extern void t1000_nvr_save(void);
extern void t1000_emsboard_load(void);
extern void t1000_emsboard_save(void);
extern void t1200_nvr_load(void);
extern void t1200_nvr_save(void);
#endif /*MACHINE_T1000_H*/