Changeset 5721 in vbox

Timestamp:

Nov 13, 2007 12:15:51 PM (17 years ago)

Author:

vboxsync

Message:

Cleaned out some old (pre-PDMUSB) code.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (3 diffs)
• src/VBox/Main/ConsoleImpl.cpp (modified) (12 diffs)
• src/VBox/Main/Makefile.kmk (modified) (2 diffs)
• src/VBox/Main/include/ConsoleImpl.h (modified) (2 diffs)

trunk/Config.kmk

@@ -205 +205 @@
 # Enable the USB 2.0 controller
 VBOX_WITH_EHCI = 1
-# Enable the new PDM USB management code (work in progress).
-VBOX_WITH_PDMUSB = 1
 # Enable the ISCSI feature.
 VBOX_WITH_ISCSI = 1

trunk/src/VBox/Devices/Makefile.kmk

@@ -102 +102 @@
 ifdef VBOX_WITH_USB
  VBoxDD_DEFS           += VBOX_WITH_USB IN_USB_R3
- ifdef VBOX_WITH_PDMUSB
-  VBoxDD_DEFS          += VBOX_WITH_PDMUSB
- endif
  ifdef VBOX_WITH_EHCI
   VBoxDD_DEFS          += VBOX_WITH_EHCI
@@ -224 +221 @@
 ifdef VBOX_WITH_USB
 DevicesR3_DEFS         += VBOX_WITH_USB IN_USB_R3
- ifdef VBOX_WITH_PDMUSB
-  DevicesR3_DEFS       += VBOX_WITH_PDMUSB
- endif
 
 DevicesR3_SOURCES      += \
@@ -561 +555 @@
 ifdef VBOX_WITH_USB
  Drivers_DEFS         += VBOX_WITH_USB IN_USB_R3
- ifdef VBOX_WITH_PDMUSB
-  Drivers_DEFS        += VBOX_WITH_PDMUSB
- endif
  Drivers_SOURCES      += \
         USB/DrvVUSBRootHub.cpp \

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3398 +3398 @@
     }
 
-#ifndef VBOX_WITH_PDMUSB
-    /* Don't proceed unless we've found the usb controller. */
-    PPDMIBASE pBase = NULL;
-    int vrc = PDMR3QueryLun (mpVM, "usb-ohci", 0, 0, &pBase);
-    if (VBOX_FAILURE (vrc))
+    /* Don't proceed unless there's at least one USB hub. */
+    if (!PDMR3USBHasHub (mpVM))
     {
         LogFlowThisFunc (("Attach request ignored (no USB controller).\n"));
@@ -3408 +3405 @@
     }
 
-    PVUSBIRHCONFIG pRhConfig = (PVUSBIRHCONFIG) pBase->
-        pfnQueryInterface (pBase, PDMINTERFACE_VUSB_RH_CONFIG);
-    ComAssertRet (pRhConfig, E_FAIL);
-
-    HRESULT rc = attachUSBDevice (aDevice, pRhConfig);
-#else /* PDMUsb */
-    /* Don't proceed unless there's at least one USB hub. */
-    if (!PDMR3USBHasHub (mpVM))
-    {
-        LogFlowThisFunc (("Attach request ignored (no USB controller).\n"));
-        return E_FAIL;
-    }
-
     HRESULT rc = attachUSBDevice (aDevice, aMaskedIfs);
-#endif /* PDMUsb */
-
     if (FAILED (rc))
     {
@@ -4706 +4688 @@
  *  @note Must be called from under this object's lock.
  */
-#ifndef VBOX_WITH_PDMUSB
-HRESULT Console::attachUSBDevice (IUSBDevice *aHostDevice, PVUSBIRHCONFIG aConfig)
-{
-    AssertReturn (aHostDevice && aConfig, E_FAIL);
-#else /* PDMUsb */
 HRESULT Console::attachUSBDevice (IUSBDevice *aHostDevice, ULONG aMaskedIfs)
 {
     AssertReturn (aHostDevice, E_FAIL);
-#endif
-
     AssertReturn (isLockedOnCurrentThread(), E_FAIL);
 
@@ -4738 +4713 @@
 
     BOOL fRemote = FALSE;
-#ifndef VBOX_WITH_PDMUSB
-    void *pvRemote = NULL;
-#endif
-
     hrc = aHostDevice->COMGETTER (Remote) (&fRemote);
     ComAssertComRCRetRC (hrc);
@@ -4755 +4726 @@
     alock.leave();
 
-#ifndef VBOX_WITH_PDMUSB
-    PVMREQ pReq = NULL;
-    int vrc = VMR3ReqCall (mpVM, &pReq, RT_INDEFINITE_WAIT,
-                           (PFNRT) usbAttachCallback, 7,
-                           this, aHostDevice,
-                           aConfig, Uuid.ptr(), fRemote, Address.raw(), pvRemote);
-#else /* PDMUsb */
 /**@todo just do everything here */
     PVMREQ pReq = NULL;
     int vrc = VMR3ReqCall (mpVM, &pReq, RT_INDEFINITE_WAIT,
                            (PFNRT) usbAttachCallback, 6, this, aHostDevice, Uuid.ptr(), fRemote, Address.raw(), aMaskedIfs);
-#endif /* PDMUsb */
     if (VBOX_SUCCESS (vrc))
         vrc = pReq->iStatus;
@@ -4810 +4773 @@
  *  @note Locks the console object for writing.
  */
-#ifndef VBOX_WITH_PDMUSB
+//static
 DECLCALLBACK(int)
-Console::usbAttachCallback (Console *that, IUSBDevice *aHostDevice,
-                            PVUSBIRHCONFIG aConfig, PCRTUUID aUuid, bool aRemote,
-                            const char *aAddress, void *aRemoteBackend)
+Console::usbAttachCallback (Console *that, IUSBDevice *aHostDevice, PCRTUUID aUuid, bool aRemote, const char *aAddress, ULONG aMaskedIfs)
 {
     LogFlowFuncEnter();
     LogFlowFunc (("that={%p}\n", that));
 
-    AssertReturn (that && aConfig && aUuid, VERR_INVALID_PARAMETER);
-
+    AssertReturn (that && aUuid, VERR_INVALID_PARAMETER);
+
+    void *pvRemoteBackend = NULL;
     if (aRemote)
     {
-        /* @todo aRemoteBackend input parameter is not needed. */
-        Assert (aRemoteBackend == NULL);
-
         RemoteUSBDevice *pRemoteUSBDevice = static_cast <RemoteUSBDevice *> (aHostDevice);
-
         Guid guid (*aUuid);
 
-        aRemoteBackend = that->consoleVRDPServer ()->USBBackendRequestPointer (pRemoteUSBDevice->clientId (), &guid);
-
-        if (aRemoteBackend == NULL)
-        {
-            /* The clientId is invalid then. */
-            return VERR_INVALID_PARAMETER;
-        }
-    }
-
-    int vrc = aConfig->pfnCreateProxyDevice (aConfig, aUuid, aRemote, aAddress,
-                                             aRemoteBackend);
-
+        pvRemoteBackend = that->consoleVRDPServer ()->USBBackendRequestPointer (pRemoteUSBDevice->clientId (), &guid);
+        if (!pvRemoteBackend)
+            return VERR_INVALID_PARAMETER;  /* The clientId is invalid then. */
+    }
+
+    USHORT portVersion = 1;
+    HRESULT hrc = aHostDevice->COMGETTER(PortVersion)(&portVersion);
+    AssertComRCReturn(hrc, VERR_GENERAL_FAILURE);
+    Assert(portVersion == 1 || portVersion == 2);
+
+    int vrc = PDMR3USBCreateProxyDevice (that->mpVM, aUuid, aRemote, aAddress, pvRemoteBackend,
+                                         portVersion == 1 ? VUSB_STDVER_11 : VUSB_STDVER_20, aMaskedIfs);
     if (VBOX_SUCCESS (vrc))
     {
@@ -4862 +4820 @@
     return vrc;
 }
-#else /* PDMUsb */
-//static
-DECLCALLBACK(int)
-Console::usbAttachCallback (Console *that, IUSBDevice *aHostDevice, PCRTUUID aUuid, bool aRemote, const char *aAddress, ULONG aMaskedIfs)
-{
-    LogFlowFuncEnter();
-    LogFlowFunc (("that={%p}\n", that));
-
-    AssertReturn (that && aUuid, VERR_INVALID_PARAMETER);
-
-    void *pvRemoteBackend = NULL;
-    if (aRemote)
-    {
-        RemoteUSBDevice *pRemoteUSBDevice = static_cast <RemoteUSBDevice *> (aHostDevice);
-        Guid guid (*aUuid);
-
-        pvRemoteBackend = that->consoleVRDPServer ()->USBBackendRequestPointer (pRemoteUSBDevice->clientId (), &guid);
-        if (!pvRemoteBackend)
-            return VERR_INVALID_PARAMETER;  /* The clientId is invalid then. */
-    }
-
-    USHORT portVersion = 1;
-    HRESULT hrc = aHostDevice->COMGETTER(PortVersion)(&portVersion);
-    AssertComRCReturn(hrc, VERR_GENERAL_FAILURE);
-    Assert(portVersion == 1 || portVersion == 2);
-
-    int vrc = PDMR3USBCreateProxyDevice (that->mpVM, aUuid, aRemote, aAddress, pvRemoteBackend,
-                                         portVersion == 1 ? VUSB_STDVER_11 : VUSB_STDVER_20, aMaskedIfs);
-    if (VBOX_SUCCESS (vrc))
-    {
-        /* Create a OUSBDevice and add it to the device list */
-        ComObjPtr <OUSBDevice> device;
-        device.createObject();
-        HRESULT hrc = device->init (aHostDevice);
-        AssertComRC (hrc);
-
-        AutoLock alock (that);
-        that->mUSBDevices.push_back (device);
-        LogFlowFunc (("Attached device {%Vuuid}\n", device->id().raw()));
-
-        /* notify callbacks */
-        that->onUSBDeviceStateChange (device, true /* aAttached */, NULL);
-    }
-
-    LogFlowFunc (("vrc=%Vrc\n", vrc));
-    LogFlowFuncLeave();
-    return vrc;
-}
-#endif /* PDMUsb */
 
 /**
@@ -4933 +4842 @@
     CheckComRCReturnRC (autoVMCaller.rc());
 
-#ifndef VBOX_WITH_PDMUSB
-    PPDMIBASE pBase = NULL;
-    int vrc = PDMR3QueryLun (mpVM, "usb-ohci", 0, 0, &pBase);
-
-    /* if the device is attached, then there must be a USB controller */
-    AssertRCReturn (vrc, E_FAIL);
-
-    PVUSBIRHCONFIG pRhConfig = (PVUSBIRHCONFIG) pBase->
-        pfnQueryInterface (pBase, PDMINTERFACE_VUSB_RH_CONFIG);
-    AssertReturn (pRhConfig, E_FAIL);
-#else
     /* if the device is attached, then there must at least one USB hub. */
     AssertReturn (PDMR3USBHasHub (mpVM), E_FAIL);
-#endif
 
     LogFlowThisFunc (("Detaching USB proxy device {%Vuuid}...\n",
@@ -4955 +4852 @@
 
     PVMREQ pReq;
-#ifndef VBOX_WITH_PDMUSB
-    vrc = VMR3ReqCall (mpVM, &pReq, RT_INDEFINITE_WAIT,
-                       (PFNRT) usbDetachCallback, 5,
-                       this, &aIt, pRhConfig, (*aIt)->id().raw());
-#else
 /** @todo just do everything here */
     int vrc = VMR3ReqCall (mpVM, &pReq, RT_INDEFINITE_WAIT,
                            (PFNRT) usbDetachCallback, 4,
                            this, &aIt, (*aIt)->id().raw());
-#endif
     if (VBOX_SUCCESS (vrc))
         vrc = pReq->iStatus;
@@ -4983 +4874 @@
  *  @note Locks the console object for writing.
  */
-#ifndef VBOX_WITH_PDMUSB
 //static
 DECLCALLBACK(int)
-Console::usbDetachCallback (Console *that, USBDeviceList::iterator *aIt,
-                            PVUSBIRHCONFIG aConfig, PCRTUUID aUuid)
+Console::usbDetachCallback (Console *that, USBDeviceList::iterator *aIt, PCRTUUID aUuid)
 {
     LogFlowFuncEnter();
     LogFlowFunc (("that={%p}\n", that));
 
-    AssertReturn (that && aConfig && aUuid, VERR_INVALID_PARAMETER);
+    AssertReturn (that && aUuid, VERR_INVALID_PARAMETER);
 
     /*
@@ -5009 +4898 @@
     }
 
-    int vrc = aConfig->pfnDestroyProxyDevice (aConfig, aUuid);
+    int vrc = PDMR3USBDetachDevice (that->mpVM, aUuid);
 
     if (VBOX_SUCCESS (vrc))
@@ -5027 +4916 @@
     return vrc;
 }
-#else /* VBOX_WITH_PDMUSB */
-//static
-DECLCALLBACK(int)
-Console::usbDetachCallback (Console *that, USBDeviceList::iterator *aIt, PCRTUUID aUuid)
-{
-    LogFlowFuncEnter();
-    LogFlowFunc (("that={%p}\n", that));
-
-    AssertReturn (that && aUuid, VERR_INVALID_PARAMETER);
-
-    /*
-     * If that was a remote device, release the backend pointer.
-     * The pointer was requested in usbAttachCallback.
-     */
-    BOOL fRemote = FALSE;
-
-    HRESULT hrc2 = (**aIt)->COMGETTER (Remote) (&fRemote);
-    ComAssertComRC (hrc2);
-
-    if (fRemote)
-    {
-        Guid guid (*aUuid);
-        that->consoleVRDPServer ()->USBBackendReleasePointer (&guid);
-    }
-
-    int vrc = PDMR3USBDetachDevice (that->mpVM, aUuid);
-
-    if (VBOX_SUCCESS (vrc))
-    {
-        AutoLock alock (that);
-
-        /* Remove the device from the collection */
-        that->mUSBDevices.erase (*aIt);
-        LogFlowFunc (("Detached device {%Vuuid}\n", (**aIt)->id().raw()));
-
-        /* notify callbacks */
-        that->onUSBDeviceStateChange (**aIt, false /* aAttached */, NULL);
-    }
-
-    LogFlowFunc (("vrc=%Vrc\n", vrc));
-    LogFlowFuncLeave();
-    return vrc;
-}
-#endif /* VBOX_WITH_PDMUSB */
 
 /**

trunk/src/VBox/Main/Makefile.kmk

@@ -112 +112 @@
 ifdef VBOX_WITH_EHCI
 VBoxSVC_DEFS += VBOX_WITH_EHCI
-endif
-ifdef VBOX_WITH_PDMUSB
-VBoxSVC_DEFS += VBOX_WITH_PDMUSB
 endif
 endif
@@ -295 +292 @@
 VBoxC_DEFS += VBOX_WITH_EHCI
 endif
-ifdef VBOX_WITH_PDMUSB
-VBoxC_DEFS += VBOX_WITH_PDMUSB
-endif
 endif
 ifdef VBOX_WITH_ALSA

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -404 +404 @@
                                           const char *pszPath, bool fPassthrough);
 
-#ifndef VBOX_WITH_PDMUSB
-    HRESULT attachUSBDevice (IUSBDevice *aHostDevice, PVUSBIRHCONFIG aConfig);
-    HRESULT detachUSBDevice (USBDeviceList::iterator &aIt);
-
-    static DECLCALLBACK(int)
-    usbAttachCallback (Console *that, IUSBDevice *aHostDevice,
-                       PVUSBIRHCONFIG aConfig, PCRTUUID aUuid, bool aRemote,
-                       const char *aAddress, void *aRemoteBackend);
-    static DECLCALLBACK(int)
-    usbDetachCallback (Console *that, USBDeviceList::iterator *aIt,
-                       PVUSBIRHCONFIG aConfig, PCRTUUID aUuid);
-#else /* PDMUsb coding. */
     HRESULT attachUSBDevice (IUSBDevice *aHostDevice, ULONG aMaskedIfs);
     HRESULT detachUSBDevice (USBDeviceList::iterator &aIt);
@@ -424 +412 @@
     static DECLCALLBACK(int)
     usbDetachCallback (Console *that, USBDeviceList::iterator *aIt, PCRTUUID aUuid);
-#endif /* PDMUsb coding. */
 
     static DECLCALLBACK (int)