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

Some AT / PS/2 KBC fixes, fixes the QDI Excellent II.

Browse Source
This commit is contained in:
OBattler
2021-08-09 07:46:02 +02:00
parent 32fd55bb68
commit 1060e62747
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/device/keyboard_at.c
View File

@@ -673,7 +673,7 @@ kbd_status(const char *fmt, ...)
} }
// #define ENABLE_KEYBOARD_AT_LOG 1 #define ENABLE_KEYBOARD_AT_LOG 1
#ifdef ENABLE_KEYBOARD_AT_LOG #ifdef ENABLE_KEYBOARD_AT_LOG
int keyboard_at_do_log = ENABLE_KEYBOARD_AT_LOG; int keyboard_at_do_log = ENABLE_KEYBOARD_AT_LOG;
@@ -1184,7 +1184,7 @@ write_output(atkbd_t *dev, uint8_t val)
uint8_t kbc_ven = dev->flags & KBC_VEN_MASK; uint8_t kbc_ven = dev->flags & KBC_VEN_MASK;
kbd_log("ATkbc: write output port: %02X (old: %02X)\n", val, dev->p2); kbd_log("ATkbc: write output port: %02X (old: %02X)\n", val, dev->p2);
if ((kbc_ven == KBC_VEN_AMI) || (dev->flags & KBC_FLAG_PS2)) if (!(dev->flags & KBC_FLAG_PS2))
val |= ((dev->mem[0x20] << 4) & 0x30); val |= ((dev->mem[0x20] << 4) & 0x30);
dev->kbd_inhibit = (val & 0x40); dev->kbd_inhibit = (val & 0x40);
@@ -1245,12 +1245,15 @@ write_cmd(atkbd_t *dev, uint8_t val)
The AMIKEY firmware apparently uses this bit for something else. */ The AMIKEY firmware apparently uses this bit for something else. */
if ((kbc_ven == KBC_VEN_AMI) || (dev->flags & KBC_FLAG_PS2)) { if ((kbc_ven == KBC_VEN_AMI) || (dev->flags & KBC_FLAG_PS2)) {
keyboard_mode &= ~CCB_PCMODE; keyboard_mode &= ~CCB_PCMODE;
/* Update the output port to mirror the KBD DIS and AUX DIS bits, if active. */
write_output(dev, dev->p2);
kbd_log("ATkbc: mouse interrupt is now %s\n", (val & 0x02) ? "enabled" : "disabled"); kbd_log("ATkbc: mouse interrupt is now %s\n", (val & 0x02) ? "enabled" : "disabled");
} }
if (!(dev->flags & KBC_FLAG_PS2)) {
/* Update the output port to mirror the KBD DIS and AUX DIS bits, if active. */
write_output(dev, dev->p2);
}
kbd_log("Command byte now: %02X (%02X)\n", dev->mem[0x20], val); kbd_log("Command byte now: %02X (%02X)\n", dev->mem[0x20], val);
dev->status = (dev->status & ~STAT_SYSFLAG) | (val & STAT_SYSFLAG); dev->status = (dev->status & ~STAT_SYSFLAG) | (val & STAT_SYSFLAG);
@@ -2058,6 +2061,8 @@ write64_generic(void *priv, uint8_t val)
P6RP4: P6RP4:
Bit 2 must be 1 or CMOS setup is disabled. */ Bit 2 must be 1 or CMOS setup is disabled. */
kbd_log("ATkbc: read input port\n"); kbd_log("ATkbc: read input port\n");
kbc_transmit(dev, 0b10011100);
return 0;
fixed_bits = 4; fixed_bits = 4;
/* The SMM handlers of Intel AMI Pentium BIOS'es expect bit 6 to be set. */ /* The SMM handlers of Intel AMI Pentium BIOS'es expect bit 6 to be set. */
if (kbc_ven == KBC_VEN_INTEL_AMI) if (kbc_ven == KBC_VEN_INTEL_AMI)
@@ -2879,10 +2884,11 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
kbc_send_to_ob(dev, 'H', 0, 0x00); kbc_send_to_ob(dev, 'H', 0, 0x00);
} }
#else #else
if (val == 0xa1) { /* if (val == 0xa1) {
dev->status &= ~STAT_IFULL; dev->status &= ~STAT_IFULL;
kbc_send_to_ob(dev, 'H', 0, 0x00); kbc_send_to_ob(dev, 'H', 0, 0x00);
} } */
kbc_process(dev);
#endif #endif
break; break;
} }