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

Merge branch '86Box:master' into optiplex_gnplus

Browse Source
This commit is contained in:
Misaki
2025-05-18 21:55:24 +03:00
committed by GitHub
parent cdae57e7b4 a262a519cb
commit 4e3c01c41a
1 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/sio/sio_pc87309.c
View File

@@ -41,15 +41,19 @@ typedef struct pc87309_t {
uint8_t regs[48]; uint8_t regs[48];
uint8_t ld_regs[256][208]; uint8_t ld_regs[256][208];
uint8_t pm[8]; uint8_t pm[8];
uint8_t baddr;
uint16_t pm_base; uint16_t pm_base;
int cur_reg; int cur_reg;
fdc_t *fdc; fdc_t *fdc;
serial_t *uart[2]; serial_t *uart[2];
} pc87309_t; } pc87309_t;
static void fdc_handler(pc87309_t *dev); static void fdc_handler(pc87309_t *dev);
static void lpt1_handler(pc87309_t *dev); static void lpt1_handler(pc87309_t *dev);
static void serial_handler(pc87309_t *dev, int uart); static void serial_handler(pc87309_t *dev, int uart);
static void pc87309_write(uint16_t port, uint8_t val, void *priv);
static uint8_t pc87309_read(uint16_t port, void *priv);
static void static void
pc87309_pm_write(uint16_t port, uint8_t val, void *priv) pc87309_pm_write(uint16_t port, uint8_t val, void *priv)
@@ -104,6 +108,30 @@ pc87309_pm_init(pc87309_t *dev, uint16_t addr)
pc87309_pm_read, NULL, NULL, pc87309_pm_write, NULL, NULL, dev); pc87309_pm_read, NULL, NULL, pc87309_pm_write, NULL, NULL, dev);
} }
static void
superio_handler(pc87309_t *dev)
{
io_removehandler(0x15c, 0x0002,
pc87309_read, NULL, NULL, pc87309_write, NULL, NULL, dev);
io_removehandler(0x02e, 0x0002,
pc87309_read, NULL, NULL, pc87309_write, NULL, NULL, dev);
switch (dev->regs[0x21] & 0x0b) {
case 0x02:
case 0x08:
case 0x0a:
io_sethandler(0x15c, 0x0002,
pc87309_read, NULL, NULL, pc87309_write, NULL, NULL, dev);
break;
case 0x03:
case 0x09:
case 0x0b:
io_sethandler(0x02e, 0x0002,
pc87309_read, NULL, NULL, pc87309_write, NULL, NULL, dev);
break;
}
}
static void static void
fdc_handler(pc87309_t *dev) fdc_handler(pc87309_t *dev)
{ {
@@ -194,6 +222,7 @@ pc87309_write(uint16_t port, uint8_t val, void *priv)
case 0x07: case 0x07:
case 0x21: case 0x21:
dev->regs[dev->cur_reg] = val; dev->regs[dev->cur_reg] = val;
superio_handler(dev);
break; break;
case 0x22: case 0x22:
dev->regs[dev->cur_reg] = val & 0x7f; dev->regs[dev->cur_reg] = val & 0x7f;
@@ -378,7 +407,7 @@ pc87309_reset(pc87309_t *dev)
memset(dev->pm, 0x00, 0x08); memset(dev->pm, 0x00, 0x08);
dev->regs[0x20] = dev->id; dev->regs[0x20] = dev->id;
dev->regs[0x21] = 0x04; dev->regs[0x21] = 0x04 | dev->baddr;
dev->ld_regs[0x00][0x01] = 0x01; dev->ld_regs[0x00][0x01] = 0x01;
dev->ld_regs[0x00][0x30] = 0x03; dev->ld_regs[0x00][0x30] = 0x03;
@@ -453,6 +482,8 @@ pc87309_reset(pc87309_t *dev)
serial_remove(dev->uart[0]); serial_remove(dev->uart[0]);
serial_remove(dev->uart[1]); serial_remove(dev->uart[1]);
fdc_reset(dev->fdc); fdc_reset(dev->fdc);
superio_handler(dev);
} }
static void static void
@@ -472,19 +503,10 @@ pc87309_init(const device_t *info)
dev->fdc = device_add(&fdc_at_nsc_device); dev->fdc = device_add(&fdc_at_nsc_device);
dev->uart[0] = device_add_inst(&ns16550_device, 1); dev->baddr = (info->local & 0x100) ? 8 : 9;
dev->uart[1] = device_add_inst(&ns16550_device, 2);
pc87309_reset(dev); pc87309_reset(dev);
if (info->local & 0x100) {
io_sethandler(0x15c, 0x0002,
pc87309_read, NULL, NULL, pc87309_write, NULL, NULL, dev);
} else {
io_sethandler(0x02e, 0x0002,
pc87309_read, NULL, NULL, pc87309_write, NULL, NULL, dev);
}
return dev; return dev;
} }