Changeset 42138 in vbox

Timestamp:

Jul 13, 2012 9:49:48 AM (13 years ago)

Author:

vboxsync

Message:

PDMDriver.cpp: A pLun can be used with a normal device or a usb device, check if pDevIns is NULL to find out which it is.

File:

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

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

@@ -395 +395 @@
      * Gather the attributes used in the matching process.
      */
-    const char *pszDevice = pLun->pDevIns->Internal.s.pDevR3->pReg->szName;
+    const char *pszDevice = pLun->pDevIns
+                          ? pLun->pDevIns->Internal.s.pDevR3->pReg->szName
+                          : pLun->pUsbIns->Internal.s.pUsbDev->pReg->szName;
     char        szLun[32];
     RTStrPrintf(szLun, sizeof(szLun), "%u", pLun->iLun);
@@ -834 +836 @@
     if (pDrvIns->Internal.s.pUp
         ? !pDrvIns->Internal.s.pUp->pReg->pfnDetach
-        : !pDrvIns->Internal.s.pLun->pDevIns->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
+       )
     {
         AssertMsgFailed(("Cannot detach driver instance because the driver/device above doesn't support it!\n"));
@@ -901 +906 @@
             Assert(pLun->pTop == pCur);
             pLun->pTop = NULL;
-            if (!(fFlags & PDM_TACH_FLAGS_NO_CALLBACKS) && pLun->pDevIns->pReg->pfnDetach)
+            if (!(fFlags & PDM_TACH_FLAGS_NO_CALLBACKS))
             {
-                PDMCritSectEnter(pLun->pDevIns->pCritSectRoR3, VERR_IGNORED);
-                pLun->pDevIns->pReg->pfnDetach(pLun->pDevIns, pLun->iLun, fFlags);
-                PDMCritSectLeave(pLun->pDevIns->pCritSectRoR3);
+                if (pLun->pDevIns)
+                {
+                    if (pLun->pDevIns->Internal.s.pDevR3->pReg->pfnDetach)
+                    {
+                        PDMCritSectEnter(pLun->pDevIns->pCritSectRoR3, VERR_IGNORED);
+                        pLun->pDevIns->Internal.s.pDevR3->pReg->pfnDetach(pLun->pDevIns, pLun->iLun, fFlags);
+                        PDMCritSectLeave(pLun->pDevIns->pCritSectRoR3);
+                    }
+                }
+                else
+                {
+                    if (pLun->pUsbIns->Internal.s.pUsbDev->pReg->pfnDriverDetach)
+                    {
+                        /** @todo USB device locking? */
+                        /** @todo add flags to pfnDriverDetach. */
+                        pLun->pUsbIns->Internal.s.pUsbDev->pReg->pfnDriverDetach(pLun->pUsbIns, pLun->iLun);
+                    }
+                }
             }
         }