Changeset 37618 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jun 23, 2011 5:16:39 PM (14 years ago)

Author:

vboxsync

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

72464

Message:

Main/USB/linux: move USBProxyLinuxChooseMethod to USBGetDevices

Location:

trunk/src/VBox/Main/include

Files:

• USBGetDevices.h (modified) (1 diff)
• USBProxyService.h (modified) (2 diffs)

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

@@ -85 +85 @@
 
 #ifdef UNIT_TEST
+void TestUSBSetupInit(const char *pcszUsbfsRoot, bool fUsbfsAccessible,
+                      const char *pcszDevicesRoot, bool fDevicesAccessible,
+                      int rcMethodInitResult);
+void TestUSBSetEnv(const char *pcszEnvUsb, const char *pcszEnvUsbRoot);
+#endif
+
+/**
+ * Selects the access method that will be used to access USB devices based on
+ * what is available on the host and what if anything the user has specified
+ * in the environment.
+ * @returns iprt status value
+ * @param  pfUsingUsbfsDevices  on success this will be set to true if 
+ *                              the prefered access method is USBFS-like and to
+ *                              false if it is sysfs/device node-like
+ * @param  ppcszDevicesRoot     on success the root of the tree of USBFS-like
+ *                              device nodes will be stored here
+ */
+extern int USBProxyLinuxChooseMethod(bool *pfUsingUsbfsDevices,
+                                     const char **ppcszDevicesRoot);
+#ifdef UNIT_TEST
 /**
  * Specify the list of devices that will appear to be available through

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

@@ -197 +197 @@
 #  endif
 
-#ifdef UNIT_TEST
-void TestUSBSetupInit(const char *pcszUsbfsRoot, bool fUsbfsAccessible,
-                      const char *pcszDevicesRoot, bool fDevicesAccessible,
-                      int rcMethodInitResult);
-void TestUSBSetEnv(const char *pcszEnvUsb, const char *pcszEnvUsbRoot);
-#endif
-
 /**
  * The Linux hosted USB Proxy Service.
@@ -217 +210 @@
     virtual int captureDevice(HostUSBDevice *aDevice);
     virtual int releaseDevice(HostUSBDevice *aDevice);
-
-#  ifdef UNIT_TEST
-    /* Test getters for querying internal state.  This will go away. */
-    bool testGetUsingUsbfs(void) { return mUsingUsbfsDevices; }
-    const char *testGetDevicesRoot(void) { return mDevicesRoot.c_str(); }
-#  endif
 
 protected: