Changeset 87767 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Feb 16, 2021 4:41:18 PM (4 years ago)

Author:

vboxsync

Message:

VMM/TM,Devices/*: Changed the device and usb timer callbacks to take a timer handle rather than a pointer. Try a little harder using it. bugref:9943

Location:

trunk/src/VBox/Devices/USB

Files:

• DevOHCI.cpp (modified) (3 diffs)
• VUSBDevice.cpp (modified) (1 diff)

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -904 +904 @@
 static int                  ohciR3InDoneQueueFind(POHCICC pThisCC, uint32_t GCPhysTD);
 # endif
-static DECLCALLBACK(void)   ohciR3LoadReattachDevices(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser);
 #endif /* IN_RING3 */
 RT_C_DECLS_END
@@ -5804 +5803 @@
 
 /**
+ * @callback_method_impl{FNTMTIMERDEV,
+ *      Reattaches devices after a saved state load.}
+ */
+static DECLCALLBACK(void) ohciR3LoadReattachDevices(PPDMDEVINS pDevIns, TMTIMERHANDLE hTimer, void *pvUser)
+{
+    POHCICC      pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, POHCICC);
+    POHCILOAD    pLoad   = pThisCC->pLoad;
+    LogFlow(("ohciR3LoadReattachDevices:\n"));
+    Assert(hTimer == pLoad->hTimer); RT_NOREF(pvUser);
+
+    /*
+     * Reattach devices.
+     */
+    for (unsigned i = 0; i < pLoad->cDevs; i++)
+        VUSBIRhAttachDevice(pThisCC->RootHub.pIRhConn, pLoad->apDevs[i]);
+
+    /*
+     * Cleanup.
+     */
+    PDMDevHlpTimerDestroy(pDevIns, hTimer);
+    pLoad->hTimer = NIL_TMTIMERHANDLE;
+    PDMDevHlpMMHeapFree(pDevIns, pLoad);
+    pThisCC->pLoad = NULL;
+}
+
+
+/**
  * Done state load operation.
  *
@@ -5830 +5856 @@
 
     return VINF_SUCCESS;
-}
-
-
-/**
- * @callback_method_impl{FNTMTIMERDEV,
- *      Reattaches devices after a saved state load.}
- */
-static DECLCALLBACK(void) ohciR3LoadReattachDevices(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
-{
-    POHCICC      pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, POHCICC);
-    POHCILOAD    pLoad   = pThisCC->pLoad;
-    LogFlow(("ohciR3LoadReattachDevices:\n"));
-    RT_NOREF(pTimer, pvUser);
-
-    /*
-     * Reattach devices.
-     */
-    for (unsigned i = 0; i < pLoad->cDevs; i++)
-        VUSBIRhAttachDevice(pThisCC->RootHub.pIRhConn, pLoad->apDevs[i]);
-
-    /*
-     * Cleanup.
-     */
-    PDMDevHlpTimerDestroy(pDevIns, pLoad->hTimer);
-    pLoad->hTimer = NIL_TMTIMERHANDLE;
-    PDMDevHlpMMHeapFree(pDevIns, pLoad);
-    pThisCC->pLoad = NULL;
 }
 

trunk/src/VBox/Devices/USB/VUSBDevice.cpp

@@ -1372 +1372 @@
 
 /**
- * Timer callback for doing reset completion.
- *
- * @param   pUsbIns     The USB device instance.
- * @param   pTimer      The timer instance.
- * @param   pvUser      The VUSB device data.
- * @thread EMT
- */
-static DECLCALLBACK(void) vusbDevResetDoneTimer(PPDMUSBINS pUsbIns, PTMTIMER pTimer, void *pvUser)
-{
-    RT_NOREF(pUsbIns, pTimer);
+ * @callback_method_impl{FNTMTIMERUSB,
+ *          Timer callback for doing reset completion.}
+ */
+static DECLCALLBACK(void) vusbDevResetDoneTimer(PPDMUSBINS pUsbIns, TMTIMERHANDLE hTimer, void *pvUser)
+{
     PVUSBDEV        pDev  = (PVUSBDEV)pvUser;
     PVUSBRESETARGS  pArgs = (PVUSBRESETARGS)pDev->pvArgs;
     Assert(pDev->pUsbIns == pUsbIns);
+    RT_NOREF(pUsbIns, hTimer);
 
     AssertPtr(pArgs);