Changeset 38377 in vbox for trunk/src/VBox/Devices/Input/DevPS2.cpp

Timestamp:

Aug 9, 2011 12:01:37 PM (13 years ago)

Author:

vboxsync

Message:

DevPS2: Reworked and improved the KBC emulation.

File:

• trunk/src/VBox/Devices/Input/DevPS2.cpp (modified) (11 diffs)

trunk/src/VBox/Devices/Input/DevPS2.cpp

@@ -199 +199 @@
     uint8_t status;
     uint8_t mode;
+    uint8_t dbbout;    /* data buffer byte */
     /* keyboard state */
     int32_t kbd_write_cmd;
@@ -311 +312 @@
         s->status &= ~KBD_STAT_MOUSE_OBF;
         /* Keyboard data has priority if both kbd and aux data is available. */
-        if (q->count != 0)
+        if (q->count && !(s->mode & KBD_MODE_DISABLE_KBD))
         {
             s->status |= KBD_STAT_OBF;
+            s->dbbout = q->data[q->rptr];
+            if (++q->rptr == KBD_QUEUE_SIZE)
+                q->rptr = 0;
+            q->count--;
         }
-        else if (mcq->count != 0 || meq->count != 0)
+        else if ((mcq->count || meq->count) /*&& !(s->mode & KBD_MODE_DISABLE_MOUSE)*/)
         {
             s->status |= KBD_STAT_OBF | KBD_STAT_MOUSE_OBF;
+            if (mcq->count)
+            {
+                s->dbbout = mcq->data[mcq->rptr];
+                if (++mcq->rptr == MOUSE_CMD_QUEUE_SIZE)
+                    mcq->rptr = 0;
+                mcq->count--;
+            }
+            else
+            {
+                s->dbbout = meq->data[meq->rptr];
+                if (++meq->rptr == MOUSE_EVENT_QUEUE_SIZE)
+                    meq->rptr = 0;
+                meq->count--;
+            }
         }
     }
@@ -404 +423 @@
 #endif /* IN_RING3 */
 
+static void kbc_dbb_out(void *opaque, uint8_t val)
+{
+    KBDState *s = (KBDState*)opaque;
+
+    s->dbbout = val;
+    /* Set the OBF and raise IRQ. */
+    s->status |= KBD_STAT_OBF;
+    if (s->mode & KBD_MODE_KBD_INT)
+        PDMDevHlpISASetIrq(s->CTX_SUFF(pDevIns), 1, 1);
+}
+
 static uint32_t kbd_read_status(void *opaque, uint32_t addr)
 {
@@ -425 +455 @@
     switch(val) {
     case KBD_CCMD_READ_MODE:
-        kbd_queue(s, s->mode, 0);
+        kbc_dbb_out(s, s->mode);
         break;
     case KBD_CCMD_WRITE_MODE:
@@ -439 +469 @@
     case KBD_CCMD_MOUSE_ENABLE:
         s->mode &= ~KBD_MODE_DISABLE_MOUSE;
+        /* Check for queued input. */
+        kbd_update_irq(s);
         break;
     case KBD_CCMD_TEST_MOUSE:
-        kbd_queue(s, 0x00, 0);
+        kbc_dbb_out(s, 0x00);
         break;
     case KBD_CCMD_SELF_TEST:
+        /* Enable the A20 line - that is the power-on state(!). */
+# ifndef IN_RING3
+        if (!PDMDevHlpA20IsEnabled(s->CTX_SUFF(pDevIns)))
+        {
+            rc = VINF_IOM_HC_IOPORT_WRITE;
+            break;
+        }
+# else /* IN_RING3 */
+        PDMDevHlpA20Set(s->CTX_SUFF(pDevIns), true);
+# endif /* IN_RING3 */
         s->status |= KBD_STAT_SELFTEST;
-        kbd_queue(s, 0x55, 0);
+        s->mode |= KBD_MODE_DISABLE_KBD;
+        kbc_dbb_out(s, 0x55);
         break;
     case KBD_CCMD_KBD_TEST:
-        kbd_queue(s, 0x00, 0);
+        kbc_dbb_out(s, 0x00);
         break;
     case KBD_CCMD_KBD_DISABLE:
         s->mode |= KBD_MODE_DISABLE_KBD;
-        kbd_update_irq(s);
         break;
     case KBD_CCMD_KBD_ENABLE:
         s->mode &= ~KBD_MODE_DISABLE_KBD;
+        /* Check for queued input. */
         kbd_update_irq(s);
         break;
     case KBD_CCMD_READ_INPORT:
-        kbd_queue(s, 0x00, 0);
+        kbc_dbb_out(s, 0x00);
         break;
     case KBD_CCMD_READ_OUTPORT:
@@ -472 +515 @@
         if (s->status & KBD_STAT_MOUSE_OBF)
             val |= 0x20;
-        kbd_queue(s, val, 0);
+        kbc_dbb_out(s, val);
         break;
 #ifdef TARGET_I386
@@ -495 +538 @@
         /* Keyboard clock line is zero IFF keyboard is disabled */
         val = (s->mode & KBD_MODE_DISABLE_KBD) ? 0 : 1;
-        kbd_queue(s, val, 0);
+        kbc_dbb_out(s, val);
         break;
     case KBD_CCMD_RESET:
@@ -516 +559 @@
     case 0x30: case 0x31: case 0x32: case 0x33: case 0x34: case 0x35: case 0x36: case 0x37:
     case 0x38: case 0x39: case 0x3a: case 0x3b: case 0x3c: case 0x3d: case 0x3e: case 0x3f:
-        kbd_queue(s, 0, 0);
+        kbc_dbb_out(s, 0);
         Log(("kbd: reading non-standard RAM addr %#x\n", val & 0x1f));
         break;
@@ -529 +572 @@
 {
     KBDState *s = (KBDState*)opaque;
-    KBDQueue *q;
-    MouseCmdQueue *mcq;
-    MouseEventQueue *meq;
-    int val, index, aux;
-
-    q = &s->queue;
-    mcq = &s->mouse_command_queue;
-    meq = &s->mouse_event_queue;
-    if (q->count == 0 && mcq->count == 0 && meq->count == 0) {
-        /* NOTE: if no data left, we return the last keyboard one
-           (needed for EMM386) */
-        /* XXX: need a timer to do things correctly */
-        index = q->rptr - 1;
-        if (index < 0)
-            index = KBD_QUEUE_SIZE - 1;
-        val = q->data[index];
-    } else {
-        aux = (s->status & KBD_STAT_MOUSE_OBF);
-        if (!aux)
-        {
-            val = q->data[q->rptr];
-            if (++q->rptr == KBD_QUEUE_SIZE)
-                q->rptr = 0;
-            q->count--;
-        }
-        else
-        {
-            if (mcq->count)
-            {
-                val = mcq->data[mcq->rptr];
-                if (++mcq->rptr == MOUSE_CMD_QUEUE_SIZE)
-                    mcq->rptr = 0;
-                mcq->count--;
-            }
-            else
-            {
-                val = meq->data[meq->rptr];
-                if (++meq->rptr == MOUSE_EVENT_QUEUE_SIZE)
-                    meq->rptr = 0;
-                meq->count--;
-            }
-        }
-        /* reading deasserts IRQ */
-        if (aux)
-            PDMDevHlpISASetIrq(s->CTX_SUFF(pDevIns), 12, 0);
-        else
-            PDMDevHlpISASetIrq(s->CTX_SUFF(pDevIns), 1, 0);
-        /* Reading data clears the OBF bits, too. */
-        s->status &= ~(KBD_STAT_OBF | KBD_STAT_MOUSE_OBF);
-    }
-    /* reassert IRQs if data left */
+    uint32_t val;
+
+    /* Return the current DBB contents. */
+    val = s->dbbout;
+
+    /* Reading the DBB deasserts IRQs... */
+    if (s->status & KBD_STAT_MOUSE_OBF)
+        PDMDevHlpISASetIrq(s->CTX_SUFF(pDevIns), 12, 0);
+    else
+        PDMDevHlpISASetIrq(s->CTX_SUFF(pDevIns), 1, 0);
+    /* ...and clears the OBF bits. */
+    s->status &= ~(KBD_STAT_OBF | KBD_STAT_MOUSE_OBF);
+
+    /* Check if more data is available. */
     kbd_update_irq(s);
 #ifdef DEBUG_KBD
@@ -591 +597 @@
     s->scan_enabled = 1;
     s->scancode_set = 2;
+    /* Flush the keyboard queue. */
+    s->queue.count = 0;
+    s->queue.rptr = 0;
+    s->queue.wptr = 0;
 }
 
@@ -1055 +1065 @@
     switch(s->write_cmd) {
     case 0:
+        /* Automatically enables keyboard interface. */
+        s->mode &= ~KBD_MODE_DISABLE_KBD;
         rc = kbd_write_keyboard(s, val);
         break;