Changeset 5520 in vbox for trunk/src/VBox/Main/ConsoleImpl.cpp

Timestamp:

Oct 26, 2007 4:29:13 PM (17 years ago)

Author:

vboxsync

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

25737

Message:

PDMUsb

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (16 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -69 +69 @@
 #include <VBox/ssm.h>
 #include <VBox/version.h>
+#ifdef VBOX_WITH_USB
+#   include <VBox/pdmusb.h>
+#endif
 
 #include <VBox/VBoxDev.h>
@@ -3391 +3394 @@
     }
 
-#if 1
+#ifndef VBOX_WITH_PDMUSB
     /* Don't proceed unless we've found the usb controller. */
     PPDMIBASE pBase = NULL;
@@ -3407 +3410 @@
     HRESULT rc = attachUSBDevice (aDevice, pRhConfig);
 #else /* PDMUsb */
-    /* Don't proceed unless there's a USB hub. */
-    if (!PDMR3USBHasHub (m_VM))
+    /* Don't proceed unless there's at least one USB hub. */
+    if (!PDMR3USBHasHub (mpVM))
     {
         LogFlowThisFunc (("Attach request ignored (no USB controller).\n"));
@@ -3923 +3926 @@
         alock.enter();
     }
-    
-    
+
+
 #ifdef VBOX_HGCM
     /*
@@ -4690 +4693 @@
  *  @note Must be called from under this object's lock.
  */
-#if 1
+#ifndef VBOX_WITH_PDMUSB
 HRESULT Console::attachUSBDevice (IUSBDevice *aHostDevice, PVUSBIRHCONFIG aConfig)
 {
@@ -4722 +4725 @@
 
     BOOL fRemote = FALSE;
+#ifndef VBOX_WITH_PDMUSB
     void *pvRemote = NULL;
+#endif
 
     hrc = aHostDevice->COMGETTER (Remote) (&fRemote);
@@ -4737 +4742 @@
     alock.leave();
 
-#if 1
+#ifndef VBOX_WITH_PDMUSB
     PVMREQ pReq = NULL;
     int vrc = VMR3ReqCall (mpVM, &pReq, RT_INDEFINITE_WAIT,
@@ -4744 +4749 @@
                            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, 5, this, aHostDevice, aConfig, Uuid.ptr(), fRemote, Address.raw());
+                           (PFNRT) usbAttachCallback, 5, this, aHostDevice, Uuid.ptr(), fRemote, Address.raw());
 #endif /* PDMUsb */
     if (VBOX_SUCCESS (vrc))
@@ -4791 +4797 @@
  *  @note Locks the console object for writing.
  */
-#if 1
+#ifndef VBOX_WITH_PDMUSB
 DECLCALLBACK(int)
 Console::usbAttachCallback (Console *that, IUSBDevice *aHostDevice,
@@ -4851 +4857 @@
     LogFlowFunc (("that={%p}\n", that));
 
-    AssertReturn (that && aConfig && aUuid, VERR_INVALID_PARAMETER);
-
+    AssertReturn (that && aUuid, VERR_INVALID_PARAMETER);
+
+    void *pvRemoteBackend = NULL;
     if (aRemote)
     {
@@ -4858 +4865 @@
         Guid guid (*aUuid);
 
-        aRemoteBackend = that->consoleVRDPServer ()->USBBackendRequestPointer (pRemoteUSBDevice->clientId (), &guid);
-        if (!aRemoteBackend)
+        pvRemoteBackend = that->consoleVRDPServer ()->USBBackendRequestPointer (pRemoteUSBDevice->clientId (), &guid);
+        if (!pvRemoteBackend)
             return VERR_INVALID_PARAMETER;  /* The clientId is invalid then. */
     }
-
-    int vrc = PDMR3USBCreateProxyDevice (mVM, aUuid, aRemote, aAddress, aRemoteBackend);
+    ULONG ulUSBVersion = 0x00010001; /* 1.1 */
+#if 0
+    HRESULT hrc = aHostDevice->GetUSBVersion(&ulUSBVersion);
+    AssertComRCReturn(hrc, VERR_GENERAL_FAILURE);
+#endif
+    Assert(ulUSBVersion == 0x00010001 || ulUSBVersion == 0x00020000);
+
+    int vrc = PDMR3USBCreateProxyDevice (that->mpVM, aUuid, aRemote, aAddress, pvRemoteBackend,
+                                         ulUSBVersion == 0x00010001 ? VUSB_STDVER_11 : VUSB_STDVER_20);
     if (VBOX_SUCCESS (vrc))
     {
@@ -4907 +4921 @@
     CheckComRCReturnRC (autoVMCaller.rc());
 
+#ifndef VBOX_WITH_PDMUSB
     PPDMIBASE pBase = NULL;
     int vrc = PDMR3QueryLun (mpVM, "usb-ohci", 0, 0, &pBase);
@@ -4916 +4931 @@
         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",
@@ -4924 +4943 @@
 
     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;
@@ -4945 +4971 @@
  *  @note Locks the console object for writing.
  */
+#ifndef VBOX_WITH_PDMUSB
 //static
 DECLCALLBACK(int)
@@ -4988 +5015 @@
     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 */
 
 /**