Changeset 26112 in vbox for trunk/src

Timestamp:

Feb 1, 2010 1:44:02 AM (15 years ago)

Author:

vboxsync

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

57100

Message:

PDM,UsbMsd,++: Resumed hacking the MSD code.

Location:

trunk/src/VBox

Files:

• Devices/Builtins.cpp (modified) (2 diffs)
• Devices/Builtins.h (modified) (1 diff)
• Devices/Makefile.kmk (modified) (2 diffs)
• Main/ConsoleImpl2.cpp (modified) (3 diffs)
• RDP/client/vrdp/USBProxyDevice-linux.c (modified) (4 diffs)
• RDP/client/vrdp/vusb.h (modified) (1 diff)
• VMM/PDMDevHlp.cpp (modified) (1 diff)
• VMM/PDMDriver.cpp (modified) (1 diff)
• VMM/PDMInternal.h (modified) (2 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -289 +289 @@
         return rc;
 
-#if defined(RT_OS_LINUX)
+# if defined(RT_OS_LINUX)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvSCSIHost);
     if (RT_FAILURE(rc))
         return rc;
-#endif
+# endif
 #endif
 
@@ -314 +314 @@
         return rc;
 
+# ifdef VBOX_WITH_SCSI
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_UsbMsd);
+    if (RT_FAILURE(rc))
+        return rc;
+# endif
+
     return VINF_SUCCESS;
 }
 #endif
+

trunk/src/VBox/Devices/Builtins.h

@@ -122 +122 @@
 #ifdef VBOX_WITH_USB
 extern const PDMUSBREG g_UsbDevProxy;
+extern const PDMUSBREG g_UsbMsd;
 #endif
 
 #ifdef VBOX_WITH_SCSI
 extern const PDMDRVREG g_DrvSCSI;
-#if defined(RT_OS_LINUX)
+# if defined(RT_OS_LINUX)
 extern const PDMDRVREG g_DrvSCSIHost;
-#endif
+# endif
 #endif
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -1036 +1036 @@
         USB/VUSBReadAhead.cpp \
         USB/VUSBUrb.cpp
+
  ifdef VBOX_WITH_VRDP
   Drivers_DEFS        += VBOX_WITH_VRDP
@@ -1083 +1084 @@
         USB/USBProxyDevice.cpp \
         USB/freebsd/USBProxyDevice-freebsd.cpp
+
+ ifdef VBOX_WITH_SCSI
+  Drivers_SOURCES += \
+        Storage/UsbMsd.cpp
+ endif
+
 endif # VBOX_WITH_USB
 

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1696 +1696 @@
             rc = CFGMR3InsertInteger(pCfg,  "Last",     0);                             RC_CHECK();
 
+            PCFGMNODE pUsbDevices = NULL;
 #ifdef VBOX_WITH_EHCI
             hrc = USBCtlPtr->COMGETTER(EnabledEhci)(&fEnabled);                         H();
@@ -1730 +1731 @@
                  * on a per device level now.
                  */
-                rc = CFGMR3InsertNode(pRoot, "USB", &pCfg);                             RC_CHECK();
-                rc = CFGMR3InsertNode(pCfg, "USBProxy", &pCfg);                         RC_CHECK();
+                rc = CFGMR3InsertNode(pRoot, "USB", &pUsbDevices);                      RC_CHECK();
+                rc = CFGMR3InsertNode(pUsbDevices, "USBProxy", &pCfg);                  RC_CHECK();
                 rc = CFGMR3InsertNode(pCfg, "GlobalConfig", &pCfg);                     RC_CHECK();
                 // This globally enables the 2.0 -> 1.1 device morphing of proxied devies to keep windows quiet.
@@ -1740 +1741 @@
                 //rc = CFGMR3InsertInteger(pCfg, "Force11PacketSize", true);            RC_CHECK();
             }
+
+#if 0 /* Enable+edit this to play with the virtual USB devices). */
+            if (!pUsbDevices)
+            {
+                rc = CFGMR3InsertNode(pRoot, "USB", &pUsbDevices);                  RC_CHECK();
+            }
+
+# if 1  /* Virtual MSD*/
+
+            rc = CFGMR3InsertNode(pUsbDevices, "Msd", &pDev);                       RC_CHECK();
+            rc = CFGMR3InsertNode(pDev,     "0", &pInst);                           RC_CHECK();
+            rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                       RC_CHECK();
+            rc = CFGMR3InsertNode(pInst,    "LUN#0", &pLunL0);                      RC_CHECK();
+
+            rc = CFGMR3InsertString(pLunL0, "Driver", "SCSI");                      RC_CHECK();
+            rc = CFGMR3InsertNode(pLunL0,   "Config", &pCfg);                       RC_CHECK();
+
+            rc = CFGMR3InsertNode(pLunL0,   "AttachedDriver", &pLunL1);             RC_CHECK();
+            rc = CFGMR3InsertString(pLunL1, "Driver", "Block");                     RC_CHECK();
+            rc = CFGMR3InsertNode(pLunL1,   "Config", &pCfg);                       RC_CHECK();
+            rc = CFGMR3InsertString(pCfg,   "Type", "HardDisk");                    RC_CHECK();
+            rc = CFGMR3InsertInteger(pCfg,  "Mountable", 0);                        RC_CHECK();
+
+            rc = CFGMR3InsertNode(pLunL1,   "AttachedDriver", &pLunL2);             RC_CHECK();
+            rc = CFGMR3InsertString(pLunL2, "Driver", "VD");                        RC_CHECK();
+            rc = CFGMR3InsertNode(pLunL2,   "Config", &pCfg);                       RC_CHECK();
+            rc = CFGMR3InsertString(pCfg,   "Path", "/Volumes/DataHFS/bird/VDIs/linux.vdi"); RC_CHECK();
+            rc = CFGMR3InsertString(pCfg,   "Format", "VDI");                       RC_CHECK();
+# endif
+#endif
         }
     }

trunk/src/VBox/RDP/client/vrdp/USBProxyDevice-linux.c

@@ -1165 +1165 @@
     if (!fFailed)
     {
-        pUrb->Dev.pvProxyUrb = pUrbLnx;
+        pUrb->Dev.pvPrivate = pUrbLnx;
         LogFlow(("usbProxyLinuxUrbQueueSplit: ok\n"));
         return true;
@@ -1325 +1325 @@
 
     LogFlow(("usbProxyLinuxUrbQueue: ok\n"));
-    pUrb->Dev.pvProxyUrb = pUrbLnx;
+    pUrb->Dev.pvPrivate = pUrbLnx;
     return true;
 }
@@ -1591 +1591 @@
             usbProxyLinuxUrbFree(pProxyDev, pUrbLnx);
         }
-        pUrb->Dev.pvProxyUrb = NULL;
+        pUrb->Dev.pvPrivate = NULL;
 
         /* some adjustments for message transfers. */
@@ -1618 +1618 @@
 {
     PUSBPROXYDEV pProxyDev = (PUSBPROXYDEV)pUrb->pDev;
-    PUSBPROXYURBLNX pUrbLnx = (PUSBPROXYURBLNX)pUrb->Dev.pvProxyUrb;
+    PUSBPROXYURBLNX pUrbLnx = (PUSBPROXYURBLNX)pUrb->Dev.pvPrivate;
     if (pUrbLnx->pSplitHead)
     {

trunk/src/VBox/RDP/client/vrdp/vusb.h

@@ -188 +188 @@
     struct VUSBURBDEV
     {
-        /** Pointer to the proxy URB.  */
-        void           *pvProxyUrb;
+        /** Pointer to private device specific data.  */
+        void           *pvPrivate;
+        /** Used by the device when linking the URB in some list of its own.   */
+        PVUSBURB        pNext;
     } Dev;
 

trunk/src/VBox/VMM/PDMDevHlp.cpp

@@ -825 +825 @@
         pLun->pBottom   = NULL;
         pLun->pDevIns   = pDevIns;
+        pLun->pUsbIns   = NULL;
         pLun->pszDesc   = pszDesc;
         pLun->pBase     = pBaseInterface;

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -501 +501 @@
                             Log(("PDM: Attached driver %p:'%s'/%d to LUN#%d on device '%s'/%d, pDrvAbove=%p:'%s'/%d\n",
                                  pNew, pDrv->pDrvReg->szDriverName, pNew->iInstance,
-                                 pLun->iLun, pLun->pDevIns->pDevReg->szDeviceName, pLun->pDevIns->iInstance,
+                                 pLun->iLun,
+                                 pLun->pDevIns ? pLun->pDevIns->pDevReg->szDeviceName : pLun->pUsbIns->pUsbReg->szDeviceName,
+                                 pLun->pDevIns ? pLun->pDevIns->iInstance             : pLun->pUsbIns->iInstance,
                                  pDrvAbove, pDrvAbove ? pDrvAbove->pDrvReg->szDriverName : "", pDrvAbove ? pDrvAbove->iInstance : -1));
                         else

trunk/src/VBox/VMM/PDMInternal.h

@@ -377 +377 @@
     R3PTRTYPE(const struct PDMDEVREG *) pDevReg;
     /** Number of instances. */
-    RTUINT                          cInstances;
+    uint32_t                        cInstances;
     /** Pointer to chain of instances (R3 Ptr). */
     PPDMDEVINSR3                    pInstances;
@@ -395 +395 @@
     R3PTRTYPE(const struct PDMUSBREG *) pUsbReg;
     /** Next instance number. */
-    RTUINT                          iNextInstance;
+    uint32_t                        iNextInstance;
     /** Pointer to chain of instances (R3 Ptr). */
     R3PTRTYPE(PPDMUSBINS)           pInstances;