From 41be50bff89e4bfe9a7880adb0657e9ea802a723 Mon Sep 17 00:00:00 2001 From: OBattler Date: Tue, 17 Nov 2020 21:46:46 +0100 Subject: [PATCH] The AT / PS/2 keyboard controller now once again issues IRQ's and the SCAT 286 machines now have an AMI keyboard controller, fixes the GW286-CT. --- src/device/keyboard_at.c | 3 ++- src/machine/m_at_286_386sx.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/device/keyboard_at.c b/src/device/keyboard_at.c index 5f158b608..e0dd00a3b 100644 --- a/src/device/keyboard_at.c +++ b/src/device/keyboard_at.c @@ -562,6 +562,7 @@ static const scancode scancode_set3[512] = { static void add_data_kbd(uint16_t val); +#define ENABLE_KEYBOARD_AT_LOG 1 #ifdef ENABLE_KEYBOARD_AT_LOG int keyboard_at_do_log = ENABLE_KEYBOARD_AT_LOG; @@ -734,7 +735,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; diff --git a/src/machine/m_at_286_386sx.c b/src/machine/m_at_286_386sx.c index 45f4fab1c..16a21b0e0 100644 --- a/src/machine/m_at_286_386sx.c +++ b/src/machine/m_at_286_386sx.c @@ -225,7 +225,8 @@ machine_at_micronics386_init(const machine_t *model) static void machine_at_scat_init(const machine_t *model, int is_v4) { - machine_at_init(model); + machine_at_common_init(model); + device_add(&keyboard_at_ami_device); device_add(&fdc_at_device); if (is_v4)