Changeset 60153 in vbox for trunk/src/VBox

Timestamp:

Mar 23, 2016 11:19:02 AM (9 years ago)

Author:

vboxsync

Message:

USBGetDevices.cpp: Collected and #ifdef'ed the USBFS specific code.

File:

• trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp (modified) (18 diffs)

trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp

@@ -20 +20 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-
+#define VBOX_USB_WITH_USBFS
 #include "USBGetDevices.h"
 
@@ -116 +116 @@
     }
     return offSrc - 1;
-}
-
-
-/**
- * "reads" the number suffix.
- *
- * It's more like validating it and skipping the necessary number of chars.
- */
-static int usbfsReadSkipSuffix(char **ppszNext)
-{
-    char *pszNext = *ppszNext;
-    if (!RT_C_IS_SPACE(*pszNext) && *pszNext)
-    {
-        /* skip unit */
-        if (pszNext[0] == 'm' && pszNext[1] == 's')
-            pszNext += 2;
-        else if (pszNext[0] == 'm' && pszNext[1] == 'A')
-            pszNext += 2;
-
-        /* skip parenthesis */
-        if (*pszNext == '(')
-        {
-            pszNext = strchr(pszNext, ')');
-            if (!pszNext++)
-            {
-                AssertMsgFailed(("*ppszNext=%s\n", *ppszNext));
-                return VERR_PARSE_ERROR;
-            }
-        }
-
-        /* blank or end of the line. */
-        if (!RT_C_IS_SPACE(*pszNext) && *pszNext)
-        {
-            AssertMsgFailed(("pszNext=%s\n", pszNext));
-            return VERR_PARSE_ERROR;
-        }
-
-        /* it's ok. */
-        *ppszNext = pszNext;
-    }
-
-    return VINF_SUCCESS;
-}
-
-
-/**
- * Reads a USB number returning the number and the position of the next character to parse.
- */
-static int usbfsReadNum(const char *pszValue, unsigned uBase, uint32_t u32Mask, void *pvNum, char **ppszNext)
-{
-    /*
-     * Initialize return value to zero and strip leading spaces.
-     */
-    switch (u32Mask)
-    {
-        case 0xff: *(uint8_t *)pvNum = 0; break;
-        case 0xffff: *(uint16_t *)pvNum = 0; break;
-        case 0xffffffff: *(uint32_t *)pvNum = 0; break;
-    }
-    pszValue = RTStrStripL(pszValue);
-    if (*pszValue)
-    {
-        /*
-         * Try convert the number.
-         */
-        char *pszNext;
-        uint32_t u32 = 0;
-        RTStrToUInt32Ex(pszValue, &pszNext, uBase, &u32);
-        if (pszNext == pszValue)
-        {
-            AssertMsgFailed(("pszValue=%d\n", pszValue));
-            return VERR_NO_DATA;
-        }
-
-        /*
-         * Check the range.
-         */
-        if (u32 & ~u32Mask)
-        {
-            AssertMsgFailed(("pszValue=%d u32=%#x lMask=%#x\n", pszValue, u32, u32Mask));
-            return VERR_OUT_OF_RANGE;
-        }
-
-        int rc = usbfsReadSkipSuffix(&pszNext);
-        if (RT_FAILURE(rc))
-            return rc;
-
-        *ppszNext = pszNext;
-
-        /*
-         * Set the value.
-         */
-        switch (u32Mask)
-        {
-            case 0xff: *(uint8_t *)pvNum = (uint8_t)u32; break;
-            case 0xffff: *(uint16_t *)pvNum = (uint16_t)u32; break;
-            case 0xffffffff: *(uint32_t *)pvNum = (uint32_t)u32; break;
-        }
-    }
-    return VINF_SUCCESS;
-}
-
-
-static int usbfsRead8(const char *pszValue, unsigned uBase, uint8_t *pu8, char **ppszNext)
-{
-    return usbfsReadNum(pszValue, uBase, 0xff, pu8, ppszNext);
-}
-
-
-static int usbfsRead16(const char *pszValue, unsigned uBase, uint16_t *pu16, char **ppszNext)
-{
-    return usbfsReadNum(pszValue, uBase, 0xffff, pu16, ppszNext);
-}
-
-
-/**
- * Reads a USB BCD number returning the number and the position of the next character to parse.
- * The returned number contains the integer part in the high byte and the decimal part in the low byte.
- */
-static int usbfsReadBCD(const char *pszValue, unsigned uBase, uint16_t *pu16, char **ppszNext)
-{
-    /*
-     * Initialize return value to zero and strip leading spaces.
-     */
-    *pu16 = 0;
-    pszValue = RTStrStripL(pszValue);
-    if (*pszValue)
-    {
-        /*
-         * Try convert the number.
-         */
-        /* integer part */
-        char *pszNext;
-        uint32_t u32Int = 0;
-        RTStrToUInt32Ex(pszValue, &pszNext, uBase, &u32Int);
-        if (pszNext == pszValue)
-        {
-            AssertMsgFailed(("pszValue=%s\n", pszValue));
-            return VERR_NO_DATA;
-        }
-        if (u32Int & ~0xff)
-        {
-            AssertMsgFailed(("pszValue=%s u32Int=%#x (int)\n", pszValue, u32Int));
-            return VERR_OUT_OF_RANGE;
-        }
-
-        /* skip dot and read decimal part */
-        if (*pszNext != '.')
-        {
-            AssertMsgFailed(("pszValue=%s pszNext=%s (int)\n", pszValue, pszNext));
-            return VERR_PARSE_ERROR;
-        }
-        char *pszValue2 = RTStrStripL(pszNext + 1);
-        uint32_t u32Dec = 0;
-        RTStrToUInt32Ex(pszValue2, &pszNext, uBase, &u32Dec);
-        if (pszNext == pszValue)
-        {
-            AssertMsgFailed(("pszValue=%s\n", pszValue));
-            return VERR_NO_DATA;
-        }
-        if (u32Dec & ~0xff)
-        {
-            AssertMsgFailed(("pszValue=%s u32Dec=%#x\n", pszValue, u32Dec));
-            return VERR_OUT_OF_RANGE;
-        }
-
-        /*
-         * Validate and skip stuff following the number.
-         */
-        int rc = usbfsReadSkipSuffix(&pszNext);
-        if (RT_FAILURE(rc))
-            return rc;
-        *ppszNext = pszNext;
-
-        /*
-         * Set the value.
-         */
-        *pu16 = (uint16_t)u32Int << 8 | (uint16_t)u32Dec;
-    }
-    return VINF_SUCCESS;
-}
-
-
-/**
- * Reads a string, i.e. allocates memory and copies it.
- *
- * We assume that a string is Utf8 and if that's not the case
- * (pre-2.6.32-kernels used Latin-1, but so few devices return non-ASCII that
- * this usually goes unnoticed) then we mercilessly force it to be so.
- */
-static int usbfsReadStr(const char *pszValue, const char **ppsz)
-{
-    char *psz;
-
-    if (*ppsz)
-        RTStrFree((char *)*ppsz);
-    psz = RTStrDup(pszValue);
-    if (psz)
-    {
-        usbPurgeEncoding(psz);
-        *ppsz = psz;
-        return VINF_SUCCESS;
-    }
-    return VERR_NO_MEMORY;
-}
-
-
-/**
- * Skips the current property.
- */
-static char *usbfsReadSkip(char *pszValue)
-{
-    char *psz = strchr(pszValue, '=');
-    if (psz)
-        psz = strchr(psz + 1, '=');
-    if (!psz)
-        return strchr(pszValue,  '\0');
-    while (psz > pszValue && !RT_C_IS_SPACE(psz[-1]))
-        psz--;
-    Assert(psz > pszValue);
-    return psz;
-}
-
-
-/**
- * Determine the USB speed.
- */
-static int usbfsReadSpeed(const char *pszValue, USBDEVICESPEED *pSpd, char **ppszNext)
-{
-    pszValue = RTStrStripL(pszValue);
-    /* verified with Linux 2.4.0 ... Linux 2.6.25 */
-    if (!strncmp(pszValue, RT_STR_TUPLE("1.5")))
-        *pSpd = USBDEVICESPEED_LOW;
-    else if (!strncmp(pszValue, RT_STR_TUPLE("12 ")))
-        *pSpd = USBDEVICESPEED_FULL;
-    else if (!strncmp(pszValue, RT_STR_TUPLE("480")))
-        *pSpd = USBDEVICESPEED_HIGH;
-    else if (!strncmp(pszValue, RT_STR_TUPLE("5000")))
-        *pSpd = USBDEVICESPEED_SUPER;
-    else
-        *pSpd = USBDEVICESPEED_UNKNOWN;
-    while (pszValue[0] != '\0' && !RT_C_IS_SPACE(pszValue[0]))
-        pszValue++;
-    *ppszNext = (char *)pszValue;
-    return VINF_SUCCESS;
-}
-
-
-/**
- * Compare a prefix and returns pointer to the char following it if it matches.
- */
-static char *usbfsPrefix(char *psz, const char *pszPref, size_t cchPref)
-{
-    if (strncmp(psz, pszPref, cchPref))
-        return NULL;
-    return psz + cchPref;
 }
 
@@ -453 +197 @@
 
     return enmState;
+}
+
+
+/**
+ * Dumps a USBDEVICE structure to the log using LogLevel 3.
+ * @param   pDev        The structure to log.
+ * @todo    This is really common code.
+ */
+static void usbLogDevice(PUSBDEVICE pDev)
+{
+    NOREF(pDev);
+    if (LogIs3Enabled())
+    {
+        Log3(("USB device:\n"));
+        Log3(("Product: %s (%x)\n", pDev->pszProduct, pDev->idProduct));
+        Log3(("Manufacturer: %s (Vendor ID %x)\n", pDev->pszManufacturer, pDev->idVendor));
+        Log3(("Serial number: %s (%llx)\n", pDev->pszSerialNumber, pDev->u64SerialHash));
+        Log3(("Device revision: %d\n", pDev->bcdDevice));
+        Log3(("Device class: %x\n", pDev->bDeviceClass));
+        Log3(("Device subclass: %x\n", pDev->bDeviceSubClass));
+        Log3(("Device protocol: %x\n", pDev->bDeviceProtocol));
+        Log3(("USB version number: %d\n", pDev->bcdUSB));
+        Log3(("Device speed: %s\n",
+                pDev->enmSpeed == USBDEVICESPEED_UNKNOWN  ? "unknown"
+              : pDev->enmSpeed == USBDEVICESPEED_LOW      ? "1.5 MBit/s"
+              : pDev->enmSpeed == USBDEVICESPEED_FULL     ? "12 MBit/s"
+              : pDev->enmSpeed == USBDEVICESPEED_HIGH     ? "480 MBit/s"
+              : pDev->enmSpeed == USBDEVICESPEED_SUPER    ? "5.0 GBit/s"
+              : pDev->enmSpeed == USBDEVICESPEED_VARIABLE ? "variable"
+              :                                             "invalid"));
+        Log3(("Number of configurations: %d\n", pDev->bNumConfigurations));
+        Log3(("Bus number: %d\n", pDev->bBus));
+        Log3(("Port number: %d\n", pDev->bPort));
+        Log3(("Device number: %d\n", pDev->bDevNum));
+        Log3(("Device state: %s\n",
+                pDev->enmState == USBDEVICESTATE_UNSUPPORTED   ? "unsupported"
+              : pDev->enmState == USBDEVICESTATE_USED_BY_HOST  ? "in use by host"
+              : pDev->enmState == USBDEVICESTATE_USED_BY_HOST_CAPTURABLE ? "in use by host, possibly capturable"
+              : pDev->enmState == USBDEVICESTATE_UNUSED        ? "not in use"
+              : pDev->enmState == USBDEVICESTATE_HELD_BY_PROXY ? "held by proxy"
+              : pDev->enmState == USBDEVICESTATE_USED_BY_GUEST ? "used by guest"
+              :                                                  "invalid"));
+        Log3(("OS device address: %s\n", pDev->pszAddress));
+    }
+}
+
+
+#ifdef VBOX_USB_WITH_USBFS
+
+/**
+ * "reads" the number suffix.
+ *
+ * It's more like validating it and skipping the necessary number of chars.
+ */
+static int usbfsReadSkipSuffix(char **ppszNext)
+{
+    char *pszNext = *ppszNext;
+    if (!RT_C_IS_SPACE(*pszNext) && *pszNext)
+    {
+        /* skip unit */
+        if (pszNext[0] == 'm' && pszNext[1] == 's')
+            pszNext += 2;
+        else if (pszNext[0] == 'm' && pszNext[1] == 'A')
+            pszNext += 2;
+
+        /* skip parenthesis */
+        if (*pszNext == '(')
+        {
+            pszNext = strchr(pszNext, ')');
+            if (!pszNext++)
+            {
+                AssertMsgFailed(("*ppszNext=%s\n", *ppszNext));
+                return VERR_PARSE_ERROR;
+            }
+        }
+
+        /* blank or end of the line. */
+        if (!RT_C_IS_SPACE(*pszNext) && *pszNext)
+        {
+            AssertMsgFailed(("pszNext=%s\n", pszNext));
+            return VERR_PARSE_ERROR;
+        }
+
+        /* it's ok. */
+        *ppszNext = pszNext;
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Reads a USB number returning the number and the position of the next character to parse.
+ */
+static int usbfsReadNum(const char *pszValue, unsigned uBase, uint32_t u32Mask, void *pvNum, char **ppszNext)
+{
+    /*
+     * Initialize return value to zero and strip leading spaces.
+     */
+    switch (u32Mask)
+    {
+        case 0xff: *(uint8_t *)pvNum = 0; break;
+        case 0xffff: *(uint16_t *)pvNum = 0; break;
+        case 0xffffffff: *(uint32_t *)pvNum = 0; break;
+    }
+    pszValue = RTStrStripL(pszValue);
+    if (*pszValue)
+    {
+        /*
+         * Try convert the number.
+         */
+        char *pszNext;
+        uint32_t u32 = 0;
+        RTStrToUInt32Ex(pszValue, &pszNext, uBase, &u32);
+        if (pszNext == pszValue)
+        {
+            AssertMsgFailed(("pszValue=%d\n", pszValue));
+            return VERR_NO_DATA;
+        }
+
+        /*
+         * Check the range.
+         */
+        if (u32 & ~u32Mask)
+        {
+            AssertMsgFailed(("pszValue=%d u32=%#x lMask=%#x\n", pszValue, u32, u32Mask));
+            return VERR_OUT_OF_RANGE;
+        }
+
+        int rc = usbfsReadSkipSuffix(&pszNext);
+        if (RT_FAILURE(rc))
+            return rc;
+
+        *ppszNext = pszNext;
+
+        /*
+         * Set the value.
+         */
+        switch (u32Mask)
+        {
+            case 0xff: *(uint8_t *)pvNum = (uint8_t)u32; break;
+            case 0xffff: *(uint16_t *)pvNum = (uint16_t)u32; break;
+            case 0xffffffff: *(uint32_t *)pvNum = (uint32_t)u32; break;
+        }
+    }
+    return VINF_SUCCESS;
+}
+
+
+static int usbfsRead8(const char *pszValue, unsigned uBase, uint8_t *pu8, char **ppszNext)
+{
+    return usbfsReadNum(pszValue, uBase, 0xff, pu8, ppszNext);
+}
+
+
+static int usbfsRead16(const char *pszValue, unsigned uBase, uint16_t *pu16, char **ppszNext)
+{
+    return usbfsReadNum(pszValue, uBase, 0xffff, pu16, ppszNext);
+}
+
+
+/**
+ * Reads a USB BCD number returning the number and the position of the next character to parse.
+ * The returned number contains the integer part in the high byte and the decimal part in the low byte.
+ */
+static int usbfsReadBCD(const char *pszValue, unsigned uBase, uint16_t *pu16, char **ppszNext)
+{
+    /*
+     * Initialize return value to zero and strip leading spaces.
+     */
+    *pu16 = 0;
+    pszValue = RTStrStripL(pszValue);
+    if (*pszValue)
+    {
+        /*
+         * Try convert the number.
+         */
+        /* integer part */
+        char *pszNext;
+        uint32_t u32Int = 0;
+        RTStrToUInt32Ex(pszValue, &pszNext, uBase, &u32Int);
+        if (pszNext == pszValue)
+        {
+            AssertMsgFailed(("pszValue=%s\n", pszValue));
+            return VERR_NO_DATA;
+        }
+        if (u32Int & ~0xff)
+        {
+            AssertMsgFailed(("pszValue=%s u32Int=%#x (int)\n", pszValue, u32Int));
+            return VERR_OUT_OF_RANGE;
+        }
+
+        /* skip dot and read decimal part */
+        if (*pszNext != '.')
+        {
+            AssertMsgFailed(("pszValue=%s pszNext=%s (int)\n", pszValue, pszNext));
+            return VERR_PARSE_ERROR;
+        }
+        char *pszValue2 = RTStrStripL(pszNext + 1);
+        uint32_t u32Dec = 0;
+        RTStrToUInt32Ex(pszValue2, &pszNext, uBase, &u32Dec);
+        if (pszNext == pszValue)
+        {
+            AssertMsgFailed(("pszValue=%s\n", pszValue));
+            return VERR_NO_DATA;
+        }
+        if (u32Dec & ~0xff)
+        {
+            AssertMsgFailed(("pszValue=%s u32Dec=%#x\n", pszValue, u32Dec));
+            return VERR_OUT_OF_RANGE;
+        }
+
+        /*
+         * Validate and skip stuff following the number.
+         */
+        int rc = usbfsReadSkipSuffix(&pszNext);
+        if (RT_FAILURE(rc))
+            return rc;
+        *ppszNext = pszNext;
+
+        /*
+         * Set the value.
+         */
+        *pu16 = (uint16_t)u32Int << 8 | (uint16_t)u32Dec;
+    }
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Reads a string, i.e. allocates memory and copies it.
+ *
+ * We assume that a string is Utf8 and if that's not the case
+ * (pre-2.6.32-kernels used Latin-1, but so few devices return non-ASCII that
+ * this usually goes unnoticed) then we mercilessly force it to be so.
+ */
+static int usbfsReadStr(const char *pszValue, const char **ppsz)
+{
+    char *psz;
+
+    if (*ppsz)
+        RTStrFree((char *)*ppsz);
+    psz = RTStrDup(pszValue);
+    if (psz)
+    {
+        usbPurgeEncoding(psz);
+        *ppsz = psz;
+        return VINF_SUCCESS;
+    }
+    return VERR_NO_MEMORY;
+}
+
+
+/**
+ * Skips the current property.
+ */
+static char *usbfsReadSkip(char *pszValue)
+{
+    char *psz = strchr(pszValue, '=');
+    if (psz)
+        psz = strchr(psz + 1, '=');
+    if (!psz)
+        return strchr(pszValue,  '\0');
+    while (psz > pszValue && !RT_C_IS_SPACE(psz[-1]))
+        psz--;
+    Assert(psz > pszValue);
+    return psz;
+}
+
+
+/**
+ * Determine the USB speed.
+ */
+static int usbfsReadSpeed(const char *pszValue, USBDEVICESPEED *pSpd, char **ppszNext)
+{
+    pszValue = RTStrStripL(pszValue);
+    /* verified with Linux 2.4.0 ... Linux 2.6.25 */
+    if (!strncmp(pszValue, RT_STR_TUPLE("1.5")))
+        *pSpd = USBDEVICESPEED_LOW;
+    else if (!strncmp(pszValue, RT_STR_TUPLE("12 ")))
+        *pSpd = USBDEVICESPEED_FULL;
+    else if (!strncmp(pszValue, RT_STR_TUPLE("480")))
+        *pSpd = USBDEVICESPEED_HIGH;
+    else if (!strncmp(pszValue, RT_STR_TUPLE("5000")))
+        *pSpd = USBDEVICESPEED_SUPER;
+    else
+        *pSpd = USBDEVICESPEED_UNKNOWN;
+    while (pszValue[0] != '\0' && !RT_C_IS_SPACE(pszValue[0]))
+        pszValue++;
+    *ppszNext = (char *)pszValue;
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Compare a prefix and returns pointer to the char following it if it matches.
+ */
+static char *usbfsPrefix(char *psz, const char *pszPref, size_t cchPref)
+{
+    if (strncmp(psz, pszPref, cchPref))
+        return NULL;
+    return psz + cchPref;
 }
 
@@ -795 +841 @@
 }
 
+#endif /* VBOX_USB_WITH_USBFS */
 #ifdef VBOX_USB_WITH_SYSFS
 
@@ -819 +866 @@
 }
 
-#define USBDEVICE_MAJOR 189
+# define USBDEVICE_MAJOR 189
 
 /**
@@ -943 +990 @@
 
 
-#ifdef DEBUG
-# ifdef __cplusplus
+# ifdef DEBUG
+#  ifdef __cplusplus
 /** Unit test the logic in muiIsAnInterfaceOf in debug builds. */
 class testIsAnInterfaceOf
@@ -960 +1007 @@
 };
 static testIsAnInterfaceOf testIsAnInterfaceOfInst;
-# endif /* __cplusplus */
-#endif /* DEBUG */
+#  endif /* __cplusplus */
+# endif /* DEBUG */
 
 
@@ -1182 +1229 @@
 
 /**
- * Dumps a USBDEVICE structure to the log using LogLevel 3.
- * @param   pDev        The structure to log.
- * @todo    This is really common code.
- */
-static void usbLogDevice(PUSBDEVICE pDev)
-{
-    NOREF(pDev);
-    if (LogIs3Enabled())
-    {
-        Log3(("USB device:\n"));
-        Log3(("Product: %s (%x)\n", pDev->pszProduct, pDev->idProduct));
-        Log3(("Manufacturer: %s (Vendor ID %x)\n", pDev->pszManufacturer, pDev->idVendor));
-        Log3(("Serial number: %s (%llx)\n", pDev->pszSerialNumber, pDev->u64SerialHash));
-        Log3(("Device revision: %d\n", pDev->bcdDevice));
-        Log3(("Device class: %x\n", pDev->bDeviceClass));
-        Log3(("Device subclass: %x\n", pDev->bDeviceSubClass));
-        Log3(("Device protocol: %x\n", pDev->bDeviceProtocol));
-        Log3(("USB version number: %d\n", pDev->bcdUSB));
-        Log3(("Device speed: %s\n",
-                pDev->enmSpeed == USBDEVICESPEED_UNKNOWN  ? "unknown"
-              : pDev->enmSpeed == USBDEVICESPEED_LOW      ? "1.5 MBit/s"
-              : pDev->enmSpeed == USBDEVICESPEED_FULL     ? "12 MBit/s"
-              : pDev->enmSpeed == USBDEVICESPEED_HIGH     ? "480 MBit/s"
-              : pDev->enmSpeed == USBDEVICESPEED_SUPER    ? "5.0 GBit/s"
-              : pDev->enmSpeed == USBDEVICESPEED_VARIABLE ? "variable"
-              :                                             "invalid"));
-        Log3(("Number of configurations: %d\n", pDev->bNumConfigurations));
-        Log3(("Bus number: %d\n", pDev->bBus));
-        Log3(("Port number: %d\n", pDev->bPort));
-        Log3(("Device number: %d\n", pDev->bDevNum));
-        Log3(("Device state: %s\n",
-                pDev->enmState == USBDEVICESTATE_UNSUPPORTED   ? "unsupported"
-              : pDev->enmState == USBDEVICESTATE_USED_BY_HOST  ? "in use by host"
-              : pDev->enmState == USBDEVICESTATE_USED_BY_HOST_CAPTURABLE ? "in use by host, possibly capturable"
-              : pDev->enmState == USBDEVICESTATE_UNUSED        ? "not in use"
-              : pDev->enmState == USBDEVICESTATE_HELD_BY_PROXY ? "held by proxy"
-              : pDev->enmState == USBDEVICESTATE_USED_BY_GUEST ? "used by guest"
-              :                                                  "invalid"));
-        Log3(("OS device address: %s\n", pDev->pszAddress));
-    }
-}
-
-
-/**
  * Converts a sysfs BCD value into a uint16_t.
  *
@@ -1267 +1270 @@
 }
 
-#endif  /* VBOX_USB_WITH_SYSFS */
 
 static void usbsysfsFillInDevice(USBDEVICE *pDev, USBDeviceInfo *pInfo)
@@ -1384 +1386 @@
 static PUSBDEVICE usbsysfsGetDevices(const char *pcszDevicesRoot, bool testfs)
 {
-#ifdef VBOX_USB_WITH_SYSFS
     /* Add each of the devices found to the chain. */
     PUSBDEVICE pFirst = NULL;
@@ -1427 +1428 @@
     VEC_CLEANUP_OBJ(&vecDevInfo);
     return pFirst;
-#else  /* !VBOX_USB_WITH_SYSFS */
-    return NULL;
-#endif  /* !VBOX_USB_WITH_SYSFS */
-}
-
+}
+
+#endif /* VBOX_USB_WITH_SYSFS */
 #ifdef UNIT_TEST
 
@@ -1553 +1552 @@
 
 
-#  ifdef UNIT_TEST
-    /** The path we pretend the usbfs root is located at, or NULL. */
-    const char *s_pcszTestUsbfsRoot;
-    /** Should usbfs be accessible to the current user? */
-    bool s_fTestUsbfsAccessible;
-    /** The path we pretend the device node tree root is located at, or NULL. */
-    const char *s_pcszTestDevicesRoot;
-    /** Should the device node tree be accessible to the current user? */
-    bool s_fTestDevicesAccessible;
-    /** The result of the usbfs/inotify-specific init */
-    int s_rcTestMethodInitResult;
-    /** The value of the VBOX_USB environment variable. */
-    const char *s_pcszTestEnvUsb;
-    /** The value of the VBOX_USB_ROOT environment variable. */
-    const char *s_pcszTestEnvUsbRoot;
-#  endif
+/** The path we pretend the usbfs root is located at, or NULL. */
+const char *s_pcszTestUsbfsRoot;
+/** Should usbfs be accessible to the current user? */
+bool s_fTestUsbfsAccessible;
+/** The path we pretend the device node tree root is located at, or NULL. */
+const char *s_pcszTestDevicesRoot;
+/** Should the device node tree be accessible to the current user? */
+bool s_fTestDevicesAccessible;
+/** The result of the usbfs/inotify-specific init */
+int s_rcTestMethodInitResult;
+/** The value of the VBOX_USB environment variable. */
+const char *s_pcszTestEnvUsb;
+/** The value of the VBOX_USB_ROOT environment variable. */
+const char *s_pcszTestEnvUsbRoot;
 
 
@@ -1602 +1599 @@
 # define USBProxyLinuxCheckDeviceRoot(pcszPath, fUseNodes) \
     (   ((fUseNodes) && s_fTestDevicesAccessible \
-                     && !RTStrCmp(pcszPath, s_pcszTestDevicesRoot)) \
+         && !RTStrCmp(pcszPath, s_pcszTestDevicesRoot)) \
      || (!(fUseNodes) && s_fTestUsbfsAccessible \
-                      && !RTStrCmp(pcszPath, s_pcszTestUsbfsRoot)))
+         && !RTStrCmp(pcszPath, s_pcszTestUsbfsRoot)))
 # define RTDirExists(pcszDir) \
     (   (pcszDir) \
@@ -1663 +1660 @@
         else
         {
-            LogRel(("Invalid VBOX_USB environment variable setting \"%s\"\n",
-                    pcszUsbFromEnv));
+            LogRel(("Invalid VBOX_USB environment variable setting \"%s\"\n", pcszUsbFromEnv));
             fValidVBoxUSB = false;
             pcszUsbFromEnv = NULL;
@@ -1709 +1705 @@
 
 /**
- * Check whether a USB device tree root is usable
+ * Check whether a USB device tree root is usable.
  *
  * @param pcszRoot        the path to the root of the device tree
@@ -1720 +1716 @@
     if (!fIsDeviceNodes)  /* usbfs */
     {
-        PUSBDEVICE pDevices;
-
+#ifdef VBOX_USB_WITH_USBFS
         if (!access(pcszRoot, R_OK | X_OK))
         {
             fOK = true;
-            pDevices = usbfsGetDevices(pcszRoot, true);
+            PUSBDEVICE pDevices = usbfsGetDevices(pcszRoot, true);
             if (pDevices)
             {
                 PUSBDEVICE pDevice;
-
                 for (pDevice = pDevices; pDevice && fOK; pDevice = pDevice->pNext)
                     if (access(pDevice->pszAddress, R_OK | W_OK))
@@ -1736 +1730 @@
             }
         }
-    }
+#endif
+    }
+#ifdef VBOX_USB_WITH_SYSFS
     /* device nodes */
     else if (usbsysfsInotifyAvailable() && !access(pcszRoot, R_OK | X_OK))
         fOK = true;
+#endif
     return fOK;
 }
@@ -1759 +1756 @@
 {
     if (!fUseSysfs)
+    {
+#ifdef VBOX_USB_WITH_USBFS
         return usbfsGetDevices(pcszDevicesRoot, false);
+#else
+        return NULL;
+#endif
+    }
+
+#ifdef VBOX_USB_WITH_SYSFS
     return usbsysfsGetDevices(pcszDevicesRoot, false);
-}
+#else
+    return NULL;
+#endif
+}
+