Changeset 8539 in vbox

Timestamp:

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

Author:

vboxsync

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

30444

Message:

Drop the USBDEVICE bits we don't currently need.

Location:

trunk

Files:

• include/VBox/usb.h (modified) (4 diffs)
• src/VBox/Frontends/VBoxBFE/Makefile.kmk (modified) (1 diff)
• src/VBox/Frontends/VBoxBFE/USBProxyService.cpp (modified) (3 diffs)
• src/VBox/Frontends/VBoxBFE/USBProxyService.h (modified) (2 diffs)
• src/VBox/Frontends/VBoxBFE/USBProxyServiceLinux.cpp (modified) (1 diff)
• src/VBox/Main/include/USBDeviceImpl.h (modified) (4 diffs)

trunk/include/VBox/usb.h

@@ -34 +34 @@
 
 __BEGIN_DECLS
+
+#ifdef USBDEVICE_WITH_EVERYTHING
 
 /**
@@ -124 +126 @@
 typedef const USBCONFIG *PCUSBCONFIG;
 
+#endif /* USBDEVICE_WITH_EVERYTHING */
+
 
 /**
@@ -173 +177 @@
 typedef struct USBDEVICE
 {
+    /** If linked, this is the pointer to the next device in the list. */
+    struct USBDEVICE *pNext;
+    /** If linked doubly, this is the pointer to the prev device in the list. */
+    struct USBDEVICE *pPrev;
+    /** Manufacturer string. */
+    const char     *pszManufacturer;
+    /** Product string. */
+    const char     *pszProduct;
+    /** Serial number string. */
+    const char     *pszSerialNumber;
+    /** The address of the device. */
+    const char     *pszAddress;
+
+    /** Vendor ID. */
+    uint16_t        idVendor;
+    /** Product ID. */
+    uint16_t        idProduct;
+    /** Revision, integer part. */
+    uint16_t        bcdDevice;
     /** USB version number. */
     uint16_t        bcdUSB;
@@ -181 +204 @@
     /** Device protocol */
     uint8_t         bDeviceProtocol;
-    /** Vendor ID. */
-    uint16_t        idVendor;
-    /** Product ID. */
-    uint16_t        idProduct;
-    /** Revision, integer part. */
-    uint16_t        bcdDevice;
-    /** Manufacturer string. */
-    const char     *pszManufacturer;
-    /** Product string. */
-    const char     *pszProduct;
-    /** Serial number string. */
-    const char     *pszSerialNumber;
-    /** Serial hash. */
-    uint64_t        u64SerialHash;
     /** Number of configurations. */
     uint8_t         bNumConfigurations;
-    /** Pointer to an array of configurations. */
-    PUSBCONFIG      paConfigurations;
     /** The device state. */
     USBDEVICESTATE  enmState;
     /** The device speed. */
     USBDEVICESPEED  enmSpeed;
-    /** The address of the device. */
-    const char     *pszAddress;
-
+    /** Serial hash. */
+    uint64_t        u64SerialHash;
     /** The USB Bus number. */
     uint8_t         bBus;
+    /** The port number. */
+    uint8_t         bPort;
+#if defined(RT_OS_LINUX)
+    /** Device number. */
+    uint8_t         bDevNum;
+#endif
+#ifdef USBDEVICE_WITH_EVERYTHING
+    /** Parent device number. */
+    uint8_t         bDevNumParent;
     /** The level in topologly for this bus. */
     uint8_t         bLevel;
-    /** Device number. */
-    uint8_t         bDevNum;
-    /** Parent device number. */
-    uint8_t         bDevNumParent;
-    /** The port number. */
-    uint8_t         bPort;
     /** Number of devices on this level. */
     uint8_t         bNumDevices;
     /** Maximum number of children. */
     uint8_t         bMaxChildren;
-
-    /** If linked, this is the pointer to the next device in the list. */
-    struct USBDEVICE *pNext;
-    /** If linked doubly, this is the pointer to the prev device in the list. */
-    struct USBDEVICE *pPrev;
+    /** Pointer to an array of configurations. */
+    PUSBCONFIG      paConfigurations;
+#endif
 } USBDEVICE;
 /** Pointer to a USB device. */

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.
  */
 

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

@@ -25 +25 @@
 #include "VirtualBoxBase.h"
 #include "Collection.h"
+#include "Logging.h"
 
 
@@ -114 +115 @@
         if (!aDevice)
             return E_POINTER;
+RTLogPrintf("%Rfn: id=%RTuuid\n", __PRETTY_FUNCTION__, idToFind.raw());
 
         *aDevice = NULL;
@@ -122 +124 @@
             Guid id;
             (*it)->COMGETTER(Id) (id.asOutParam());
+RTLogPrintf("%Rfn: it=%RTuuid\n", __PRETTY_FUNCTION__, id.raw());
             if (id == idToFind)
                 found = *it;
@@ -128 +131 @@
 
         if (!found)
+        {
+RTLogPrintf("%Rfn: not found\n", __PRETTY_FUNCTION__);
             return setError (E_INVALIDARG, OUSBDeviceCollection::tr (
                 "Could not find a USB device with UUID {%s}"),
                 idToFind.toString().raw());
+        }
 
         return found.queryInterfaceTo (aDevice);