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

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
RichardG867
2023-04-09 19:24:56 -03:00
parent bd1832054e 91278c3a8e
commit 735b9b000e
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/device/keyboard_at.c
View File

@@ -99,7 +99,9 @@ enum {
KBC_STATE_MAIN_BOTH, KBC_STATE_MAIN_BOTH,
KBC_STATE_KBC_OUT, KBC_STATE_KBC_OUT,
KBC_STATE_KBC_PARAM, KBC_STATE_KBC_PARAM,
KBC_STATE_SEND_KBD,
KBC_STATE_KBD, KBC_STATE_KBD,
KBC_STATE_SEND_MOUSE,
KBC_STATE_MOUSE KBC_STATE_MOUSE
}; };
#define KBC_STATE_SCAN_KBD KBC_STATE_KBD #define KBC_STATE_SCAN_KBD KBC_STATE_KBD
@@ -836,7 +838,7 @@ kbc_ibf_process(atkbd_t *dev)
set_enable_kbd(dev, 1); set_enable_kbd(dev, 1);
dev->key_wantcmd = 1; dev->key_wantcmd = 1;
dev->key_dat = dev->ib; dev->key_dat = dev->ib;
dev->kbc_state = KBC_STATE_SCAN_KBD; dev->kbc_state = KBC_STATE_SEND_KBD;
} }
} }
@@ -892,8 +894,7 @@ kbc_poll_at(atkbd_t *dev)
} }
break; break;
case KBC_STATE_MAIN_IBF: case KBC_STATE_MAIN_IBF:
case KBC_STATE_MAIN_MOUSE: default:
case KBC_STATE_SCAN_MOUSE:
if (dev->status & STAT_OFULL) { if (dev->status & STAT_OFULL) {
/* OBF set, wait until it is cleared but still process commands. */ /* OBF set, wait until it is cleared but still process commands. */
if ((dev->status & STAT_IFULL) && (dev->status & STAT_CD)) { if ((dev->status & STAT_IFULL) && (dev->status & STAT_CD)) {
@@ -941,6 +942,10 @@ kbc_poll_at(atkbd_t *dev)
kbc_process_cmd(dev); kbc_process_cmd(dev);
} }
break; break;
case KBC_STATE_SEND_KBD:
if (!dev->key_wantcmd)
dev->kbc_state = KBC_STATE_SCAN_KBD;
break;
case KBC_STATE_SCAN_KBD: case KBC_STATE_SCAN_KBD:
kbc_scan_kbd_at(dev); kbc_scan_kbd_at(dev);
break; break;
@@ -997,6 +1002,7 @@ kbc_poll_ps2(atkbd_t *dev)
} }
break; break;
case KBC_STATE_MAIN_IBF: case KBC_STATE_MAIN_IBF:
default:
// pclog("KBC_STATE_MAIN_IBF\n"); // pclog("KBC_STATE_MAIN_IBF\n");
if (dev->status & STAT_IFULL) if (dev->status & STAT_IFULL)
kbc_ibf_process(dev); kbc_ibf_process(dev);
@@ -1071,10 +1077,18 @@ kbc_poll_ps2(atkbd_t *dev)
kbc_process_cmd(dev); kbc_process_cmd(dev);
} }
break; break;
case KBC_STATE_SEND_KBD:
if (!dev->key_wantcmd)
dev->kbc_state = KBC_STATE_SCAN_KBD;
break;
case KBC_STATE_SCAN_KBD: case KBC_STATE_SCAN_KBD:
// pclog("KBC_STATE_SCAN_KBD\n"); // pclog("KBC_STATE_SCAN_KBD\n");
(void) kbc_scan_kbd_ps2(dev); (void) kbc_scan_kbd_ps2(dev);
break; break;
case KBC_STATE_SEND_MOUSE:
if (!dev->mouse_wantcmd)
dev->kbc_state = KBC_STATE_SCAN_MOUSE;
break;
case KBC_STATE_SCAN_MOUSE: case KBC_STATE_SCAN_MOUSE:
// pclog("KBC_STATE_SCAN_MOUSE\n"); // pclog("KBC_STATE_SCAN_MOUSE\n");
(void) kbc_scan_aux_ps2(dev); (void) kbc_scan_aux_ps2(dev);
@@ -2695,7 +2709,7 @@ kbc_process_cmd(void *priv)
if (mouse_write) { if (mouse_write) {
dev->mouse_wantcmd = 1; dev->mouse_wantcmd = 1;
dev->mouse_dat = dev->ib; dev->mouse_dat = dev->ib;
dev->kbc_state = KBC_STATE_SCAN_MOUSE; dev->kbc_state = KBC_STATE_SEND_MOUSE;
} else } else
add_to_kbc_queue_front(dev, 0xfe, 2, 0x40); add_to_kbc_queue_front(dev, 0xfe, 2, 0x40);
} }