Changeset 69704 in vbox for trunk

Timestamp:

Nov 15, 2017 1:05:01 PM (7 years ago)

Author:

vboxsync

Message:

DevPS2: They really do think different! Darwin 6.0.2 and earlier reads a DWORD to get one byte from the KBC.

File:

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

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

@@ -661 +661 @@
 PDMBOTHCBDECL(int) kbdIOPortDataRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
+    uint32_t    fluff = 0;
+    KBDState    *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
+
     NOREF(pvUser);
-    if (cb == 1)
-    {
-        KBDState *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
-        *pu32 = kbd_read_data(pThis, Port);
+    switch (cb) {
+    case 4:
+        fluff |= 0xffff0000;    /* Crazy Apple (Darwin 6.0.2 and earlier). */
+        RT_FALL_THRU();
+    case 2:
+        fluff |= 0x0000ff00;
+        RT_FALL_THRU();
+    case 1:
+        *pu32 = fluff | kbd_read_data(pThis, Port);
         Log2(("kbdIOPortDataRead: Port=%#x cb=%d *pu32=%#x\n", Port, cb, *pu32));
         return VINF_SUCCESS;
-    }
-    AssertMsgFailed(("Port=%#x cb=%d\n", Port, cb));
-    return VERR_IOM_IOPORT_UNUSED;
+    default:
+        AssertMsgFailed(("Port=%#x cb=%d\n", Port, cb));
+        return VERR_IOM_IOPORT_UNUSED;
+    }
 }
 
@@ -712 +721 @@
 PDMBOTHCBDECL(int) kbdIOPortStatusRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
-    uint16_t    fluff = 0;
+    uint32_t    fluff = 0;
     KBDState    *pThis = PDMINS_2_DATA(pDevIns, KBDState *);
 
     NOREF(pvUser);
     switch (cb) {
+    case 4:
+        fluff |= 0xffff0000;    /* Crazy Apple (Darwin 6.0.2 and earlier). */
+        RT_FALL_THRU();
     case 2:
-        fluff = 0xff00;
+        fluff |= 0x0000ff00;
         RT_FALL_THRU();
     case 1: