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

Turns out reading always the same value on port 60h is in fact correct.

Browse Source
This commit is contained in:
OBattler
2023-04-02 23:00:14 +02:00
parent 33fe084cba
commit 1c2100da5a
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/device/keyboard_at.c
View File

@@ -757,6 +757,7 @@ kbd_poll(void *priv)
#ifdef ENABLE_KEYBOARD_AT_LOG #ifdef ENABLE_KEYBOARD_AT_LOG
const uint8_t channels[4] = { 1, 2, 0, 0 }; const uint8_t channels[4] = { 1, 2, 0, 0 };
#endif #endif
int mouse_enabled;
timer_advance_u64(&dev->send_delay_timer, (100ULL * TIMER_USEC)); timer_advance_u64(&dev->send_delay_timer, (100ULL * TIMER_USEC));
@@ -771,7 +772,7 @@ kbd_poll(void *priv)
// if (dev->want60 != 0) || (dev->key_wantdata != 0) // if (dev->want60 != 0) || (dev->key_wantdata != 0)
// return; // return;
if (dev->out_new != -1 && !dev->last_irq) { if ((dev->out_new != -1) && !dev->last_irq) {
dev->wantirq = 0; dev->wantirq = 0;
if (dev->out_new & 0x100) { if (dev->out_new & 0x100) {
if (dev->mem[0x20] & 0x02) if (dev->mem[0x20] & 0x02)
@@ -792,26 +793,30 @@ kbd_poll(void *priv)
} }
} }
if (!(dev->status & STAT_OFULL) && dev->out_new == -1 && key_ctrl_queue_start != key_ctrl_queue_end) { mouse_enabled = !(dev->mem[0x20] & 0x20) && ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_NOREF);
kbd_log("ATkbc: %02X on channel 0\n", key_ctrl_queue[key_ctrl_queue_start]);
dev->out_new = key_ctrl_queue[key_ctrl_queue_start] | 0x200; if (!(dev->status & STAT_OFULL) && dev->out_new == -1) {
key_ctrl_queue_start = (key_ctrl_queue_start + 1) & 0x3f; if (key_ctrl_queue_start != key_ctrl_queue_end) {
} else if (!(dev->status & STAT_OFULL) && dev->out_new == -1 && dev->out_delayed != -1) { kbd_log("ATkbc: %02X on channel 0\n", key_ctrl_queue[key_ctrl_queue_start]);
kbd_log("ATkbc: %02X delayed on channel %i\n", dev->out_delayed & 0xff, channels[(dev->out_delayed >> 8) & 0x03]); dev->out_new = key_ctrl_queue[key_ctrl_queue_start] | 0x200;
dev->out_new = dev->out_delayed; key_ctrl_queue_start = (key_ctrl_queue_start + 1) & 0x3f;
dev->out_delayed = -1; } else if (dev->out_delayed != -1) {
} else if (!(dev->status & STAT_OFULL) && dev->out_new == -1 && mouse_cmd_queue_start != mouse_cmd_queue_end) { kbd_log("ATkbc: %02X delayed on channel %i\n", dev->out_delayed & 0xff, channels[(dev->out_delayed >> 8) & 0x03]);
kbd_log("ATkbc: %02X on channel 2\n", mouse_cmd_queue[mouse_cmd_queue_start]); dev->out_new = dev->out_delayed;
dev->out_new = mouse_cmd_queue[mouse_cmd_queue_start] | 0x100; dev->out_delayed = -1;
mouse_cmd_queue_start = (mouse_cmd_queue_start + 1) & 0xf; } else if (!(dev->mem[0x20] & 0x10) && (key_queue_start != key_queue_end)) {
} else if (!(dev->status & STAT_OFULL) && dev->out_new == -1 && mouse_queue_start != mouse_queue_end) { kbd_log("ATkbc: %02X on channel 1\n", key_queue[key_queue_start]);
kbd_log("ATkbc: %02X on channel 2\n", mouse_queue[mouse_queue_start]); dev->out_new = key_queue[key_queue_start];
dev->out_new = mouse_queue[mouse_queue_start] | 0x100; key_queue_start = (key_queue_start + 1) & 0xf;
mouse_queue_start = (mouse_queue_start + 1) & 0xf; } else if (mouse_enabled && (mouse_cmd_queue_start != mouse_cmd_queue_end)) {
} else if (!(dev->status & STAT_OFULL) && dev->out_new == -1 && !(dev->mem[0x20] & 0x10) && key_queue_start != key_queue_end) { kbd_log("ATkbc: %02X on channel 2\n", mouse_cmd_queue[mouse_cmd_queue_start]);
kbd_log("ATkbc: %02X on channel 1\n", key_queue[key_queue_start]); dev->out_new = mouse_cmd_queue[mouse_cmd_queue_start] | 0x100;
dev->out_new = key_queue[key_queue_start]; mouse_cmd_queue_start = (mouse_cmd_queue_start + 1) & 0xf;
key_queue_start = (key_queue_start + 1) & 0xf; } else if (mouse_enabled && (mouse_queue_start != mouse_queue_end)) {
kbd_log("ATkbc: %02X on channel 2\n", mouse_queue[mouse_queue_start]);
dev->out_new = mouse_queue[mouse_queue_start] | 0x100;
mouse_queue_start = (mouse_queue_start + 1) & 0xf;
}
} }
if (dev->reset_delay) { if (dev->reset_delay) {
@@ -1347,6 +1352,7 @@ write64_generic(void *priv, uint8_t val)
case 0xd4: /* write to mouse */ case 0xd4: /* write to mouse */
kbd_log("ATkbc: write to mouse\n"); kbd_log("ATkbc: write to mouse\n");
dev->mem[0x20] &= ~0x20;
dev->want60 = 1; dev->want60 = 1;
return 0; return 0;
@@ -2356,10 +2362,7 @@ kbd_read(uint16_t port, void *priv)
switch (port) { switch (port) {
case 0x60: case 0x60:
if (dev->status & STAT_OFULL) ret = dev->out;
ret = dev->out;
else
ret = 0xff;
dev->status &= ~STAT_OFULL; dev->status &= ~STAT_OFULL;
picintc(dev->last_irq); picintc(dev->last_irq);
dev->last_irq = 0; dev->last_irq = 0;