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

Do not mirror memory byte bit 4 on the keyboard controller output port on the Olivetti KBC.

Browse Source
This commit is contained in:
OBattler
2021-11-22 00:39:11 +01:00
parent c32d751046
commit cb31c9a61a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/device/keyboard_at.c
View File

@@ -1051,11 +1051,11 @@ add_data_kbd(uint16_t val)
static void static void
write_output(atkbd_t *dev, uint8_t val) write_output(atkbd_t *dev, uint8_t val)
{ {
uint8_t kbc_ven = dev->flags & KBC_VEN_MASK;
uint8_t old = dev->output_port; uint8_t old = dev->output_port;
kbd_log("ATkbc: write output port: %02X (old: %02X)\n", val, dev->output_port); kbd_log("ATkbc: write output port: %02X (old: %02X)\n", val, dev->output_port);
if ((kbc_ven == KBC_VEN_AMI) || ((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF)) uint8_t kbc_ven = dev->flags & KBC_VEN_MASK;
if ((kbc_ven != KBC_VEN_OLIVETTI) && ((kbc_ven == KBC_VEN_AMI) || ((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF)))
val |= ((dev->mem[0] << 4) & 0x10); val |= ((dev->mem[0] << 4) & 0x10);
/*IRQ 12*/ /*IRQ 12*/
@@ -2104,7 +2104,7 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
case 0xd0: /* read output port */ case 0xd0: /* read output port */
kbd_log("ATkbc: read output port\n"); kbd_log("ATkbc: read output port\n");
mask = 0xff; mask = 0xff;
if (((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF) && (dev->mem[0] & 0x10)) if ((kbc_ven != KBC_VEN_OLIVETTI) && ((dev->flags & KBC_TYPE_MASK) < KBC_TYPE_PS2_NOREF) && (dev->mem[0] & 0x10))
mask &= 0xbf; mask &= 0xbf;
add_to_kbc_queue_front(dev, dev->output_port & mask, 0, 0x00); add_to_kbc_queue_front(dev, dev->output_port & mask, 0, 0x00);
break; break;