80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

More PS/1 model 2133 fixes.

Browse Source
This commit is contained in:
OBattler
2021-04-29 07:36:16 +02:00
parent 2758f3e4f5
commit 8fe4decd95
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/86box/sio.h
View File

@@ -52,6 +52,7 @@ extern const device_t pc87311_ide_device;
extern const device_t pc87332_device; extern const device_t pc87332_device;
extern const device_t pc87332_398_device; extern const device_t pc87332_398_device;
extern const device_t pc87332_398_ide_device; extern const device_t pc87332_398_ide_device;
extern const device_t pc87332_398_ide_fdcon_device;
extern const device_t pc97307_device; extern const device_t pc97307_device;
extern const device_t prime3b_device; extern const device_t prime3b_device;
extern const device_t prime3b_ide_device; extern const device_t prime3b_ide_device;

8
src/machine/m_ps1.c
View File

@@ -460,6 +460,8 @@ ps1_setup(int model)
mem_remap_top(384); mem_remap_top(384);
device_add(&ps_nvr_device);
if (model == 2011) { if (model == 2011) {
rom_init(&ps->high_rom, rom_init(&ps->high_rom,
"roms/machines/ibmps1es/f80000.bin", "roms/machines/ibmps1es/f80000.bin",
@@ -511,8 +513,6 @@ ps1_common_init(const machine_t *model)
dma16_init(); dma16_init();
pic2_init(); pic2_init();
device_add(&ps_nvr_device);
device_add(&keyboard_ps2_ps1_device); device_add(&keyboard_ps2_ps1_device);
/* Audio uses ports 200h and 202-207h, so only initialize gameport on 201h. */ /* Audio uses ports 200h and 202-207h, so only initialize gameport on 201h. */
@@ -571,9 +571,11 @@ machine_ps1_m2133_init(const machine_t *model)
return ret; return ret;
ps1_common_init(model); ps1_common_init(model);
/* The PS/1 model 2133 expects a NVR without the century register. */
device_add(&ide_isa_device); device_add(&ide_isa_device);
device_add(&at_nvr_old_device);
device_add(&pc87332_398_ide_fdcon_device);
device_add(&vl82c480_device); device_add(&vl82c480_device);
device_add(&pc87332_398_device);
nmi_mask = 0x80; nmi_mask = 0x80;

20
src/sio/sio_pc87332.c
View File

@@ -37,7 +37,7 @@
typedef struct { typedef struct {
uint8_t tries, has_ide, uint8_t tries, has_ide,
regs[15]; fdc_on, regs[15];
int cur_reg; int cur_reg;
fdc_t *fdc; fdc_t *fdc;
serial_t *uart[2]; serial_t *uart[2];
@@ -273,9 +273,9 @@ pc87332_reset(pc87332_t *dev)
{ {
memset(dev->regs, 0, 15); memset(dev->regs, 0, 15);
dev->regs[0x00] = 0x07; dev->regs[0x00] = dev->fdc_on ? 0x4f : 0x07;
if (dev->has_ide == 2) if (dev->has_ide == 2)
dev->regs[0x00] = 0x87; dev->regs[0x00] |= 0x80;
dev->regs[0x01] = 0x10; dev->regs[0x01] = 0x10;
dev->regs[0x03] = 0x01; dev->regs[0x03] = 0x01;
dev->regs[0x05] = 0x0D; dev->regs[0x05] = 0x0D;
@@ -292,7 +292,8 @@ pc87332_reset(pc87332_t *dev)
serial_handler(dev, 0); serial_handler(dev, 0);
serial_handler(dev, 1); serial_handler(dev, 1);
fdc_reset(dev->fdc); fdc_reset(dev->fdc);
fdc_remove(dev->fdc); if (!dev->fdc_on)
fdc_remove(dev->fdc);
if (dev->has_ide) if (dev->has_ide)
ide_handler(dev); ide_handler(dev);
@@ -320,6 +321,7 @@ pc87332_init(const device_t *info)
dev->uart[1] = device_add_inst(&ns16550_device, 2); dev->uart[1] = device_add_inst(&ns16550_device, 2);
dev->has_ide = (info->local >> 8) & 0xff; dev->has_ide = (info->local >> 8) & 0xff;
dev->fdc_on = (info->local >> 16) & 0xff;
pc87332_reset(dev); pc87332_reset(dev);
if ((info->local & 0xff) == (0x01)) { if ((info->local & 0xff) == (0x01)) {
@@ -362,3 +364,13 @@ const device_t pc87332_398_ide_device = {
{ NULL }, NULL, NULL, { NULL }, NULL, NULL,
NULL NULL
}; };
const device_t pc87332_398_ide_fdcon_device = {
"National Semiconductor PC87332 Super I/O (Port 398h) (With IDE and FDC on)",
0,
0x10101,
pc87332_init, pc87332_close, NULL,
{ NULL }, NULL, NULL,
NULL
};