Changeset 34341 in vbox for trunk/src/VBox/RDP/client

Timestamp:

Nov 24, 2010 8:14:36 PM (14 years ago)

Author:

vboxsync

Message:

Main/linux/USB and RDP/client/vrdp: clean up the handling of the USB device tree path and get rid of data duplication

File:

• trunk/src/VBox/RDP/client/vrdp/rdpusb.c (modified) (3 diffs)

trunk/src/VBox/RDP/client/vrdp/rdpusb.c

@@ -63 +63 @@
 };
 
-/** Location at which the Linux Usbfs filesystem was found.  NULL means not
- * found, in which case USB devices will be accessed through /dev and sysfs. */
-static const char *g_pcszUsbfsRoot = NULL;
+/** Location at which the USB device tree was found.  NULL means not
+ * found. */
+static const char *g_pcszDevicesRoot = NULL;
+static bool g_fUseSysfs = false;
 
 static PUSBDEVICE g_pUsbDevices = NULL;
@@ -252 +253 @@
     if (g_pUsbDevices)
         deviceListFree(&g_pUsbDevices);
-    g_pUsbDevices = USBProxyLinuxGetDevices(g_pcszUsbfsRoot);
+    g_pUsbDevices = USBProxyLinuxGetDevices(g_pcszDevicesRoot, g_fUseSysfs);
     if (!g_pUsbDevices)
         return NULL;
@@ -852 +853 @@
 
 
-/** Check for the Linux Usbfs filesystem in a couple of common locations. */
-static void checkUsbfsRoot(void)
-{
-    unsigned i;
-    for (i = 0; i < RT_ELEMENTS(g_usbfsPaths); ++i)
-        if (RT_SUCCESS(USBProxyLinuxCheckForUsbfs(g_usbfsPaths[i].pcszDevices)))
-        {
-            g_pcszUsbfsRoot = g_usbfsPaths[i].pcszRoot;
-            break;
-        }
-}
-
-
 RD_BOOL
 rdpusb_init(void)
 {
-        checkUsbfsRoot();
+        PCUSBDEVTREELOCATION pcLocation = USBProxyLinuxGetDeviceRoot(false);
+        g_fUseSysfs       = pcLocation->fUseSysfs;
+        g_pcszDevicesRoot = pcLocation->szDevicesRoot;
         rdpusb_channel =
                 channel_register("vrdpusb", CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_ENCRYPT_RDP,