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

Improve VT82C686 Super I/O register indexing

Browse Source
This commit is contained in:
RichardG867
2020-10-22 17:36:15 -03:00
parent f514c93033
commit e09a48372c
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/sio/sio_vt82c686.c
View File

@@ -103,20 +103,24 @@ vt82c686_write(uint16_t port, uint8_t val, void *priv)
if (!dev->config_enable) if (!dev->config_enable)
return; return;
/* NOTE: Registers are [0xE0:0xFF] but we store them as [0x00:0x1F]. */
if (!(port & 1)) { if (!(port & 1)) {
/* Registers start at 0xE0 but we cut them down to start at 0x00. */ dev->cur_reg = val;
dev->cur_reg = (val & 0x1f);
return; return;
} }
if (dev->cur_reg < 0xe0)
return;
uint8_t reg = dev->cur_reg & 0x1f;
/* Read-only registers */ /* Read-only registers */
if ((dev->cur_reg < 0x02) || (dev->cur_reg == 0x04) || (dev->cur_reg == 0x05) || ((dev->cur_reg >= 0x09) && (dev->cur_reg < 0x0e)) || if ((reg < 0x02) || (reg == 0x04) || (reg == 0x05) || ((reg >= 0x09) && (reg < 0x0e)) ||
(dev->cur_reg == 0x13) || (dev->cur_reg == 0x15) || (dev->cur_reg == 0x17) || (dev->cur_reg >= 0x19)) (reg == 0x13) || (reg == 0x15) || (reg == 0x17) || (reg >= 0x19))
return; return;
switch (dev->cur_reg) { switch (reg) {
case 0x02: case 0x02:
dev->regs[dev->cur_reg] = val; dev->regs[reg] = val;
vt82c686_lpt_handler(dev); vt82c686_lpt_handler(dev);
vt82c686_serial_handler(dev, 0); vt82c686_serial_handler(dev, 0);
vt82c686_serial_handler(dev, 1); vt82c686_serial_handler(dev, 1);
@@ -124,27 +128,27 @@ vt82c686_write(uint16_t port, uint8_t val, void *priv)
break; break;
case 0x03: case 0x03:
dev->regs[dev->cur_reg] = val; dev->regs[reg] = val;
vt82c686_fdc_handler(dev); vt82c686_fdc_handler(dev);
break; break;
case 0x06: case 0x06:
dev->regs[dev->cur_reg] = val; dev->regs[reg] = val;
vt82c686_lpt_handler(dev); vt82c686_lpt_handler(dev);
break; break;
case 0x07: case 0x07:
dev->regs[dev->cur_reg] = val; dev->regs[reg] = val;
vt82c686_serial_handler(dev, 0); vt82c686_serial_handler(dev, 0);
break; break;
case 0x08: case 0x08:
dev->regs[dev->cur_reg] = val; dev->regs[reg] = val;
vt82c686_serial_handler(dev, 1); vt82c686_serial_handler(dev, 1);
break; break;
default: default:
dev->regs[dev->cur_reg] = val; dev->regs[reg] = val;
break; break;
} }
} }
@@ -156,10 +160,13 @@ vt82c686_read(uint16_t port, void *priv)
vt82c686_t *dev = (vt82c686_t *) priv; vt82c686_t *dev = (vt82c686_t *) priv;
uint8_t ret = 0xff; uint8_t ret = 0xff;
/* NOTE: Registers are [0xE0:0xFF] but we store them as [0x00:0x1F]. */
if (!(port & 1)) if (!(port & 1))
ret = dev->cur_reg | 0xe0; ret = dev->cur_reg;
else if (dev->cur_reg < 0xe0)
ret = 0xff;
else else
ret = dev->regs[dev->cur_reg]; ret = dev->regs[dev->cur_reg & 0x1f];
return ret; return ret;
} }