Changeset 14711 in vbox for trunk/src/VBox/Main

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (3 diffs)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstUSBLinux.cpp (added)
• testcase/tstUSBLinux.h (added)

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