Changeset 5741 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 14, 2007 12:47:10 PM (17 years ago)

Author:

vboxsync

Message:

try avoid the PDMR3USB bits when VBOX_WITH_USB isn't defined.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (8 diffs)
• include/ConsoleImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3372 +3372 @@
 HRESULT Console::onUSBDeviceAttach (IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs)
 {
+#ifdef VBOX_WITH_USB
     LogFlowThisFunc (("aDevice=%p aError=%p\n", aDevice, aError));
 
@@ -3421 +3422 @@
 
     return rc;
+
+#else   /* !VBOX_WITH_USB */
+    return E_FAIL;
+#endif  /* !VBOX_WITH_USB */
 }
 
@@ -3432 +3437 @@
                                     IVirtualBoxErrorInfo *aError)
 {
+#ifdef VBOX_WITH_USB
     Guid Uuid (aId);
     LogFlowThisFunc (("aId={%Vuuid} aError=%p\n", Uuid.raw(), aError));
@@ -3500 +3506 @@
 
     return rc;
+
+#else   /* !VBOX_WITH_USB */
+    return E_FAIL;
+#endif  /* !VBOX_WITH_USB */
 }
 
@@ -4678 +4688 @@
 }
 
+#ifdef VBOX_WITH_USB
+
 /**
  *  Sends a request to VMM to attach the given host device.
@@ -4726 +4738 @@
     alock.leave();
 
-/**@todo just do everything here */
+/** @todo just do everything here and only wrap the PDMR3Usb call. That'll offload some notification stuff from the EMT thread. */
     PVMREQ pReq = NULL;
     int vrc = VMR3ReqCall (mpVM, &pReq, RT_INDEFINITE_WAIT,
@@ -4852 +4864 @@
 
     PVMREQ pReq;
-/** @todo just do everything here */
+/** @todo just do everything here and only wrap the PDMR3Usb call. That'll offload some notification stuff from the EMT thread. */
     int vrc = VMR3ReqCall (mpVM, &pReq, RT_INDEFINITE_WAIT,
                            (PFNRT) usbDetachCallback, 4,
@@ -4916 +4928 @@
     return vrc;
 }
+
+#endif /* VBOX_WITH_USB */
 
 /**

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

@@ -404 +404 @@
                                           const char *pszPath, bool fPassthrough);
 
+#ifdef VBOX_WITH_USB
     HRESULT attachUSBDevice (IUSBDevice *aHostDevice, ULONG aMaskedIfs);
     HRESULT detachUSBDevice (USBDeviceList::iterator &aIt);
@@ -412 +413 @@
     static DECLCALLBACK(int)
     usbDetachCallback (Console *that, USBDeviceList::iterator *aIt, PCRTUUID aUuid);
+#endif
 
     static DECLCALLBACK (int)