From 1057722efc318e2969d6317fd6ec34af3fac5e73 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sun, 30 Apr 2023 18:21:17 +0200
Subject: [PATCH] Command A5 is in fact the IBM PS/2 Load Security command,
 fixes the AMI Excalibur PCI Pentium.

---
 src/device/kbc_at.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/device/kbc_at.c b/src/device/kbc_at.c
index b3b5c5784..64403a5ed 100644
--- a/src/device/kbc_at.c
+++ b/src/device/kbc_at.c
@@ -808,6 +808,12 @@ write64_generic(void *priv, uint8_t val)
             }
             break;
 
+        case 0xa5: /* load security */
+            kbc_at_log("ATkbc: load security\n");
+            dev->wantdata = 1;
+            dev->state = STATE_KBC_PARAM;
+            return 0;
+
         case 0xa7: /* disable auxiliary port */
             if (dev->misc_flags & FLAG_PS2) {
                 kbc_at_log("ATkbc: disable auxiliary port\n");
@@ -1003,11 +1009,6 @@ write60_ami(void *priv, uint8_t val)
                 write_cmd(dev, val);
             return 0;
 
-        case 0xa5: /* get extended controller RAM */
-            kbc_at_log("ATkbc: AMI - get extended controller RAM\n");
-            kbc_delay_to_ob(dev, dev->mem[val], 0, 0x00);
-            return 0;
-
         case 0xaf: /* set extended controller RAM */
             kbc_at_log("ATkbc: AMI - set extended controller RAM\n");
             if (dev->command_phase == 1) {
@@ -1102,12 +1103,8 @@ write64_ami(void *priv, uint8_t val)
             if (!(dev->misc_flags & FLAG_PS2)) {
                 kbc_at_log("ATkbc: AMI - write clock = high\n");
                 dev->misc_flags |= FLAG_CLOCK;
-            } else {
-                kbc_at_log("ATkbc: get extended controller RAM\n");
-                dev->wantdata  = 1;
-                dev->state     = STATE_KBC_PARAM;
+                return 0;
             }
-            return 0;
 
         case 0xa6: /* read clock */
             if (!(dev->misc_flags & FLAG_PS2)) {
@@ -1604,6 +1601,17 @@ kbc_at_process_cmd(void *priv)
                     write_cmd(dev, dev->ib);
                 break;
 
+            case 0xa5: /* load security */
+                if (dev->misc_flags & FLAG_PS2) {
+                    kbc_at_log("ATkbc: load security (%02X)\n", dev->ib);
+
+                    if (dev->ib != 0x00) {
+                        dev->wantdata = 1;
+                        dev->state = STATE_KBC_PARAM;
+                    }
+                }
+                break;
+
             case 0xc7: /* set port1 bits */
                 kbc_at_log("ATkbc: Phoenix - set port1 bits\n");
                 dev->p1 |= dev->ib;