Changeset 62888 in vbox for trunk/src/VBox/Devices/Input/UsbMouse.cpp

Timestamp:

Aug 2, 2016 10:34:23 PM (9 years ago)

Author:

vboxsync

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

109488

Message:

tstUsbMouse: Fixed.

File:

• trunk/src/VBox/Devices/Input/UsbMouse.cpp (modified) (5 diffs)

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

@@ -1975 +1975 @@
                                 switch (pThis->enmMode)
                                 {
-                                case USBHIDMODE_ABSOLUTE:
-                                    cbDesc = sizeof(g_UsbHidTIfHidDesc);
-                                    pDesc = (const uint8_t *)&g_UsbHidTIfHidDesc;
-                                    break;
-                                case USBHIDMODE_RELATIVE:
-                                    cbDesc = sizeof(g_UsbHidMIfHidDesc);
-                                    pDesc = (const uint8_t *)&g_UsbHidMIfHidDesc;
-                                    break;
-                                case USBHIDMODE_MULTI_TOUCH:
-                                    cbDesc = sizeof(g_UsbHidMTIfHidDesc);
-                                    pDesc = (const uint8_t *)&g_UsbHidMTIfHidDesc;
-                                    break;
-                                default:
-                                    cbDesc = 0;
-                                    pDesc = 0;
-                                    break;
+                                    case USBHIDMODE_ABSOLUTE:
+                                        cbDesc = sizeof(g_UsbHidTIfHidDesc);
+                                        pDesc = (const uint8_t *)&g_UsbHidTIfHidDesc;
+                                        break;
+                                    case USBHIDMODE_RELATIVE:
+                                        cbDesc = sizeof(g_UsbHidMIfHidDesc);
+                                        pDesc = (const uint8_t *)&g_UsbHidMIfHidDesc;
+                                        break;
+                                    case USBHIDMODE_MULTI_TOUCH:
+                                        cbDesc = sizeof(g_UsbHidMTIfHidDesc);
+                                        pDesc = (const uint8_t *)&g_UsbHidMTIfHidDesc;
+                                        break;
+                                    default:
+                                        cbDesc = 0;
+                                        pDesc = 0;
+                                        break;
                                 }
                                 /* Returned data is written after the setup message. */
@@ -2006 +2006 @@
                                 switch (pThis->enmMode)
                                 {
-                                case USBHIDMODE_ABSOLUTE:
-                                    cbDesc = sizeof(g_UsbHidTReportDesc);
-                                    pDesc = (const uint8_t *)&g_UsbHidTReportDesc;
-                                    break;
-                                case USBHIDMODE_RELATIVE:
-                                    cbDesc = sizeof(g_UsbHidMReportDesc);
-                                    pDesc = (const uint8_t *)&g_UsbHidMReportDesc;
-                                    break;
-                                case USBHIDMODE_MULTI_TOUCH:
-                                    cbDesc = sizeof(g_UsbHidMTReportDesc);
-                                    pDesc = (const uint8_t *)&g_UsbHidMTReportDesc;
-                                    break;
-                                default:
-                                    cbDesc = 0;
-                                    pDesc = 0;
-                                    break;
+                                    case USBHIDMODE_ABSOLUTE:
+                                        cbDesc = sizeof(g_UsbHidTReportDesc);
+                                        pDesc = (const uint8_t *)&g_UsbHidTReportDesc;
+                                        break;
+                                    case USBHIDMODE_RELATIVE:
+                                        cbDesc = sizeof(g_UsbHidMReportDesc);
+                                        pDesc = (const uint8_t *)&g_UsbHidMReportDesc;
+                                        break;
+                                    case USBHIDMODE_MULTI_TOUCH:
+                                        cbDesc = sizeof(g_UsbHidMTReportDesc);
+                                        pDesc = (const uint8_t *)&g_UsbHidMTReportDesc;
+                                        break;
+                                    default:
+                                        cbDesc = 0;
+                                        pDesc = 0;
+                                        break;
                                 }
                                 /* Returned data is written after the setup message. */
@@ -2257 +2257 @@
     switch (pThis->enmMode)
     {
-    case USBHIDMODE_ABSOLUTE:
-        return &g_UsbHidTDescCache;
-    case USBHIDMODE_RELATIVE:
-        return &g_UsbHidMDescCache;
-    case USBHIDMODE_MULTI_TOUCH:
-        return &g_UsbHidMTDescCache;
-    default:
-        return NULL;
+        case USBHIDMODE_ABSOLUTE:
+            return &g_UsbHidTDescCache;
+        case USBHIDMODE_RELATIVE:
+            return &g_UsbHidMDescCache;
+        case USBHIDMODE_MULTI_TOUCH:
+            return &g_UsbHidMTDescCache;
+        default:
+            return NULL;
     }
 }
@@ -2318 +2318 @@
     PDMUSB_CHECK_VERSIONS_RETURN(pUsbIns);
     PUSBHID pThis = PDMINS_2_DATA(pUsbIns, PUSBHID);
-    char szMode[64];
     LogRelFlow(("usbHidConstruct/#%u:\n", iInstance));
 
@@ -2342 +2341 @@
     if (RT_FAILURE(rc))
         return rc;
+    char szMode[64];
     rc = CFGMR3QueryStringDef(pCfg, "Mode", szMode, sizeof(szMode), "relative");
     if (RT_FAILURE(rc))