Changeset 8539 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

May 2, 2008 5:02:10 PM (17 years ago)

Author:

vboxsync

Message:

Drop the USBDEVICE bits we don't currently need.

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• Makefile.kmk (modified) (1 diff)
• USBProxyService.cpp (modified) (3 diffs)
• USBProxyService.h (modified) (2 diffs)
• USBProxyServiceLinux.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk

@@ -88 +88 @@
 
 # USB Support
-ifneq ($(filter-out os2 darwin,$(BUILD_TARGET)),)
+if1of ($(BUILD_TARGET), l4 win)
 VBoxBFE_DEFS += VBOXBFE_WITH_USB
 VBoxBFE_SOURCES += \

trunk/src/VBox/Frontends/VBoxBFE/USBProxyService.cpp

@@ -306 +306 @@
 }
 
+
+#ifdef USBDEVICE_WITH_EVERYTHING
 /*static*/ void USBProxyService::freeInterfaceMembers (PUSBINTERFACE pIf, unsigned cIfs)
 {
@@ -326 +328 @@
     }
 }
+#endif
+
 
 /*static*/ void USBProxyService::freeDevice (PUSBDEVICE pDevice)
 {
+#ifdef USBDEVICE_WITH_EVERYTHING
     PUSBCONFIG pCfg = pDevice->paConfigurations;
     unsigned cCfgs = pDevice->bNumConfigurations;
@@ -346 +351 @@
     RTMemFree (pDevice->paConfigurations);
     pDevice->paConfigurations = NULL;
+#endif
 
     RTStrFree ((char *)pDevice->pszManufacturer);

trunk/src/VBox/Frontends/VBoxBFE/USBProxyService.h

@@ -140 +140 @@
 
 public:
+#ifdef USBDEVICE_WITH_EVERYTHING
     /**
      * Free all the members of a USB interface returned by getDevice().
@@ -147 +148 @@
      */
     static void freeInterfaceMembers (PUSBINTERFACE pIf, unsigned cIfs);
+#endif
 
     /**

trunk/src/VBox/Frontends/VBoxBFE/USBProxyServiceLinux.cpp

@@ +1 @@
+/* $Id$ */
 /** @file
- *
  * VBox frontends: Basic Frontend (BFE):
  * Implementation of USBProxyServiceLinux class
+ *
+ * WARNING: This file needs to be resynced and is currently disabled.
  */