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

Ali M5123 Super I/O fixes - serial ports now work correctly, fixes #3070.

Browse Source
This commit is contained in:
OBattler
2023-02-04 04:02:19 +01:00
parent 9398a59351
commit f12b16cbdd
1 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/sio/sio_ali5123.c
View File

@@ -66,7 +66,7 @@ static void
ali5123_fdc_handler(ali5123_t *dev)
{
uint16_t ld_port = 0;
uint8_t global_enable = !!(dev->regs[0x22] & (1 << 0));
uint8_t global_enable = !(dev->regs[0x22] & (1 << 0));
uint8_t local_enable = !!dev->ld_regs[0][0x30];
fdc_remove(dev->fdc);
@@ -81,7 +81,7 @@ static void
ali5123_lpt_handler(ali5123_t *dev)
{
uint16_t ld_port = 0;
uint8_t global_enable = !!(dev->regs[0x22] & (1 << 3));
uint8_t global_enable = !(dev->regs[0x22] & (1 << 3));
uint8_t local_enable = !!dev->ld_regs[3][0x30];
uint8_t lpt_irq = dev->ld_regs[3][0x70];
@@ -100,9 +100,10 @@ ali5123_lpt_handler(ali5123_t *dev)
static void
ali5123_serial_handler(ali5123_t *dev, int uart)
{
uint8_t uart_nos[2][3]= { { 4, 5, 0xb }, { 4, 0xb, 5 } };
uint16_t ld_port = 0;
uint8_t uart_no = (uart == 2) ? 0x0b : (4 + uart);
uint8_t global_enable = !!(dev->regs[0x22] & (1 << uart_no));
uint8_t uart_no = uart_nos[!!(dev->regs[0x2d] & 0x20)][uart];
uint8_t global_enable = !(dev->regs[0x22] & (1 << (4 + uart)));
uint8_t local_enable = !!dev->ld_regs[uart_no][0x30];
uint8_t mask = (uart == 1) ? 0x04 : 0x05;
@@ -207,8 +208,7 @@ ali5123_write(uint16_t port, uint8_t val, void *priv)
{
ali5123_t *dev = (ali5123_t *) priv;
uint8_t index = (port & 1) ? 0 : 1;
uint8_t valxor = 0x00, keep = 0x00;
uint8_t cur_ld;
uint8_t valxor = 0x00, cur_ld = dev->regs[7];
if (index) {
if (((val == 0x51) && (!dev->tries) && (!dev->locked)) || ((val == 0x23) && (dev->tries) && (!dev->locked))) {
@@ -236,27 +236,23 @@ ali5123_write(uint16_t port, uint8_t val, void *priv)
if (dev->locked) {
if (dev->cur_reg < 48) {
valxor = val ^ dev->regs[dev->cur_reg];
if ((val == 0x1f) || (val == 0x20) || (val == 0x21))
if ((val >= 0x1f) && (val <= 0x21))
return;
dev->regs[dev->cur_reg] = val;
} else {
valxor = val ^ dev->ld_regs[dev->regs[7]][dev->cur_reg];
if (((dev->cur_reg & 0xf0) == 0x70) && (dev->regs[7] < 4))
valxor = val ^ dev->ld_regs[cur_ld][dev->cur_reg];
if (((dev->cur_reg & 0xf0) == 0x70) && (cur_ld < 4))
return;
/* Block writes to some logical devices. */
if (dev->regs[7] > 0x0c)
if (cur_ld > 0x0c)
return;
else
switch (dev->regs[7]) {
case 0x01:
case 0x02:
case 0x06:
case 0x08:
case 0x09:
case 0x0a:
return;
}
dev->ld_regs[dev->regs[7]][dev->cur_reg] = val | keep;
else switch (cur_ld) {
case 0x01: case 0x02:
case 0x06:
case 0x08 ... 0x0a:
return;
}
dev->ld_regs[cur_ld][dev->cur_reg] = val;
}
} else
return;
@@ -281,16 +277,18 @@ ali5123_write(uint16_t port, uint8_t val, void *priv)
if (valxor & 0x40)
ali5123_serial_handler(dev, 2);
break;
case 0x2d:
if (valxor & 0x20) {
ali5123_serial_handler(dev, 1);
ali5123_serial_handler(dev, 2);
}
break;
}
return;
}
cur_ld = dev->regs[7];
if ((dev->regs[7] == 5) && (dev->regs[0x2d] & 0x20))
cur_ld = 0x0b;
else if ((dev->regs[7] == 0x0b) && (dev->regs[0x2d] & 0x20))
cur_ld = 5;
switch (cur_ld) {
case 0:
/* FDD */
@@ -299,7 +297,7 @@ ali5123_write(uint16_t port, uint8_t val, void *priv)
case 0x60:
case 0x61:
if ((dev->cur_reg == 0x30) && (val & 0x01))
dev->regs[0x22] |= 0x01;
dev->regs[0x22] &= ~0x01;
if (valxor)
ali5123_fdc_handler(dev);
break;
@@ -339,7 +337,7 @@ ali5123_write(uint16_t port, uint8_t val, void *priv)
case 0x61:
case 0x70:
if ((dev->cur_reg == 0x30) && (val & 0x01))
dev->regs[0x22] |= 0x08;
dev->regs[0x22] &= ~0x08;
if (valxor)
ali5123_lpt_handler(dev);
break;
@@ -354,7 +352,7 @@ ali5123_write(uint16_t port, uint8_t val, void *priv)
case 0x70:
case 0xf0:
if ((dev->cur_reg == 0x30) && (val & 0x01))
dev->regs[0x22] |= 0x10;
dev->regs[0x22] &= ~0x10;
if (valxor)
ali5123_serial_handler(dev, 0);
break;
@@ -369,9 +367,9 @@ ali5123_write(uint16_t port, uint8_t val, void *priv)
case 0x70:
case 0xf0:
if ((dev->cur_reg == 0x30) && (val & 0x01))
dev->regs[0x22] |= 0x20;
dev->regs[0x22] &= ~((dev->regs[0x2d] & 0x20) ? 0x40 : 0x20);
if (valxor)
ali5123_serial_handler(dev, 1);
ali5123_serial_handler(dev, (dev->regs[0x2d] & 0x20) ? 2 : 1);
break;
}
break;
@@ -384,9 +382,9 @@ ali5123_write(uint16_t port, uint8_t val, void *priv)
case 0x70:
case 0xf0:
if ((dev->cur_reg == 0x30) && (val & 0x01))
dev->regs[0x22] |= 0x40;
dev->regs[0x22] &= ~((dev->regs[0x2d] & 0x20) ? 0x20 : 0x40);
if (valxor)
ali5123_serial_handler(dev, 2);
ali5123_serial_handler(dev, (dev->regs[0x2d] & 0x20) ? 1 : 2);
break;
}
break;
@@ -411,11 +409,6 @@ ali5123_read(uint16_t port, void *priv)
ret = dev->regs[dev->cur_reg];
} else {
cur_ld = dev->regs[7];
if ((dev->regs[7] == 5) && (dev->regs[0x2d] & 0x20))
cur_ld = 0x0b;
else if ((dev->regs[7] == 0x0b) && (dev->regs[0x2d] & 0x20))
cur_ld = 5;
ret = dev->ld_regs[cur_ld][dev->cur_reg];
}
}