Changeset 42140 in vbox for trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp

Timestamp:

Jul 13, 2012 9:59:27 AM (12 years ago)

Author:

vboxsync

Message:

PDMDriver: Changed the previous fix to use the top level device registration structure pointer instead of the internal one. That's what we're doing elsewhere.

File:

• trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp

@@ -396 +396 @@
      */
     const char *pszDevice = pLun->pDevIns
-                          ? pLun->pDevIns->Internal.s.pDevR3->pReg->szName
-                          : pLun->pUsbIns->Internal.s.pUsbDev->pReg->szName;
+                          ? pLun->pDevIns->pReg->szName
+                          : pLun->pUsbIns->pReg->szName;
     char        szLun[32];
     RTStrPrintf(szLun, sizeof(szLun), "%u", pLun->iLun);
@@ -834 +834 @@
      * The requirement is that the driver/device above has a detach method.
      */
-    if (pDrvIns->Internal.s.pUp
+    if (  pDrvIns->Internal.s.pUp
         ? !pDrvIns->Internal.s.pUp->pReg->pfnDetach
         :   pDrvIns->Internal.s.pLun->pDevIns
-          ? !pDrvIns->Internal.s.pLun->pDevIns->Internal.s.pDevR3->pReg->pfnDetach
-          : !pDrvIns->Internal.s.pLun->pUsbIns->Internal.s.pUsbDev->pReg->pfnDriverDetach
+          ? !pDrvIns->Internal.s.pLun->pDevIns->pReg->pfnDetach
+          : !pDrvIns->Internal.s.pLun->pUsbIns->pReg->pfnDriverDetach
        )
     {
@@ -910 +910 @@
                 if (pLun->pDevIns)
                 {
-                    if (pLun->pDevIns->Internal.s.pDevR3->pReg->pfnDetach)
+                    if (pLun->pDevIns->pReg->pfnDetach)
                     {
                         PDMCritSectEnter(pLun->pDevIns->pCritSectRoR3, VERR_IGNORED);
-                        pLun->pDevIns->Internal.s.pDevR3->pReg->pfnDetach(pLun->pDevIns, pLun->iLun, fFlags);
+                        pLun->pDevIns->pReg->pfnDetach(pLun->pDevIns, pLun->iLun, fFlags);
                         PDMCritSectLeave(pLun->pDevIns->pCritSectRoR3);
                     }
@@ -919 +919 @@
                 else
                 {
-                    if (pLun->pUsbIns->Internal.s.pUsbDev->pReg->pfnDriverDetach)
+                    if (pLun->pUsbIns->pReg->pfnDriverDetach)
                     {
                         /** @todo USB device locking? */
                         /** @todo add flags to pfnDriverDetach. */
-                        pLun->pUsbIns->Internal.s.pUsbDev->pReg->pfnDriverDetach(pLun->pUsbIns, pLun->iLun);
+                        pLun->pUsbIns->pReg->pfnDriverDetach(pLun->pUsbIns, pLun->iLun);
                     }
                 }