Some minor fixes, the PS/2 mouse command F0h (set remote mode) is now implemented, the PS/2 mouse command F3h (set sample rate) now actually changes the host mouse polling rate, and the Intel SIO IB and ZB now forcibly initialize a keyboard and mouse IRQ latch if the board has a PS/2 keyboard controller, to simulate the presence of a latch external to the chip.

src/device/kbc_at.c

@@ -1024,7 +1024,7 @@ write64_ami(void *priv, uint8_t val)
             kbc_at_queue_add(dev, 0x28);
             kbc_at_queue_add(dev, 0x00);
             dev->state = STATE_KBC_OUT;
-            break;
+            return 0;
 
         case 0xa1: /* get controller version */
             kbc_at_log("ATkbc: AMI - get controller version\n");
@@ -1118,6 +1118,7 @@ write64_ami(void *priv, uint8_t val)
             add_to_kbc_queue_front(dev, 0x00, 0, 0x00);
             return 0;
 
+        /* TODO: The ICS SB486PV sends command B4 but expects to read *TWO* bytes. */
         case 0xb4: case 0xb5:
             /* set KBC lines P22-P23 (P2 bits 2-3) low */
             kbc_at_log("ATkbc: set KBC lines P22-P23 (P2 bits 2-3) low\n");

src/device/kbc_at_dev.c

@@ -173,9 +173,9 @@ kbc_at_dev_reset(atkbc_dev_t *dev, int do_fa)
     if (do_fa)
         kbc_at_dev_queue_add(dev, 0xfa, 0);
 
-    dev->execute_bat(dev);
-
     dev->state = DEV_STATE_MAIN_OUT;
+
+    dev->execute_bat(dev);
 }
 
 atkbc_dev_t *

src/device/mouse.c

@@ -102,6 +102,8 @@ static int             mouse_nbut;
 static int (*mouse_dev_poll)(int x, int y, int z, int b, void *priv);
 static void (*mouse_poll_ex)(void) = NULL;
 
+static double          sample_rate = 200.0;
+
 #ifdef ENABLE_MOUSE_LOG
 int mouse_do_log = ENABLE_MOUSE_LOG;
 
@@ -153,7 +155,7 @@ static void
 mouse_timer_poll(void *priv)
 {
     /* Poll at 255 Hz, maximum supported by PS/2 mic. */
-    timer_on_auto(&mouse_timer, 1000000.0 / 255.0);
+    timer_on_auto(&mouse_timer, 1000000.0 / sample_rate);
 
 #ifdef USE_GDBSTUB /* avoid a KBC FIFO overflow when CPU emulation is stalled */
     if (gdbstub_step == GDBSTUB_EXEC)
@@ -161,6 +163,15 @@ mouse_timer_poll(void *priv)
         mouse_process();
 }
 
+void
+mouse_set_sample_rate(double new_rate)
+{
+    timer_stop(&mouse_timer);
+
+    sample_rate = new_rate;
+    timer_on_auto(&mouse_timer, 1000000.0 / sample_rate);
+}
+
 void
 mouse_reset(void)
 {
@@ -179,15 +190,16 @@ mouse_reset(void)
     if (mouse_type == 0)
         return;
 
+    timer_add(&mouse_timer, mouse_timer_poll, NULL, 0);
+
+    /* Poll at 100 Hz, the default of a PS/2 mouse. */
+    sample_rate = 100.0;
+    timer_on_auto(&mouse_timer, 1000000.0 / sample_rate);
+
     mouse_curr = mouse_devices[mouse_type].device;
 
     if (mouse_curr != NULL)
         mouse_priv = device_add(mouse_curr);
-
-    timer_add(&mouse_timer, mouse_timer_poll, NULL, 0);
-
-    /* Poll at 255 Hz, maximum supported by PS/2 mic. */
-    timer_on_auto(&mouse_timer, 1000000.0 / 255.0);
 }
 
 /* Callback from the hardware driver. */

src/device/mouse_ps2.c

@@ -133,7 +133,9 @@ static void
 ps2_set_defaults(atkbc_dev_t *dev)
 {
     dev->mode = MODE_STREAM;
-    dev->rate = 1;
+    dev->rate = 100;
+    mouse_set_sample_rate(100.0);
+    dev->resolution = 2;
     dev->flags &= 0x88;
     mouse_scan = 0;
 }
@@ -177,6 +179,7 @@ ps2_write(void *priv)
 
             case 0xf3: /* set sample rate */
                 dev->rate = val;
+                mouse_set_sample_rate((double) val);
                 kbc_at_dev_queue_add(dev, 0xfa, 0); /* Command response */
                 mouse_ps2_log("%s: Set sample rate [%02X]\n", dev->name, val);
                 break;
@@ -227,6 +230,7 @@ ps2_write(void *priv)
             case 0xea: /* set stream */
                 mouse_ps2_log("%s: Set stream\n", dev->name);
                 dev->flags &= ~FLAG_CTRLDAT;
+                dev->mode = MODE_STREAM;
                 mouse_scan = 1;
                 kbc_at_dev_queue_add(dev, 0xfa, 0); /* ACK for command byte */
                 break;
@@ -238,6 +242,14 @@ ps2_write(void *priv)
                 ps2_report_coordinates(dev, 0);
                 break;
 
+            case 0xf0: /* set remote */
+                mouse_ps2_log("%s: Set remote\n", dev->name);
+                dev->flags &= ~FLAG_CTRLDAT;
+                dev->mode = MODE_REMOTE;
+                mouse_scan = 1;
+                kbc_at_dev_queue_add(dev, 0xfa, 0); /* ACK for command byte */
+                break;
+
             case 0xf2: /* read ID */
                 mouse_ps2_log("%s: Read ID\n", dev->name);
                 kbc_at_dev_queue_add(dev, 0xfa, 0);