Changeset 8251 in vbox

Timestamp:

Apr 21, 2008 7:05:24 PM (17 years ago)

Author:

vboxsync

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

29991

Message:

USBLib goes into VBoxDDU.

Location:

trunk

Files:

• include/VBox/usblib.h (modified) (6 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/VBoxDDUDeps.cpp (modified) (2 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)

trunk/include/VBox/usblib.h

@@ -47 +47 @@
 /** @todo merge the usblib-win.h interface into the darwin and linux ports where suitable. */
 
+__BEGIN_DECLS
 /** @defgroup grp_USBLib    USBLib - USB Support Library
  * This module implements the basic low-level OS interfaces and common USB code.
@@ -67 +68 @@
  *          this function at the same time (because I'm lazy).
  */
-int USBLibInit(void);
+USBLIB_DECL(int) USBLibInit(void);
 
 /**
@@ -76 +77 @@
  * @returns VBox status code.
  */
-int USBLibTerm(void);
+USBLIB_DECL(int) USBLibTerm(void);
 
 /**
@@ -95 +96 @@
  * @param   pFilter     The filter to add.
  */
-void *USBLibAddFilter(PCUSBFILTER pFilter);
+USBLIB_DECL(void *) USBLibAddFilter(PCUSBFILTER pFilter);
 
 /**
@@ -102 +103 @@
  * @param   pvId        The ID returned by USBLibAddFilter.
  */
-void USBLibRemoveFilter(void *pvId);
+USBLIB_DECL(void) USBLibRemoveFilter(void *pvId);
 
 #endif /* IN_RING3 */
@@ -108 +109 @@
 
 /** @} */
+__END_DECLS
+
 #endif
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -70 +70 @@
  ifdef VBOX_WITH_EHCI
   VBoxDDU_DEFS          += VBOX_WITH_EHCI
+ endif
+ ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
+  VBoxDDU_DEFS.darwin   += VBOX_WITH_NEW_USB_CODE_ON_DARWIN
  endif
 else
@@ -102 +105 @@
 endif
 VBoxDDU_LDFLAGS.darwin   = -install_name @executable_path/VBoxDDU.dylib
+ifdef VBOX_WITH_USB
+ ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
+ VBoxDDU_LDFLAGS.darwin += -framework IOKit
+ endif
+endif
+
 VBoxDDU_LDFLAGS.linux    = -Wl,--no-undefined
 VBoxDDU_LDFLAGS.l4       = -Wl,--no-undefined

trunk/src/VBox/Devices/VBoxDDUDeps.cpp

@@ -25 +25 @@
 #include <VBox/types.h>
 #ifdef VBOX_WITH_USB
+# include <VBox/usblib.h>
 # include <VBox/usbfilter.h>
 # ifdef RT_OS_OS2
@@ -41 +42 @@
 # ifdef RT_OS_OS2
     (PFNRT)UsbOpen,
-# endif 
-#endif
+# endif
+# if (defined(RT_OS_DARWIN) && defined(VBOX_WITH_NEW_USB_CODE_ON_DARWIN))
+  /** @todo || defined(RT_OS_SOLARIS) */
+    (PFNRT)USBLibInit,
+# endif
+#endif /* VBOX_WITH_USB */
     NULL
 };

trunk/src/VBox/Main/Makefile.kmk

@@ -176 +176 @@
         $(LIB_DDU) \
         $(LIB_SETTINGS)
-ifdef VBOX_WITH_USB
- VBoxSVC_LIBS += \
-        $(PATH_LIB)/USBLib$(VBOX_SUFF_LIB)
-endif
 VBoxSVC_LIBS.darwin = \
         $(LIB_VMM) \