Changeset 7850 in vbox

Timestamp:

Apr 9, 2008 4:46:16 PM (17 years ago)

Author:

vboxsync

Message:

Enabled VBOX_WITH_USBFILTER for darwin.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (3 diffs)
• include/USBProxyService.h (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -120 +120 @@
 endif
 ifdef VBOX_WITH_USB
-VBoxSVC_DEFS += VBOX_WITH_USB
-ifdef VBOX_WITH_EHCI
+VBoxSVC_DEFS += VBOX_WITH_USB VBOX_WITH_USBFILTER
+ ifdef VBOX_WITH_EHCI
 VBoxSVC_DEFS += VBOX_WITH_EHCI
-endif
+ endif
 endif
 ifdef VBOX_WITH_ALSA
@@ -164 +164 @@
         $(LIB_DDU) \
         $(LIB_SETTINGS)
+ifdef VBOX_WITH_USB
+ VBoxSVC_LIBS += \
+        $(PATH_LIB)/USBLib$(VBOX_SUFF_LIB)
+endif
 VBoxSVC_LIBS.darwin = \
         $(LIB_VMM) \
@@ -234 +238 @@
 VBoxSVC_SOURCES.solaris += solaris/USBProxyServiceSolaris.cpp
 VBoxSVC_SOURCES.win     +=   win32/USBProxyServiceWin32.cpp
- ifn1of (darwin, $(BUILD_TARGET))
-VBoxSVC_DEFS += VBOX_WITH_USBFILTER
-VBoxSVC_LIBS += $(PATH_LIB)/USBLib$(VBOX_SUFF_LIB)
- endif
-endif
-
-VBoxSVC_LDFLAGS.darwin = -framework IOKit
+endif
+
+VBoxSVC_LDFLAGS.darwin  = -framework IOKit
 ifeq ($(BUILD_TYPE),debug)
-VBoxSVC_LDFLAGS.linux += -rdynamic # for backtrace_symbols()
-endif
-
-win32/VBoxSVC.rc_DEPS = $(PATH_TARGET)/VBoxSVC.rgs
+VBoxSVC_LDFLAGS.linux  += -rdynamic # for backtrace_symbols()
+endif
+
+win32/VBoxSVC.rc_DEPS   = $(PATH_TARGET)/VBoxSVC.rgs
 
 

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

@@ -270 +270 @@
     ~USBProxyServiceDarwin();
 
-#ifdef VBOX_WITH_USBFILTER
+#ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
     virtual void *insertFilter (PCUSBFILTER aFilter);
     virtual void removeFilter (void *aId);
@@ -296 +296 @@
      * not including newly attached devices. */
     bool mWaitABitNextTime;
-#ifndef VBOX_WITH_USBFILTER
+#ifndef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
     /** Whether we've got a fake async event and should return without entering the runloop. */
     bool volatile mFakeAsync;