Changeset 82202 in vbox for trunk/src

Timestamp:

Nov 25, 2019 9:50:56 PM (5 years ago)

Author:

vboxsync

Message:

DevPS2: simplifying fluff. bugref:9218

File:

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

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

@@ -454 +454 @@
 }
 
-static int kbd_write_data(PPDMDEVINS pDevIns, PKBDSTATE s, uint32_t val)
-{
-    int rc = VINF_SUCCESS;
+static VBOXSTRICTRC kbd_write_data(PPDMDEVINS pDevIns, PKBDSTATE s, uint32_t val)
+{
+    VBOXSTRICTRC rc = VINF_SUCCESS;
 
 #ifdef DEBUG_KBD
@@ -488 +488 @@
 #  else /* IN_RING3 */
         PDMDevHlpA20Set(s->CTX_SUFF(pDevIns), !!(val & 2));
-#  endif /* !IN_RING3 */
+#  endif /* IN_RING3 */
 #endif
         if (!(val & 1)) {
@@ -643 +643 @@
 /* -=-=-=-=-=- wrappers -=-=-=-=-=- */
 
+/** Fluff bits indexed by size (1,2,4). */
+static uint32_t const g_afFluff[5] =
+{
+    /* [0] = */ 0,
+    /* [1] = */ 0,
+    /* [2] = */ UINT32_C(0xff00),
+    /* [3] = */ 0,
+    /* [4] = */ UINT32_C(0xffffff00) /* Crazy Apple (Darwin 6.0.2 and earlier). */
+};
+
 /**
  * @callback_method_impl{FNIOMIOPORTNEWIN,
@@ -652 +662 @@
     RT_NOREF(pvUser, offPort);
     Assert(offPort == 0);
-
-    switch (cb)
-    {
-        case 1:
-            *pu32 = kbd_read_data(pDevIns, pThis);
-            Log2(("kbdIOPortDataRead: *pu32=%#x\n", *pu32));
-            return VINF_SUCCESS;
-
-        case 4:
-        case 2:
-        {
-            uint32_t const uFluff = cb == 2 ? UINT32_C(0x0000ff00)
-                                 :            UINT32_C(0xffffff00) /* Crazy Apple (Darwin 6.0.2 and earlier). */;
-            *pu32 = uFluff | kbd_read_data(pDevIns, pThis);
-            Log2(("kbdIOPortDataRead: cb=%u *pu32=%#x\n", cb, *pu32));
-            return VINF_SUCCESS;
-        }
-
-        default:
-            ASSERT_GUEST_MSG_FAILED(("Port=0x60+%x cb=%d\n", offPort, cb));
-            return VERR_IOM_IOPORT_UNUSED;
-    }
+    Assert(cb == 1 || cb == 2 || cb == 4);
+
+    *pu32 = kbd_read_data(pDevIns, pThis) | g_afFluff[cb];
+    Log2(("kbdIOPortDataRead: cb=%u *pu32=%#x\n", cb, *pu32));
+    return VINF_SUCCESS;
 }
 
@@ -682 +675 @@
 static DECLCALLBACK(VBOXSTRICTRC) kbdIOPortDataWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t u32, unsigned cb)
 {
-    VBOXSTRICTRC rc = VINF_SUCCESS;
     RT_NOREF(offPort, pvUser);
     Assert(offPort == 0);
@@ -689 +681 @@
     {
         PKBDSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PKBDSTATE);
-        rc = kbd_write_data(pDevIns, pThis, (uint8_t)u32);
-        Log2(("kbdIOPortDataWrite: Port=0x60+%x cb=%d u32=%#x\n", offPort, cb, u32));
-    }
-    else
-        ASSERT_GUEST_MSG_FAILED(("Port=0x60+%x cb=%d\n", offPort, cb));
-    return rc;
+        VBOXSTRICTRC rc = kbd_write_data(pDevIns, pThis, (uint8_t)u32);
+        Log2(("kbdIOPortDataWrite: Port=0x60+%x cb=%d u32=%#x rc=%Rrc\n", offPort, cb, u32, VBOXSTRICTRC_VAL(rc)));
+        return rc;
+    }
+    Assert(cb == 4);
+    ASSERT_GUEST_MSG_FAILED(("Port=0x60+%x cb=%d\n", offPort, cb));
+    return VINF_SUCCESS;
 }
 
@@ -706 +699 @@
     RT_NOREF(offPort, pvUser);
     Assert(offPort == 0);
-
-    switch (cb)
-    {
-        case 1:
-            *pu32 = pThis->status;
-            Log2(("kbdIOPortStatusRead: -> *pu32=%#x\n", *pu32));
-            return VINF_SUCCESS;
-
-        case 2:
-        case 4:
-        {
-            uint32_t const uFluff = cb == 2 ? UINT32_C(0x0000ff00)
-                                 :            UINT32_C(0xffffff00) /* Crazy Apple (Darwin 6.0.2 and earlier). */;
-            *pu32 = uFluff | pThis->status;
-            Log2(("kbdIOPortStatusRead: cb=%u -> *pu32=%#x\n", cb, *pu32));
-            return VINF_SUCCESS;
-        }
-
-        default:
-            ASSERT_GUEST_MSG_FAILED(("Port=0x64+%x cb=%d\n", offPort, cb));
-            return VERR_IOM_IOPORT_UNUSED;
-    }
+    Assert(cb == 1 || cb == 2 || cb == 4);
+
+    *pu32 = pThis->status | g_afFluff[cb];
+    Log2(("kbdIOPortStatusRead: cb=%u -> *pu32=%#x\n", cb, *pu32));
+    return VINF_SUCCESS;
 }
 
@@ -746 +722 @@
         return rc;
     }
+    Assert(cb == 4);
     ASSERT_GUEST_MSG_FAILED(("offPort=0x64+%x cb=%d\n", offPort, cb));
     return VINF_SUCCESS;