Changeset 36418 in vbox for trunk/src/VBox

Timestamp:

Mar 24, 2011 10:53:13 PM (14 years ago)

Author:

vboxsync

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

70778

Message:

Main/USB/Linux: extend environment variables for selecting USB probing method and add skeleton testcase

Location:

trunk/src/VBox/Main

Files:

• include/USBProxyService.h (modified) (1 diff)
• src-server/linux/USBProxyServiceLinux.cpp (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (2 diffs)

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

@@ -212 +212 @@
 
 protected:
+#ifdef TESTCASE
+    virtual
+#endif
     int initUsbfs(void);
+#ifdef TESTCASE
+    virtual
+#endif
     int initSysfs(void);
     void doUsbfsCleanupAsNeeded(void);

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

@@ -93 +93 @@
     bool fUseSysfs = false;
 #endif
-    const char *pszUsbFromEnv = RTEnvGet("VBOX_USB");
-    if (pszUsbFromEnv)
-    {
-        if (!RTStrICmp(pszUsbFromEnv, "USBFS"))
+    const char *pcszUsbFromEnv = RTEnvGet("VBOX_USB");
+    const char *pcszUsbRoot = NULL;
+    if (pcszUsbFromEnv)
+    {
+        bool fValidVBoxUSB = true;
+
+        pcszUsbRoot = RTEnvGet("VBOX_USB_ROOT");
+        if (!RTStrICmp(pcszUsbFromEnv, "USBFS"))
         {
             LogRel(("Default USB access method set to \"usbfs\" from environment\n"));
             fUseSysfs = false;
         }
-        else if (!RTStrICmp(pszUsbFromEnv, "SYSFS"))
+        else if (!RTStrICmp(pcszUsbFromEnv, "SYSFS"))
         {
             LogRel(("Default USB method set to \"sysfs\" from environment\n"));
@@ -107 +111 @@
         }
         else
+        {
             LogRel(("Invalid VBOX_USB environment variable setting \"%s\"\n",
-                    pszUsbFromEnv));
-    }
-    PCUSBDEVTREELOCATION pcLocation = USBProxyLinuxGetDeviceRoot(fUseSysfs);
-    if (pcLocation)
-    {
-        mUsingUsbfsDevices = !pcLocation->fUseSysfs;
-        mDevicesRoot = pcLocation->szDevicesRoot;
+                    pcszUsbFromEnv));
+            fValidVBoxUSB = false;
+        }
+        if (!fValidVBoxUSB && pcszUsbRoot)
+            pcszUsbRoot = NULL;
+    }
+    if (!pcszUsbRoot)
+    {
+        PCUSBDEVTREELOCATION pcLocation;
+        pcLocation = USBProxyLinuxGetDeviceRoot(fUseSysfs);
+        pcszUsbRoot = pcLocation->szDevicesRoot;
+        fUseSysfs = pcLocation->fUseSysfs;
+    }
+    if (pcszUsbRoot)
+    {
+        mUsingUsbfsDevices = !fUseSysfs;
+        mDevicesRoot = pcszUsbRoot;
         int rc = mUsingUsbfsDevices ? initUsbfs() : initSysfs();
         /* For the day when we have VBoxSVC release logging... */
         LogRel((RT_SUCCESS(rc) ? "Successfully initialised host USB using %s\n"
                                : "Failed to initialise host USB using %s\n",
-                mUsingUsbfsDevices ? "USBFS" : "sysfs/hal"));
+                mUsingUsbfsDevices ? "USBFS" : "sysfs"));
         mLastError = rc;
     }

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -30 +30 @@
         $(if $(VBOX_WITH_RESOURCE_USAGE_API),tstCollector,)
   PROGRAMS.linux += \
-        $(if $(VBOX_WITH_USB),tstHostHardwareLinux,)
+        $(if $(VBOX_WITH_USB),tstHostHardwareLinux,) \
+        $(if $(VBOX_WITH_USB),tstUSBProxyLinux,)
  endif # !VBOX_WITH_TESTCASES
 endif # !VBOX_ONLY_SDK
@@ -165 +166 @@
 
 
+#
+# tstUSBProxyLinux
+#
+tstUSBProxyLinux_TEMPLATE  = VBOXR3TSTNPEXE
+tstUSBProxyLinux_SOURCES   = \
+        tstUSBProxyLinux.cpp \
+        ../src-server/linux/USBProxyServiceLinux.cpp
+tstUSBProxyLinux_INCS      = \
+        . \
+        ../include \
+        $(VBOX_PATH_SDK)/bindings/xpcom/include \
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom
+tstUSBProxyLinux_DEFS      = \
+        TESTCASE \
+        VBOX_USB_WITH_SYSFS \
+        VBOX_WITH_SYSFS_BY_DEFAULT \
+        VBOX_WITH_XPCOM
+
+
 # generate rules.
 include $(KBUILD_PATH)/subfooter.kmk