Changeset 37388 in vbox

Timestamp:

Jun 8, 2011 3:49:55 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

72173

Message:

Devices/Input/UsbMouse, UsbKbd: Support explicit USB HID descriptor requests (USB HID spec 6.2.1), logging fix.

Location:

trunk/src/VBox/Devices/Input

Files:

• UsbKbd.cpp (modified) (5 diffs)
• UsbMouse.cpp (modified) (5 diffs)

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

@@ -43 +43 @@
 /** @name USB HID specific descriptor types
  * @{ */
+#define DT_IF_HID_DESCRIPTOR        0x21
 #define DT_IF_HID_REPORT            0x22
 /** @} */
@@ -318 +319 @@
         /* .MaxPower = */           50 /* 100mA */
     },
-    NULL,
-    &g_aUsbHidInterfaces[0]
+    NULL,                           /* pvMore */
+    &g_aUsbHidInterfaces[0],
+    NULL                            /* pvOriginal */
 };
 
@@ -904 +906 @@
         AssertReturn(u8HidCode <= VBOX_USB_MAX_USAGE_CODE, VERR_INTERNAL_ERROR);
 
-        LogRelFlowFunc(("key %s: 0x%x->0x%x\n",
+        LogFlowFunc(("key %s: 0x%x->0x%x\n",
                         fKeyDown ? "down" : "up", u8KeyCode, u8HidCode));
 
@@ -1084 +1086 @@
                         switch (pSetup->wValue >> 8)
                         {
+                            case DT_IF_HID_DESCRIPTOR:
+                            {
+                                uint32_t    cbCopy;
+
+                                /* Returned data is written after the setup message. */
+                                cbCopy = pUrb->cbData - sizeof(*pSetup);
+                                cbCopy = RT_MIN(cbCopy, sizeof(g_UsbHidIfHidDesc));
+                                Log(("usbHidKbd: GET_DESCRIPTOR DT_IF_HID_DESCRIPTOR wValue=%#x wIndex=%#x cbCopy=%#x\n", pSetup->wValue, pSetup->wIndex, cbCopy));
+                                memcpy(&pUrb->abData[sizeof(*pSetup)], &g_UsbHidIfHidDesc, cbCopy);
+                                return usbHidCompleteOk(pThis, pUrb, cbCopy + sizeof(*pSetup));
+                            }
+
                             case DT_IF_HID_REPORT:
+                            {
                                 uint32_t    cbCopy;
 
@@ -1093 +1108 @@
                                 memcpy(&pUrb->abData[sizeof(*pSetup)], &g_UsbHidReportDesc, cbCopy);
                                 return usbHidCompleteOk(pThis, pUrb, cbCopy + sizeof(*pSetup));
+                            }
+
                             default:
                                 Log(("usbHid: GET_DESCRIPTOR, huh? wValue=%#x wIndex=%#x\n", pSetup->wValue, pSetup->wIndex));

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

@@ -43 +43 @@
 /** @name USB HID specific descriptor types
  * @{ */
+#define DT_IF_HID_DESCRIPTOR        0x21
 #define DT_IF_HID_REPORT            0x22
 /** @} */
@@ -409 +410 @@
         /* .MaxPower = */           50 /* 100mA */
     },
-    NULL,
-    &g_aUsbHidMInterfaces[0]
+    NULL,                           /* pvMore */
+    &g_aUsbHidMInterfaces[0],
+    NULL                            /* pvOriginal */
 };
 
@@ -425 +427 @@
         /* .MaxPower = */           50 /* 100mA */
     },
-    NULL,
-    &g_aUsbHidTInterfaces[0]
+    NULL,                           /* pvMore */
+    &g_aUsbHidTInterfaces[0],
+    NULL                            /* pvOriginal */
 };
 
@@ -960 +963 @@
                         switch (pSetup->wValue >> 8)
                         {
+                            case DT_IF_HID_DESCRIPTOR:
+                            {
+                                uint32_t        cbCopy;
+                                uint32_t        cbDesc;
+                                const uint8_t   *pDesc;
+
+                                if (pThis->isAbsolute)
+                                {
+                                    cbDesc = sizeof(g_UsbHidTIfHidDesc);
+                                    pDesc = (const uint8_t *)&g_UsbHidTIfHidDesc;
+                                }
+                                else
+                                {
+                                    cbDesc = sizeof(g_UsbHidMIfHidDesc);
+                                    pDesc = (const uint8_t *)&g_UsbHidMIfHidDesc;
+                                }
+                                /* Returned data is written after the setup message. */
+                                cbCopy = pUrb->cbData - sizeof(*pSetup);
+                                cbCopy = RT_MIN(cbCopy, cbDesc);
+                                Log(("usbHidMouse: GET_DESCRIPTOR DT_IF_HID_DESCRIPTOR wValue=%#x wIndex=%#x cbCopy=%#x\n", pSetup->wValue, pSetup->wIndex, cbCopy));
+                                memcpy(&pUrb->abData[sizeof(*pSetup)], pDesc, cbCopy);
+                                return usbHidCompleteOk(pThis, pUrb, cbCopy + sizeof(*pSetup));
+                            }
+
                             case DT_IF_HID_REPORT:
+                            {
                                 uint32_t        cbCopy;
                                 uint32_t        cbDesc;
@@ -981 +1009 @@
                                 memcpy(&pUrb->abData[sizeof(*pSetup)], pDesc, cbCopy);
                                 return usbHidCompleteOk(pThis, pUrb, cbCopy + sizeof(*pSetup));
+                            }
+
                             default:
                                 Log(("usbHid: GET_DESCRIPTOR, huh? wValue=%#x wIndex=%#x\n", pSetup->wValue, pSetup->wIndex));