Changeset 14711 in vbox

Timestamp:

Nov 27, 2008 3:16:52 PM (16 years ago)

Author:

vboxsync

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

40024

Message:

Devices/USB and Main: use hal and sysfs for Linux USB (currently disabled)

Location:

trunk

Files:

• configure (modified) (8 diffs)
• include/VBox/sysfs.h (added)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/Makefile.kmk (modified) (3 diffs)
• src/VBox/Main/testcase/Makefile.kmk (modified) (2 diffs)
• src/VBox/Main/testcase/tstUSBLinux.cpp (added)
• src/VBox/Main/testcase/tstUSBLinux.h (added)

trunk/configure

@@ -23 +23 @@
 PATH="/usr/xpg4/bin:/usr/ucb:$PATH:/usr/local/bin:/usr/sfw/bin:/usr/ccs/bin"
 ORGPATH=$PATH
+
+# Wrapper for ancient /usr/bin/which on darwin that always returns 0
+which_wrapper()
+{
+  if [ -z "$have_ancient_which" ]; then
+    if which /bin/___cErTaINly_a_nOn_eXisTing_fIle___ 2> /dev/null > /dev/null; then
+      have_ancient_which="yes"
+    else
+      have_ancient_which="no"
+    fi
+  fi
+  if [ "$have_ancient_which" = "yes" ]; then
+    retval=`which $* 2>/dev/null`
+    echo "$retval"
+    test -n "$retval" -a -x "$retval"
+    unset retval
+  else
+    which $* 2> /dev/null
+  fi
+}
+
 
 #
@@ -42 +63 @@
 WITH_ALSA=1
 WITH_PULSE=1
+WITH_LIBHAL=1
 WITH_KMODS=1
 WITH_HARDENING=1
@@ -69 +91 @@
 INCPNG=""
 LIBPNG="-lpng"
+PKGCONFIG="`which_wrapper pkg-config`"
+if [ -n $PKGCONFIG ]; then
+  FLAGSHAL="`$PKGCONFIG hal --cflags 2>/dev/null`"
+  LIBDIRHAL="`$PKGCONFIG hal --libs-only-L 2>/dev/null`"
+  LIBHAL="`$PKGCONFIG hal --libs-only-l 2>/dev/null`"
+fi
 PYTHONDIR="/usr /usr/local"
 QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3"
@@ -164 +192 @@
   echo "$1"|$KBUILD_SED 's|^\/|-I/|g; s| \/| -I/|g'
 }
-
-# Wrapper for ancient /usr/bin/which on darwin that always returns 0
-which_wrapper()
-{
-  if [ -z "$have_ancient_which" ]; then
-    if which /bin/___cErTaINly_a_nOn_eXisTing_fIle___ 2> /dev/null > /dev/null; then
-      have_ancient_which="yes"
-    else
-      have_ancient_which="no"
-    fi
-  fi
-  if [ "$have_ancient_which" = "yes" ]; then
-    retval=`which $* 2>/dev/null`
-    echo "$retval"
-    test -n "$retval" -a -x "$retval"
-    unset retval
-  else
-    which $* 2> /dev/null
-  fi
-}
-
 
 check_avail()
@@ -1153 +1160 @@
   if test_compile "-lpulse" pulse pulse; then
     test_execute
+  fi
+}
+
+
+#
+# Check for libhal
+#
+check_libhal()
+{
+  test_header "libhal"
+  cat > .tmp_src.cc << EOF
+#include <libhal.h>
+extern "C" int main(void)
+{
+  return 0;
+}
+EOF
+  if [ -n $PKGCONFIG ] && test_compile "$FLAGSHAL $LIBDIRHAL $LIBHAL" libhal libhal; then
+    log_success "found"
   fi
 }
@@ -1760 +1786 @@
   --disable-alsa           disable the ALSA sound backend
   --disable-pulse          disable the PulseAudio backend
+  --disable-libhal         don't use hal for hardware detection
   --disable-kmods          don't build Linux kernel modules (host and guest)
   --disable-hardening      don't be strict about /dev/vboxdrv access
@@ -1858 +1885 @@
     --disable-pulse)
       WITH_PULSE=0
+      ;;
+    --disable-libhal)
+      WITH_LIBHAL=0
       ;;
     --disable-kmods)
@@ -2051 +2081 @@
   else
     cnf_append "VBOX_WITH_PULSE" ""
+  fi
+  if [ $WITH_LIBHAL -eq 1 ]; then
+    check_libhal
+  else
+    cnf_append "VBOX_WITH_LIBHAL" ""
   fi
   check_compiler_h

trunk/src/VBox/Devices/Makefile.kmk

@@ -861 +861 @@
         USB/darwin/USBProxyDevice-darwin.cpp
 
- Drivers_DEFS.linux   += VUSB_HAVE_USBPROXY_DEVICE
- ifdef VBOX_WITHOUT_LINUX_COMPILER_H
-  Drivers_DEFS.linux  += VBOX_WITHOUT_LINUX_COMPILER_H
- endif
- Drivers_SOURCES.linux+= \
+ Drivers_DEFS.linux    += \
+        VUSB_HAVE_USBPROXY_DEVICE \
+        $(if $(VBOX_WITHOUT_LINUX_COMPILER_H),VBOX_WITHOUT_LINUX_COMPILER_H,) \
+        $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,)
+ Drivers_SOURCES.linux += \
         USB/USBProxyDevice.cpp \
         USB/linux/USBProxyDevice-linux.cpp

trunk/src/VBox/Main/Makefile.kmk

@@ -197 +197 @@
         $(if $(VBOX_WITHOUT_LINUX_COMPILER_H),VBOX_WITHOUT_LINUX_COMPILER_H,) \
         $(if $(VBOX_WITH_RESOURCE_USAGE_API),VBOX_WITH_RESOURCE_USAGE_API,) \
-        $(if $(VBOX_WITH_PDM_ASYNC_COMPLETION),VBOX_WITH_PDM_ASYNC_COMPLETION,)
+        $(if $(VBOX_WITH_PDM_ASYNC_COMPLETION),VBOX_WITH_PDM_ASYNC_COMPLETION,) \
+        $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,)
 
 ifdef VBOX_WITH_USB
@@ -210 +211 @@
 VBoxSVC_DEFS.win.x86 += _WIN32_WINNT=0x0500
 VBoxSVC_DEFS.win.amd64 += _WIN32_WINNT=0x0510
-VBoxSVC_DEFS.linux += VBOX_USE_LIBHAL
-VBoxSVC_DEFS.solaris += VBOX_USE_LIBHAL
+# VBoxSVC_DEFS.linux += VBOX_USE_LIBHAL
+# VBoxSVC_DEFS.solaris += VBOX_USE_LIBHAL
 ifdef VBOX_SOLARIS_NSL_RESOLVED
  VBoxSVC_DEFS.solaris += VBOX_SOLARIS_NSL_RESOLVED
@@ -343 +344 @@
 endif
 
+# libhal stuff for USB
+VBoxSVC_CFLAGS   += $(if $(VBOX_WITH_LIBHAL),$(VBOX_LIBHAL_CFLAGS),)
+VBoxSVC_CXXFLAGS += $(if $(VBOX_WITH_LIBHAL),$(VBOX_LIBHAL_CXXFLAGS),)
+VBoxSVC_LDFLAGS  += $(if $(VBOX_WITH_LIBHAL),$(VBOX_LIBHAL_LDFLAGS),)
+
 win/VBoxSVC.rc_INCS  = $(PATH_VBoxSVC)
 win/VBoxSVC.rc_DEPS  = $(PATH_VBoxSVC)/VBoxSVC.rgs $(PATH_VBoxSVC)/VBoxSVC-icon.rc

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

@@ -28 +28 @@
 ifndef VBOX_ONLY_SDK
  if defined(VBOX_WITH_TESTCASES) || "$(USERNAME)" == "dmik"
-  PROGRAMS       += tstAPI
-  ifdef VBOX_WITH_XPCOM
-   PROGRAMS      += tstVBoxAPILinux
-  else
-   PROGRAMS      += tstVBoxAPIWin
-  endif
-  ifdef VBOX_WITH_RESOURCE_USAGE_API
-   PROGRAMS      += tstCollector
-  endif
+  PROGRAMS       += \
+        tstAPI \
+        $(if $(VBOX_WITH_XPCOM),tstVBoxAPILinux,tstVBoxAPIWin) \
+        $(if $(VBOX_WITH_RESOURCE_USAGE_API),tstCollector,)
+  PROGRAMS.linux += \
+        $(if $(VBOX_OSE),,$(if $(VBOX_USB_WITH_SYSFS),tstUSBLinux,))
  endif # !VBOX_WITH_TESTCASES
 endif # !VBOX_ONLY_SDK
@@ -121 +118 @@
 
 
+
+#
+# tstUSBLinux
+#
+tstUSBLinux_TEMPLATE  = VBOXR3TSTEXE
+tstUSBLinux_SOURCES   = \
+        tstUSBLinux.cpp \
+        ../linux/USBProxyServiceLinux.cpp
+tstUSBLinux_INCS      = . ../include
+tstUSBLinux_DEFS      = \
+        VBOX_TEST_USB_LINUX \
+        $(if $(VBOX_WITHOUT_LINUX_COMPILER_H),VBOX_WITHOUT_LINUX_COMPILER_H,) \
+        $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,)
+tstUSBLinux_LIBS     += $(PATH_OUT)/lib/USBLib.a
+VBOX_LIBHAL_LDFLAGS  ?= $(shell pkg-config hal --libs)
+tstUSBLinux_CFLAGS   += $(if $(VBOX_WITH_LIBHAL),$(VBOX_LIBHAL_CFLAGS),)
+tstUSBLinux_CXXFLAGS += $(if $(VBOX_WITH_LIBHAL),$(VBOX_LIBHAL_CXXFLAGS),)
+tstUSBLinux_LDFLAGS  += $(if $(VBOX_WITH_LIBHAL),$(VBOX_LIBHAL_LDFLAGS),)
+
+
 # generate rules.
 include $(KBUILD_PATH)/subfooter.kmk