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

# Conflicts: # src/win/win_settings.c
2020-11-18 01:12:32 -03:00
parent dbd767437b 77cb4e6c79
commit 8fff49d5c5
55 changed files with 13362 additions and 7246 deletions
--- a/src/device/keyboard_at.c
+++ b/src/device/keyboard_at.c
@@ -734,7 +734,7 @@ static void
 kbd_poll(void *priv)
 {
    atkbd_t *dev = (atkbd_t *)priv;
-    uint16_t irq_table[4] = { 0x0000, 0x0002, 0x1000, 0xffff };
+    uint16_t irq_table[4] = { 0x0002, 0x0002, 0x1000, 0xffff };
    int i, channel;
    uint16_t val, irq;