Changeset 28779 in vbox for trunk/src/VBox/Main/linux

Timestamp:

Apr 26, 2010 8:18:24 PM (15 years ago)

Author:

vboxsync

Message:

Main/HostHardwareLinux: cleanup

File:

• trunk/src/VBox/Main/linux/HostHardwareLinux.cpp (modified) (4 diffs)

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -172 +172 @@
     {
         int rcIoCtl;
-        /** @todo The next line can produce a warning, as the ioctl request
-         * field is defined as signed, but the Linux ioctl definition macros
-         * produce unsigned constants. */
         rc = RTFileIoCtl(File, FDGETDRVTYP, pszName, 0, &rcIoCtl);
         RTFileClose(File);
@@ -1591 +1588 @@
 
 
+#define USBDEVICE_MAJOR 189
+
+/** Deduce the bus that a USB device is plugged into from the device node
+ * number.  See drivers/usb/core/hub.c:usb_new_device as of Linux 2.6.20. */
+static unsigned usbBusFromDevNum(dev_t devNum)
+{
+    AssertReturn(devNum, 0);
+    AssertReturn(major(devNum) == USBDEVICE_MAJOR, 0);
+    return (minor(devNum) >> 7) + 1;
+}
+
+
+/** Deduce the device number of a USB device on the bus from the device node
+ * number.  See drivers/usb/core/hub.c:usb_new_device as of Linux 2.6.20. */
+static unsigned usbDeviceFromDevNum(dev_t devNum)
+{
+    AssertReturn(devNum, 0);
+    AssertReturn(major(devNum) == USBDEVICE_MAJOR, 0);
+    return (minor(devNum) & 127) + 1;
+}
+
+
 /**
  * Tell whether a file in /sys/bus/usb/devices is a device rather than an
@@ -1607 +1626 @@
             return true;
         dev_t devnum = RTLinuxSysFsReadDevNumFile("%s/dev", pcszNode);
+        /* Sanity test of our static helpers */
+        Assert(usbBusFromDevNum(makedev(USBDEVICE_MAJOR, 517)) == 5);
+        Assert(usbDeviceFromDevNum(makedev(USBDEVICE_MAJOR, 517)) == 6);
         AssertReturn (devnum, true);
         char szDevPath[RTPATH_MAX];
@@ -1613 +1635 @@
                                            szDevPath, sizeof(szDevPath),
                                            "/dev/bus/usb/%.3d/%.3d",
-                                           RTLinuxSysFsReadIntFile(10, "%s/busnum", pcszNode),
-                                           RTLinuxSysFsReadIntFile(10, "%s/devnum", pcszNode));
+                                           usbBusFromDevNum(devnum),
+                                           usbDeviceFromDevNum(devnum));
         if (cchDevPath < 0)
             return true;