Changeset 3891

Timestamp:

07/26/07 20:28:51 (1 year ago)

Author:

vboxsync

Message:

Some sketchy PDMUsb changes (disabled of course).

Files:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (7 diffs)
• trunk/src/VBox/Main/include/ConsoleImpl.h (modified) (3 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3283 +3283 @@
-    }
-
+#if 1
-    /* Don't proceed unless we've found the usb controller. */
-    PPDMIBASE pBase = NULL;
@@ -3297 +3298 @@
-
-    HRESULT rc = attachUSBDevice (aDevice, pRhConfig);
+#else /* PDMUsb */
+    /* Don't proceed unless there's a USB hub. */
+    if (!PDMR3USBHasHub (m_VM))
+    {
+        LogFlowThisFunc (("Attach request ignored (no USB controller).\n"));
+        return E_FAIL;
+    }
+
+    HRESULT rc = attachUSBDevice (aDevice);
+#endif /* PDMUsb */
-
-    if (FAILED (rc))
@@ -4283 +4294 @@
- *  @note Must be called from under this object's lock.
- */
+#if 1
-HRESULT Console::attachUSBDevice (IUSBDevice *aHostDevice, PVUSBIRHCONFIG aConfig)
-{
-    AssertReturn (aHostDevice && aConfig, E_FAIL);
+#else /* PDMUsb */
+HRESULT Console::attachUSBDevice (IUSBDevice *aHostDevice)
+{
+    AssertReturn (aHostDevice, E_FAIL);
+#endif
-
-    AssertReturn (isLockedOnCurrentThread(), E_FAIL);
@@ -4324 +4341 @@
-    alock.leave();
-
+#if 1
-    PVMREQ pReq = NULL;
-    int vrc = VMR3ReqCall (mpVM, &pReq, RT_INDEFINITE_WAIT,
@@ -4329 +4347 @@
-                           this, aHostDevice,
-                           aConfig, Uuid.ptr(), fRemote, Address.raw(), pvRemote);
+#else /* PDMUsb */
+    PVMREQ pReq = NULL;
+    int vrc = VMR3ReqCall (mpVM, &pReq, RT_INDEFINITE_WAIT,
+                           (PFNRT) usbAttachCallback, 5, this, aHostDevice, aConfig, Uuid.ptr(), fRemote, Address.raw());
+#endif /* PDMUsb */
-    if (VBOX_SUCCESS (vrc))
-        vrc = pReq->iStatus;
@@ -4372 +4395 @@
- *  @note Locks the console object for writing.
- */
-
+
-DECLCALLBACK(int)
-Console::usbAttachCallback (Console *that, IUSBDevice *aHostDevice,
@@ -4424 +4447 @@
-    return vrc;
-}
+#else /* PDMUsb */
+//static
+DECLCALLBACK(int)
+Console::usbAttachCallback (Console *that, IUSBDevice *aHostDevice, PCRTUUID aUuid, bool aRemote, const char *aAddress)
+{
+    LogFlowFuncEnter();
+    LogFlowFunc (("that={%p}\n", that));
+
+    AssertReturn (that && aConfig && aUuid, VERR_INVALID_PARAMETER);
+
+    if (aRemote)
+    {
+        RemoteUSBDevice *pRemoteUSBDevice = static_cast <RemoteUSBDevice *> (aHostDevice);
+        Guid guid (*aUuid);
+
+        aRemoteBackend = that->consoleVRDPServer ()->USBBackendRequestPointer (pRemoteUSBDevice->clientId (), &guid);
+        if (!aRemoteBackend)
+            return VERR_INVALID_PARAMETER;  /* The clientId is invalid then. */
+    }
+
+    int vrc = PDMR3USBCreateProxyDevice (mVM, aUuid, aRemote, aAddress, aRemoteBackend);
+    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 */
-
-/**

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

@@ -383 +383 @@
-                                          const char *pszPath, bool fPassthrough);
-
+#if 1
-    HRESULT attachUSBDevice (IUSBDevice *aHostDevice, PVUSBIRHCONFIG aConfig);
-    HRESULT detachUSBDevice (USBDeviceList::iterator &aIt);
@@ -390 +391 @@
-                       PVUSBIRHCONFIG aConfig, PCRTUUID aUuid, bool aRemote,
-                       const char *aAddress, void *aRemoteBackend);
+#else /* PDMUsb coding. */
+    HRESULT attachUSBDevice (IUSBDevice *aHostDevice);
+    HRESULT detachUSBDevice (USBDeviceList::iterator &aIt);
+
+    static DECLCALLBACK(int)
+    usbAttachCallback (Console *that, IUSBDevice *aHostDevice, PCRTUUID aUuid,
+                       bool aRemote, const char *aAddress, void *aRemoteBackend);
+#endif /* PDMUsb coding. */
-    static DECLCALLBACK(int)
-    usbDetachCallback (Console *that, USBDeviceList::iterator *aIt,
@@ -535 +544 @@
-    }
-    mCallbackData;
-
+
-    friend struct VMTask;
-};