Changeset 32142 in vbox for trunk/src/VBox/Main/include/HostHardwareLinux.h

Timestamp:

Aug 31, 2010 1:00:46 PM (14 years ago)

Author:

vboxsync

Message:

Main/linux/USB: moved a vector container-based implementation detail out of the interface

File:

• trunk/src/VBox/Main/include/HostHardwareLinux.h (modified) (3 diffs)

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

@@ -110 +110 @@
 
 
-/** Vector type for the list of interfaces. */
-#define VECTOR_TYPE       char *
-#define VECTOR_TYPENAME   USBInterfaceList
-static inline void USBInterfaceListCleanup(char **ppsz)
-{
-    RTStrFree(*ppsz);
-}
-#define VECTOR_DESTRUCTOR USBInterfaceListCleanup
-#include "vector.h"
-
 /** Structure describing a host USB device */
 typedef struct USBDeviceInfo
@@ -128 +118 @@
      * method. */
     char *mSysfsPath;
-    /** Type for the list of interfaces. */
-    USBInterfaceList mInterfaces;
+    /** List of interfaces.  Only one simulaneous traversal is possible. */
+    struct USBInterfaceList *mInterfaces;
 } USBDeviceInfo;
 
-
 /** Destructor. */
-static inline void USBDevInfoCleanup(USBDeviceInfo *pSelf)
-{
-    RTStrFree(pSelf->mDevice);
-    RTStrFree(pSelf->mSysfsPath);
-    pSelf->mDevice = pSelf->mSysfsPath = NULL;
-    USBInterfaceList_cleanup(&pSelf->mInterfaces);
-}
-
+void USBDevInfoCleanup(USBDeviceInfo *pSelf);
 
 /** Constructor - the strings will be duplicated. */
-static inline int USBDevInfoInit(USBDeviceInfo *pSelf, const char *aDevice,
-                                 const char *aSystemID)
-{
-    pSelf->mDevice = aDevice ? RTStrDup(aDevice) : NULL;
-    pSelf->mSysfsPath = aSystemID ? RTStrDup(aSystemID) : NULL;
-    if (   !USBInterfaceList_init(&pSelf->mInterfaces)
-        || (aDevice && !pSelf->mDevice) || (aSystemID && ! pSelf->mSysfsPath))
-    {
-        USBDevInfoCleanup(pSelf);
-        return 0;
-    }
-    return 1;
-}
+int USBDevInfoInit(USBDeviceInfo *pSelf, const char *aDevice,
+                   const char *aSystemID);
+
+/**
+ * Return the first in a list of USB device interfaces (that is, its sysfs
+ * path), or NULL if there are none.
+ */
+char *USBDevInfoFirstInterface(struct USBInterfaceList *pInterfaces);
+
+/**
+ * Return the next in a list of USB device interfaces (that is, its sysfs
+ * path), or NULL if there are none.
+ */
+char *USBDevInfoNextInterface(struct USBInterfaceList *pInterfaces);
 
 
@@ -195 +178 @@
  */
 int USBDevInfoUpdateDevices(VBoxMainUSBDeviceInfo *pSelf);
-
 
 /** Get the first element in the list of USB devices. */