diff --git a/src/devices/input/keyboard.h b/src/devices/input/keyboard.h index 74615d7..2a6e6ff 100644 --- a/src/devices/input/keyboard.h +++ b/src/devices/input/keyboard.h @@ -8,7 +8,7 @@ * * Definitions for the keyboard interface. * - * Version: @(#)keyboard.h 1.0.10 2019/04/20 + * Version: @(#)keyboard.h 1.0.11 2019/04/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -94,6 +94,7 @@ extern const device_t keyboard_at_ami_device; extern const device_t keyboard_at_toshiba_device; extern const device_t keyboard_ps2_device; +extern const device_t keyboard_ps2_acer_device; extern const device_t keyboard_ps2_xi8088_device; extern const device_t keyboard_ps2_ami_device; extern const device_t keyboard_ps2_mca_device; diff --git a/src/devices/input/keyboard_at.c b/src/devices/input/keyboard_at.c index eae0b75..56558e1 100644 --- a/src/devices/input/keyboard_at.c +++ b/src/devices/input/keyboard_at.c @@ -11,7 +11,7 @@ * NOTE: Several changes to disable Mode1 for now, as this breaks * the TSX32 operating system. More cleanups needed.. * - * Version: @(#)keyboard_at.c 1.0.22 2019/04/21 + * Version: @(#)keyboard_at.c 1.0.23 2019/04/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -101,6 +101,7 @@ #define KBC_VEN_QUADTEL 0x0c #define KBC_VEN_TOSHIBA 0x10 #define KBC_VEN_XI8088 0x14 +#define KBC_VEN_ACER 0x18 #define KBC_VEN_MASK 0x1c @@ -2152,6 +2153,16 @@ const device_t keyboard_ps2_device = { NULL }; +const device_t keyboard_ps2_acer_device = { + "Acer 90M002A PS/2 Keyboard", + 0, + KBC_TYPE_PS2_2 | KBC_VEN_ACER, + NULL, + kbd_init, kbd_close, kbd_reset, + NULL, NULL, NULL, NULL, + NULL +}; + const device_t keyboard_ps2_xi8088_device = { "PS/2 Keyboard (Xi8088)", 0, diff --git a/src/machines/m_acer.c b/src/machines/m_acer.c index 9f9fb07..15b4655 100644 --- a/src/machines/m_acer.c +++ b/src/machines/m_acer.c @@ -8,7 +8,7 @@ * * Implementation of the Intel 430xx-based Acer machines. * - * Version: @(#)m_acer.c 1.0.1 2019/04/08 + * Version: @(#)m_acer.c 1.0.2 2019/04/22 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -181,7 +181,7 @@ acer_init(const device_t *info, void *arg) device_add(&intel_flash_bxb_device); device_add(&fdc37c665_device); - device_add(&keyboard_ps2_ami_pci_device); + device_add(&keyboard_ps2_acer_device); break; }