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

Ported the AT keyboard reset fixes from feature/machine_and_kb.

Browse Source
This commit is contained in:
OBattler
2021-11-21 18:17:45 +01:00
parent db8b7dc896
commit 0c307c2058
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/device/keyboard_at.c
View File

@@ -1052,38 +1052,48 @@ 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 kbc_ven = dev->flags & KBC_VEN_MASK;
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)) if ((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);
if ((dev->output_port ^ val) & 0x20) { /*IRQ 12*/ /*IRQ 12*/
if ((dev->output_port ^ val) & 0x20) {
if (val & 0x20) if (val & 0x20)
picint(1 << 12); picint(1 << 12);
else else
picintc(1 << 12); picintc(1 << 12);
} }
if ((dev->output_port ^ val) & 0x10) { /*IRQ 1*/
/*IRQ 1*/
if ((dev->output_port ^ val) & 0x10) {
if (val & 0x10) if (val & 0x10)
picint(1 << 1); picint(1 << 1);
else else
picintc(1 << 1); picintc(1 << 1);
} }
if ((dev->output_port ^ val) & 0x02) { /*A20 enable change*/ if ((dev->output_port ^ val) & 0x02) { /*A20 enable change*/
mem_a20_key = val & 0x02; mem_a20_key = val & 0x02;
mem_a20_recalc(); mem_a20_recalc();
flushmmucache(); flushmmucache();
} }
if ((dev->output_port ^ val) & 0x01) { /*Reset*/
if (! (val & 0x01)) { /* Do this here to avoid an infinite reset loop. */
dev->output_port = val;
/* 0 holds the CPU in the RESET state, 1 releases it. To simplify this,
we just do everything on release. */
if ((val & 0x01) && !(old & 0x01)) {
if (val & 0x01) {
/* Pin 0 selected. */ /* Pin 0 selected. */
pclog("write_output(): Pulse reset!\n");
softresetx86(); /*Pulse reset!*/ softresetx86(); /*Pulse reset!*/
cpu_set_edx(); cpu_set_edx();
smbase = is_am486dxl ? 0x00060000 : 0x00030000; flushmmucache();
} }
} }
/* Mask off the A20 stuff because we use mem_a20_key directly for that. */
dev->output_port = val;
} }
@@ -1372,7 +1382,7 @@ write64_ami(void *priv, uint8_t val)
case 0xa1: /* get controller version */ case 0xa1: /* get controller version */
kbd_log("ATkbc: AMI - get controller version\n"); kbd_log("ATkbc: AMI - get controller version\n");
add_data(dev, 'H'); add_data(dev, 'Z');
return 0; return 0;
case 0xa2: /* clear keyboard controller lines P22/P23 */ case 0xa2: /* clear keyboard controller lines P22/P23 */