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

Timestamp:

Jun 24, 2011 7:58:37 AM (13 years ago)

Author:

vboxsync

Message:

RDP/client/vrdp: use USBProxyLinuxChooseMethod to select the USB access method

File:

• trunk/src/VBox/RDP/client/vrdp/rdpusb.c (modified) (1 diff)

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

@@ -888 +888 @@
 rdpusb_init(void)
 {
-    /** @todo re-use the proxy service code */
-        if (USBProxyLinuxCheckDeviceRoot("/dev/vboxusb", true))
+    bool fUseUsbfs;
+    if (RT_SUCCESS(USBProxyLinuxChooseMethod(&fUseUsbfs, &g_pcszDevicesRoot)))
         {
-            g_fUseSysfs       = true;
-            g_pcszDevicesRoot = "/dev/vboxusb";
+            g_fUseSysfs = !fUseUsbfs;
+            rdpusb_channel =
+                    channel_register("vrdpusb", CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_ENCRYPT_RDP,
+                                     rdpusb_process);
+            return (rdpusb_channel != NULL);
         }
-        else
-        {
-            g_fUseSysfs       = false;
-            g_pcszDevicesRoot = "/proc/bus/usb";
-        }
-        rdpusb_channel =
-                channel_register("vrdpusb", CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_ENCRYPT_RDP,
-                                 rdpusb_process);
-        return (rdpusb_channel != NULL);
+        return false;
 }