Changeset 28741 in vbox

Timestamp:

Apr 26, 2010 10:50:36 AM (15 years ago)

Author:

vboxsync

Message:

Main/HostHardwareLinux: introduce an ifdef for building USB with raw sysfs and FAM support

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (2 diffs)
• src/VBox/Main/linux/HostHardwareLinux.cpp (modified) (12 diffs)
• src/VBox/Main/testcase/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -383 +383 @@
 ifeq ($(KBUILD_TARGET),linux)
  VBOX_USB_WITH_SYSFS=1
+ VBOX_USB_WITH_FAM=1
 endif
 # Use the new VBI module on Solaris.

trunk/src/VBox/Main/Makefile.kmk

@@ -224 +224 @@
         $(if $(VBOX_WITH_DBUS),VBOX_WITH_DBUS,) \
         $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
+        $(if $(VBOX_USB_WITH_FAM),VBOX_USB_WITH_FAM,) \
         $(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
         $(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,)
@@ -277 +278 @@
  VBoxSVC_LIBS.solaris += \
         devinfo
- ifdef VBOX_USB_WITH_SYSFS
+ ifdef VBOX_USB_WITH_FAM
   VBoxSVC_LIBS.linux += \
         fam

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

@@ -58 +58 @@
 
 #ifdef VBOX_USB_WITH_SYSFS
-# include <fam.h>
+# ifdef VBOX_USB_WITH_FAM
+#  include <fam.h>
+# endif
 #endif
 
@@ -95 +97 @@
                                  bool *pfSuccess);
 #ifdef VBOX_USB_WITH_SYSFS
+# ifdef VBOX_USB_WITH_FAM
 static int getUSBDeviceInfoFromSysfs(USBDeviceInfoList *pList, bool *pfSuccess);
+# endif
 # ifdef VBOX_WITH_DBUS
 /* These must be extern to be usable in the RTMemAutoPtr template */
@@ -1043 +1047 @@
             success = halSuccess;
 # endif /* VBOX_WITH_DBUS */
+# ifdef VBOX_USB_WITH_FAM
         if (   RT_SUCCESS(rc)
             && (!success || testing()))
             rc = getUSBDeviceInfoFromSysfs(&mDeviceList, &success);
+# endif
 #else /* !VBOX_USB_WITH_SYSFS */
         NOREF(success);
@@ -1182 +1188 @@
 
 #ifdef VBOX_USB_WITH_SYSFS
-
-#define SYSFS_USB_DEVICE_PATH "/dev/bus/usb"
-#define SYSFS_WAKEUP_STRING "Wake up!"
+# ifdef VBOX_USB_WITH_FAM
+
+# define SYSFS_USB_DEVICE_PATH "/dev/bus/usb"
+# define SYSFS_WAKEUP_STRING "Wake up!"
 
 class hotplugSysfsFAMImpl : public VBoxMainHotplugWaiterImpl
@@ -1333 +1340 @@
     mfWaiting(0), mStatus(VERR_WRONG_ORDER)
 {
-#ifdef DEBUG
+#  ifdef DEBUG
     /* Excercise the code path (term() on a not-fully-initialised object) as
      * well as we can.  On an uninitialised object this method is a sematic
@@ -1342 +1349 @@
     if (!testing())
     {
-#ifndef VBOX_USB_WITH_SYSFS_BY_DEFAULT
+#   ifndef VBOX_USB_WITH_SYSFS_BY_DEFAULT
         Assert(!RTFileExists("/proc/bus/usb/devices"));
-#endif
-#ifdef VBOX_WITH_DBUS
+#   endif
+#   ifdef VBOX_WITH_DBUS
         Assert(!hotplugDBusImpl::HalAvailable());
-#endif
-    }
-#endif
+#   endif
+    }
+#  endif
     int rc;
     do {
@@ -1356 +1363 @@
         if (RT_FAILURE(rc = initConnection()))
             break;
-#ifdef DEBUG
+#  ifdef DEBUG
         /** Other tests */
         testMonitorDirectoryFAM();
         testNextEventFAM();
         testCheckConnection();
-#endif
+#  endif
     } while(0);
     mStatus = rc;
@@ -1492 +1499 @@
 }
 
+# endif /* VBOX_USB_WITH_FAM */
 #endif  /* VBOX_USB_WTH_SYSFS */
 
@@ -1504 +1512 @@
     }
 # endif  /* VBOX_WITH_DBUS */
+# ifdef VBOX_USB_WITH_FAM
     if (hotplugSysfsFAMImpl::SysfsAvailable())
     {
@@ -1509 +1518 @@
         return;
     }
+# endif /* VBOX_USB_WITH_FAM */
 #endif  /* VBOX_USB_WITH_SYSFS */
     mImpl = new hotplugNullImpl;
@@ -1514 +1524 @@
 
 #ifdef VBOX_USB_WITH_SYSFS
+# ifdef VBOX_USB_WITH_FAM
 class sysfsPathHandler
 {
@@ -1724 +1735 @@
     return rc;
 }
+# endif /* VBOX_USB_WITH_FAM */
 #endif /* VBOX_USB_WITH_SYSFS */
 

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

@@ -133 +133 @@
         $(if $(VBOX_WITH_LINUX_COMPILER_H),VBOX_WITH_LINUX_COMPILER_H,) \
         $(if $(VBOX_WITH_DBUS),VBOX_WITH_DBUS,) \
-        $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,)
+        $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
+        $(if $(VBOX_USB_WITH_FAM),VBOX_USB_WITH_FAM,)
 tstHostHardwareLinux_LIBS     += \
         $(PATH_OUT)/lib/USBLib.a \
-        $(if $(VBOX_USB_WITH_SYSFS),fam,)
+        $(if $(VBOX_USB_WITH_FAM),fam,)