Changeset 39959 in vbox for trunk

Timestamp:

Feb 2, 2012 5:11:50 PM (13 years ago)

Author:

vboxsync

Message:

New and improved PS/2 keyboard emulation.

Location:

trunk/src/VBox/Devices

Files:

• Input/DevPS2.cpp (modified) (26 diffs)
• Input/PS2Dev.h (added)
• Input/PS2K.cpp (added)
• Makefile.kmk (modified) (3 diffs)

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

@@ -52 +52 @@
 
 #include "VBoxDD.h"
-
-#define PCKBD_SAVED_STATE_VERSION 5
+#include "PS2Dev.h"
+
+#define PCKBD_SAVED_STATE_VERSION 6
 
 
@@ -205 +206 @@
     int32_t translate;
     int32_t scancode_set;   /* 1=XT, 2=AT, 3=PS/2 */
+    xlat_state_t    xlat_state;
     /* mouse state */
     int32_t mouse_write_cmd;
@@ -227 +229 @@
     /** Pointer to the device instance. */
     PPDMDEVINSR0                pDevInsR0;
+
+#if HC_ARCH_BITS == 32
+    uint32_t                    Alignment0;
+#endif
+    /** Keyboard state (implemented in separate PS2K module). */
+    PS2K                        Kbd;
     /** Critical section protecting the state. */
     PDMCRITSECT                 CritSect;
+
+#ifdef HC_ARCH_BITS //OLD_KBD
     /**
      * Keyboard port - LUN#0.
@@ -247 +257 @@
         R3PTRTYPE(PPDMIKEYBOARDCONNECTOR)   pDrv;
     } Keyboard;
+#endif
 
     /**
@@ -301 +312 @@
     MouseEventQueue *meq = &s->mouse_event_queue;
     int irq12_level, irq1_level;
+    uint8_t val;
 
     irq1_level = 0;
@@ -312 +324 @@
         s->status &= ~KBD_STAT_MOUSE_OBF;
         /* Keyboard data has priority if both kbd and aux data is available. */
+#ifdef OLD_KBD
         if (q->count && !(s->mode & KBD_MODE_DISABLE_KBD))
         {
@@ -320 +333 @@
             q->count--;
         }
-        else if ((mcq->count || meq->count) /*&& !(s->mode & KBD_MODE_DISABLE_MOUSE)*/)
+#else
+        if (!(s->mode & KBD_MODE_DISABLE_KBD) && PS2KByteFromKbd(&s->Kbd, &val) == VINF_SUCCESS)
+        {
+            bool    fHaveData = true;
+
+            /* If scancode translation is on (it usually is), there's more work to do. */
+            if (s->translate)
+            {
+                uint8_t     xlated_val;
+
+                s->xlat_state = XlateAT2PC(s->xlat_state, val, &xlated_val);
+                val = xlated_val;
+
+                /* If the translation state is XS_BREAK, there's nothing to report
+                 * and we keep going until the state changes or there's no more data.
+                 */
+                while (s->xlat_state == XS_BREAK && PS2KByteFromKbd(&s->Kbd, &val) == VINF_SUCCESS)
+                {
+                    s->xlat_state = XlateAT2PC(s->xlat_state, val, &xlated_val);
+                    val = xlated_val;
+                }
+                /* This can happen if the last byte in the queue is F0... */
+                if (s->xlat_state == XS_BREAK)
+                    fHaveData = false;
+            }
+            if (fHaveData)
+            {
+                s->dbbout = val;
+                s->status |= KBD_STAT_OBF;
+            }
+        }
+#endif
+        else if ((mcq->count || meq->count) && !(s->mode & KBD_MODE_DISABLE_MOUSE))
         {
             s->status |= KBD_STAT_OBF | KBD_STAT_MOUSE_OBF;
@@ -356 +401 @@
 }
 
+void KBCUpdateInterrupts(void *pKbc)
+{
+    KBDState    *s = (KBDState *)pKbc;
+    kbd_update_irq(s);
+}
+
 static void kbd_queue(KBDState *s, int b, int aux)
 {
@@ -596 +647 @@
 }
 
+#ifdef OLD_KBD
+
 static void kbd_reset_keyboard(KBDState *s)
 {
@@ -604 +657 @@
     s->queue.rptr = 0;
     s->queue.wptr = 0;
+}
+
+/* The keyboard BAT is specified to take several hundred milliseconds. We need
+ * to delay sending the result to the host for at least a tiny little while.
+ */
+static DECLCALLBACK(void) kbd_timer_cb(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
+{
+    KBDState *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
+    int rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+    AssertReleaseRC(rc);
+
+    kbd_queue(pThis, KBD_REPLY_POR, 0);
+
+    PDMCritSectLeave(&pThis->CritSect);
 }
 
@@ -701 +768 @@
     return VINF_SUCCESS;
 }
+
+#else
+PS2K *GetPS2KFromDevIns(PPDMDEVINS pDevIns)
+{
+    KBDState *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
+    return &pThis->Kbd;
+}
+#endif
 
 static void kbd_mouse_set_reported_buttons(KBDState *s, unsigned fButtons, unsigned fButtonMask)
@@ -1073 +1148 @@
         /* Automatically enables keyboard interface. */
         s->mode &= ~KBD_MODE_DISABLE_KBD;
+#ifdef OLD_KBD
         rc = kbd_write_keyboard(s, val);
+#else
+        rc = PS2KByteToKbd(&s->Kbd, val);
+        if (rc == VINF_SUCCESS)
+            kbd_update_irq(s);
+#endif
         break;
     case KBD_CCMD_WRITE_MODE:
@@ -1104 +1185 @@
         break;
     case KBD_CCMD_WRITE_MOUSE:
+        /* Automatically enables aux interface. */
+        s->mode &= ~KBD_MODE_DISABLE_MOUSE;
         rc = kbd_write_mouse(s, val);
         break;
@@ -1172 +1255 @@
     qemu_put_8s(f, &s->status);
     qemu_put_8s(f, &s->mode);
-    qemu_put_be32s(f, &s->kbd_write_cmd);
-    qemu_put_be32s(f, &s->scan_enabled);
+    qemu_put_8s(f, &s->dbbout);
     qemu_put_be32s(f, &s->mouse_write_cmd);
     qemu_put_8s(f, &s->mouse_status);
@@ -1189 +1271 @@
     qemu_put_8s(f, &s->mouse_buttons_reported);
 
+#ifdef OLD_KBD
     /* XXX: s->scancode_set isn't being saved, but we only really support set 2,
      * so no real harm done.
@@ -1201 +1284 @@
         SSMR3PutU8(f, s->queue.data[i]);
     Log(("kbd_save: %d keyboard queue items stored\n", s->queue.count));
+#endif
 
     cItems = s->mouse_command_queue.count;
@@ -1237 +1321 @@
     qemu_get_8s(f, &s->status);
     qemu_get_8s(f, &s->mode);
-    qemu_get_be32s(f, (uint32_t *)&s->kbd_write_cmd);
-    qemu_get_be32s(f, (uint32_t *)&s->scan_enabled);
+    if (version_id <= 5)
+    {
+        qemu_get_be32s(f, (uint32_t *)&s->kbd_write_cmd);
+        qemu_get_be32s(f, (uint32_t *)&s->scan_enabled);
+    }
+    else
+    {
+        qemu_get_8s(f, &s->dbbout);
+    }
     qemu_get_be32s(f, (uint32_t *)&s->mouse_write_cmd);
     qemu_get_8s(f, &s->mouse_status);
@@ -1281 +1372 @@
      * Load the queues
      */
-    rc = SSMR3GetU32(f, &u32);
-    if (RT_FAILURE(rc))
-        return rc;
-    if (u32 > RT_ELEMENTS(s->queue.data))
-    {
-        AssertMsgFailed(("u32=%#x\n", u32));
-        return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
-    }
-    for (i = 0; i < u32; i++)
-    {
-        rc = SSMR3GetU8(f, &s->queue.data[i]);
+    if (version_id <= 5)
+    {
+        rc = SSMR3GetU32(f, &u32);
         if (RT_FAILURE(rc))
             return rc;
-    }
-    s->queue.wptr = u32 % RT_ELEMENTS(s->queue.data);
-    s->queue.count = u32;
-    Log(("kbd_load: %d keyboard queue items loaded\n", u32));
+        if (u32 > RT_ELEMENTS(s->queue.data))
+        {
+            AssertMsgFailed(("u32=%#x\n", u32));
+            return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
+        }
+        for (i = 0; i < u32; i++)
+        {
+            rc = SSMR3GetU8(f, &s->queue.data[i]);
+            if (RT_FAILURE(rc))
+                return rc;
+        }
+        s->queue.wptr = u32 % RT_ELEMENTS(s->queue.data);
+        s->queue.count = u32;
+        Log(("kbd_load: %d keyboard queue items loaded\n", u32));
+    }
 
     rc = SSMR3GetU32(f, &u32);
@@ -1488 +1582 @@
 static DECLCALLBACK(int) kbdSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle)
 {
-    kbd_save(pSSMHandle, PDMINS_2_DATA(pDevIns, KBDState *));
+    KBDState    *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
+    kbd_save(pSSMHandle, pThis);
+    PS2KSaveState(pSSMHandle, &pThis->Kbd);
     return VINF_SUCCESS;
 }
@@ -1504 +1600 @@
 static DECLCALLBACK(int) kbdLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
 {
+    KBDState    *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
+    int rc;
+
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
-    return kbd_load(pSSMHandle, PDMINS_2_DATA(pDevIns, KBDState *), uVersion);
+    rc = kbd_load(pSSMHandle, pThis, uVersion);
+    if (uVersion >= 6)
+        rc = PS2KLoadState(pSSMHandle, &pThis->Kbd, uVersion);
+    return rc;
 }
 
@@ -1519 +1621 @@
 
     kbd_reset(pThis);
+#ifdef OLD_KBD
     /* Activate the PS/2 keyboard by default. */
     if (pThis->Keyboard.pDrv)
         pThis->Keyboard.pDrv->pfnSetActive(pThis->Keyboard.pDrv, true);
-}
-
+#else
+    PS2KReset(&pThis->Kbd);
+#endif
+}
+
+#ifdef OLD_KBD
 
 /* -=-=-=-=-=- Keyboard: IBase  -=-=-=-=-=- */
@@ -1559 +1666 @@
     return VINF_SUCCESS;
 }
+#endif
 
 
@@ -1635 +1743 @@
         /* LUN #0: keyboard */
         case 0:
+#ifdef OLD_KBD
             rc = PDMDevHlpDriverAttach(pDevIns, iLUN, &pThis->Keyboard.IBase, &pThis->Keyboard.pDrvBase, "Keyboard Port");
             if (RT_SUCCESS(rc))
@@ -1652 +1761 @@
             else
                 AssertLogRelMsgFailed(("Failed to attach LUN #0! rc=%Rrc\n", rc));
+#else
+            rc = PS2KAttach(pDevIns, &pThis->Kbd, iLUN, fFlags);
+            if (RT_FAILURE(rc))
+                return rc;
+
+#endif
             break;
 
@@ -1737 +1852 @@
     KBDState   *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
     pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
-    NOREF(offDelta);
+    PS2KRelocate(&pThis->Kbd, offDelta);
 }
 
@@ -1791 +1906 @@
     pThis->pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
     pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
+
+#if OLD_KBD
     pThis->Keyboard.IBase.pfnQueryInterface = kbdKeyboardQueryInterface;
     pThis->Keyboard.IPort.pfnPutEvent       = kbdKeyboardPutEvent;
+#else
+    rc = PS2KConstruct(pDevIns, &pThis->Kbd, pThis, iInstance);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif 
 
     pThis->Mouse.IBase.pfnQueryInterface    = kbdMouseQueryInterface;

trunk/src/VBox/Devices/Makefile.kmk

@@ -282 +282 @@
  DevicesR3_SOURCES       = \
         Input/DevPS2.cpp \
+        Input/PS2K.cpp \
         Input/UsbKbd.cpp \
         Input/UsbMouse.cpp \
@@ -560 +561 @@
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \
+        Input/PS2K.cpp \
         PC/DevACPI.cpp \
         PC/DevPit-i8254.cpp \
@@ -663 +665 @@
         Graphics/DevVGA.cpp \
         Input/DevPS2.cpp \
+        Input/PS2K.cpp \
         PC/DevACPI.cpp \
         PC/DevPit-i8254.cpp \