From e7460697376b879e105a3a2c0a9eddd658f19e03 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sat, 13 Jun 2020 19:32:06 +0200 Subject: [PATCH] Fix for the keyboard controller for the Intel AMI 430LX and 430NX BIOS'es and their Ambra counterparts. --- src/device/keyboard_at.c | 3 ++- src/machine/m_at_socket4_5.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/device/keyboard_at.c b/src/device/keyboard_at.c index 744af2365..39895732d 100644 --- a/src/device/keyboard_at.c +++ b/src/device/keyboard_at.c @@ -1219,7 +1219,8 @@ write64_generic(void *priv, uint8_t val) (dev->input_port & 0xfc) | (fdd_is_525(current_drive) ? 0x40 : 0x00); } else { - if ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_NOREF) + if (((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_NOREF) && + ((dev->flags & KBC_VEN_MASK) != KBC_VEN_INTEL_AMI)) add_data(dev, (dev->input_port | fixed_bits) & 0xef); else add_data(dev, dev->input_port | fixed_bits); diff --git a/src/machine/m_at_socket4_5.c b/src/machine/m_at_socket4_5.c index 0ba647aca..e49eec6dc 100644 --- a/src/machine/m_at_socket4_5.c +++ b/src/machine/m_at_socket4_5.c @@ -74,7 +74,7 @@ machine_at_premiere_common_init(const machine_t *model) pci_register_slot(0x0E, PCI_CARD_NORMAL, 2, 1, 3, 4); pci_register_slot(0x0C, PCI_CARD_NORMAL, 1, 3, 2, 4); pci_register_slot(0x02, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0); - device_add(&keyboard_ps2_ami_pci_device); + device_add(&keyboard_ps2_intel_ami_pci_device); device_add(&sio_zb_device); device_add(&fdc37c665_device); device_add(&intel_flash_bxt_ami_device);