Changeset 1569 in vbox

Timestamp:

Mar 20, 2007 4:38:10 AM (18 years ago)

Author:

vboxsync

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

19670

Message:

Moved win32 usbLib code to VBoxDDU.dll.

Location:

trunk

Files:

• include/VBox/usblib.h (modified) (4 diffs)
• src/VBox/Devices/Makefile (modified) (2 diffs)

trunk/include/VBox/usblib.h

@@ -199 +199 @@
  */
 
-/*
+/**
  * Initialize the USB library
  *
  * @returns VBox status code.
  */
-USBR3DECL(int) usbLibInit();
-
-/*
+VBOXDDU_DECL(int) usbLibInit();
+
+/**
  * Terminate the USB library
  *
  * @returns VBox status code.
  */
-USBR3DECL(int) usbLibTerm();
-
-/*
+VBOXDDU_DECL(int) usbLibTerm();
+
+/**
  * Add USB device filter
  *
@@ -222 +222 @@
  * @param   ppID            Pointer to filter id
  */
-USBR3DECL(int) usbLibInsertFilter(const char *pszVendor, const char *pszProduct, const char *pszRevision, void **ppID);
-
-/*
+VBOXDDU_DECL(int) usbLibInsertFilter(const char *pszVendor, const char *pszProduct, const char *pszRevision, void **ppID);
+
+/**
  * Remove USB device filter
  *
@@ -230 +230 @@
  * @param   aID             Filter id
  */
-USBR3DECL(int) usbLibRemoveFilter (void *aID);
-
-/*
+VBOXDDU_DECL(int) usbLibRemoveFilter (void *aID);
+
+/**
  * Return all attached USB devices.
  *
@@ -239 +239 @@
  * @param pcbNumDevices     Number of USB devices in the list
  */
-USBR3DECL(int) usbLibGetDevices(PUSBDEVICE *ppDevices,  uint32_t *pcbNumDevices);
-
-/*
+VBOXDDU_DECL(int) usbLibGetDevices(PUSBDEVICE *ppDevices,  uint32_t *pcbNumDevices);
+
+/**
  * Check for USB device arrivals or removals
  *
  * @returns boolean
  */
-USBR3DECL(bool) usbLibHasPendingDeviceChanges();
+VBOXDDU_DECL(bool) usbLibHasPendingDeviceChanges();
 
 /** @} */

trunk/src/VBox/Devices/Makefile

@@ -63 +63 @@
 #
 VBoxDDU_TEMPLATE         = VBOXR3
-VBoxDDU_SDKS.win         = WINPSDK
 VBoxDDU_DEFS             = IN_VBOXDDU
+ifdef VBOX_WITH_USB
+ VBoxDDU_DEFS.win        = VBOX_WITH_USB
+ VBoxDDU_SDKS.win        = WINPSDK W2K3DDK
+ VBoxDDU_SOURCES.win     = \
+        USB/win32/USBLib-win32.cpp
+else
+ VBoxDDU_SDKS.win         = WINPSDK
+endif
 VBoxDDU_SOURCES          = \
         Storage/VDICore.cpp
 #       Storage/VmdkHDDCore.cpp
 VBoxDDU_LIBS             = \
-        $(PATH_LIB)/DevicesR3$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/Drivers$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/PcDefBiosLogo$(VBOX_SUFF_LIB) \
         $(LIB_RUNTIME)
 ifeq ($(BUILD_TARGET),l4)
@@ -473 +477 @@
  Drivers_SOURCES.win  += \
         USB/USBProxyDevice.cpp \
-        USB/win32/USBProxyDevice-win32.cpp \
-        USB/win32/USBLib-win32.cpp
+        USB/win32/USBProxyDevice-win32.cpp
 endif # VBOX_WITH_USB