SiS 5571, Daewoo Compaq, speed up AT / PS/2 KBC (does not appear to break anything from months of testing) and fix AT / PS/2 keyboard reset to fix the Samsung SPC7700LP-W soft reset.

src/device/kbc_at.c

@@ -44,6 +44,9 @@
 #include <86box/video.h>
 #include <86box/keyboard.h>
 
+#include <86box/dma.h>
+#include <86box/pci.h>
+
 #define STAT_PARITY        0x80
 #define STAT_RTIMEOUT      0x40
 #define STAT_TTIMEOUT      0x20
@@ -141,8 +144,9 @@ typedef struct atkbc_t {
 
     uint32_t flags;
 
-    /* Main timer. */
-    pc_timer_t send_delay_timer;
+    /* Main timers. */
+    pc_timer_t kbc_poll_timer;
+    pc_timer_t kbc_dev_poll_timer;
 
     /* P2 pulse callback timer. */
     pc_timer_t pulse_cb;
@@ -695,10 +699,18 @@ kbc_at_poll(void *priv)
 {
     atkbc_t *dev = (atkbc_t *) priv;
 
-    timer_advance_u64(&dev->send_delay_timer, (100ULL * TIMER_USEC));
+    timer_advance_u64(&dev->kbc_poll_timer, (39ULL * TIMER_USEC));
 
     /* TODO: Implement the password security state. */
     kbc_at_do_poll(dev);
+}
+
+static void
+kbc_at_dev_poll(void *priv)
+{
+    atkbc_t *dev = (atkbc_t *) priv;
+
+    timer_advance_u64(&dev->kbc_dev_poll_timer, (100ULL * TIMER_USEC));
 
     if ((kbc_at_ports[0] != NULL) && (kbc_at_ports[0]->priv != NULL))
         kbc_at_ports[0]->poll(kbc_at_ports[0]->priv);
@@ -736,7 +748,7 @@ write_p2(atkbc_t *dev, uint8_t val)
     /* AT, PS/2: Handle reset. */
     /* 0 holds the CPU in the RESET state, 1 releases it. To simplify this,
        we just do everything on release. */
-    if ((old ^ val) & 0x01) { /*Reset*/
+    if (!cpu_cpurst_on_sr && ((old ^ val) & 0x01)) { /*Reset*/
         if (!(val & 0x01)) {  /* Pin 0 selected. */
             /* Pin 0 selected. */
             kbc_at_log("write_p2(): Pulse reset!\n");
@@ -765,6 +777,28 @@ write_p2(atkbc_t *dev, uint8_t val)
 
     /* Do this here to avoid an infinite reset loop. */
     dev->p2 = val;
+
+    if (cpu_cpurst_on_sr && ((old ^ val) & 0x01)) { /*Reset*/
+        if (!(val & 0x01)) {  /* Pin 0 selected. */
+            /* Pin 0 selected. */
+            pclog("write_p2(): Pulse reset!\n");
+            dma_reset();
+            dma_set_at(1);
+
+            device_reset_all(DEVICE_ALL);
+
+            cpu_alt_reset = 0;
+
+            pci_reset();
+
+            mem_a20_alt = 0;
+            mem_a20_recalc();
+
+            flushmmucache();
+
+            resetx86();
+        }
+    }
 }
 
 static void
@@ -1934,7 +1968,8 @@ kbc_at_close(void *priv)
     int max_ports = ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) ? 2 : 1;
 
     /* Stop timers. */
-    timer_disable(&dev->send_delay_timer);
+    timer_disable(&dev->kbc_dev_poll_timer);
+    timer_disable(&dev->kbc_poll_timer);
 
     for (int i = 0; i < max_ports; i++) {
         if (kbc_at_ports[i] != NULL) {
@@ -1966,9 +2001,11 @@ kbc_at_init(const device_t *info)
     io_sethandler(0x0060, 1, kbc_at_read, NULL, NULL, kbc_at_write, NULL, NULL, dev);
     io_sethandler(0x0064, 1, kbc_at_read, NULL, NULL, kbc_at_write, NULL, NULL, dev);
 
-    timer_add(&dev->send_delay_timer, kbc_at_poll, dev, 1);
+    timer_add(&dev->kbc_poll_timer, kbc_at_poll, dev, 1);
     timer_add(&dev->pulse_cb, pulse_poll, dev, 0);
 
+    timer_add(&dev->kbc_dev_poll_timer, kbc_at_dev_poll, dev, 1);
+
     dev->write60_ven = NULL;
     dev->write64_ven = NULL;
 

src/device/keyboard_at.c

@@ -32,6 +32,8 @@
 
 #define FIFO_SIZE      16
 
+#define BAT_COUNT      1000
+
 enum {
     KBD_84_KEY = 0,
     KBD_101_KEY,
@@ -75,6 +77,8 @@ static atkbc_dev_t *SavedKbd                        = NULL;
 
 static uint8_t     inv_cmd_response                 = 0xfa;
 
+static uint16_t    bat_counter                      = 0;
+
 static const scancode scancode_set1[512] = {
   // clang-format off
     { {          0},{               0} }, { {     0x01,0},{          0x81,0} }, { {     0x02,0},{          0x82,0} }, { {     0x03,0},{          0x83,0} },        /*000*/
@@ -704,11 +708,16 @@ keyboard_at_bat(void *priv)
 {
     atkbc_dev_t *dev = (atkbc_dev_t *) priv;
 
-    keyboard_at_set_defaults(dev);
+    if (bat_counter == 0x0000) {
+        keyboard_at_set_defaults(dev);
 
-    keyboard_scan = 1;
+        keyboard_scan = 1;
 
-    kbc_at_dev_queue_add(dev, 0xaa, 0);
+        kbc_at_dev_queue_add(dev, 0xaa, 0);
+    } else {
+        bat_counter--;
+        dev->state = DEV_STATE_EXECUTE_BAT;
+    }
 }
 
 static void
@@ -926,6 +935,7 @@ keyboard_at_write(void *priv)
 
             case 0xff: /* reset */
                 kbc_at_dev_reset(dev, 1);
+                bat_counter = 1000;
                 break;
 
             default:
@@ -965,8 +975,10 @@ keyboard_at_init(const device_t *info)
 
     dev->fifo_mask   = FIFO_SIZE - 1;
 
-    if (dev->port != NULL)
+    if (dev->port != NULL) {
         kbc_at_dev_reset(dev, 0);
+        bat_counter = 0x0000;
+    }
 
     keyboard_send = add_data_kbd;
     SavedKbd = dev;