Changeset 37752 in vbox for trunk

Timestamp:

Jul 4, 2011 10:02:23 AM (13 years ago)

Author:

vboxsync

Message:

fix USB 2.0 for OSE builds

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Devices/Makefile.kmk (modified) (5 diffs)
• src/VBox/Devices/build/VBoxDD.cpp (modified) (1 diff)
• src/VBox/Devices/testcase/Makefile.kmk (modified) (1 diff)
• src/VBox/Devices/testcase/tstDeviceStructSize.cpp (modified) (2 diffs)
• src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp (modified) (3 diffs)

trunk/Config.kmk

@@ -409 +409 @@
 ifdef VBOX_WITH_USB
  VBOX_WITH_VUSB = 1
+endif
+ifdef VBOX_WITH_EHCI
+ VBOX_WITH_EHCI_IMPL = 1
 endif
 # Enable the hal/sysfs USB code on Linux.
@@ -921 +924 @@
 ifdef VBOX_OSE
  VBOX_WITH_VRDP=
- VBOX_WITH_EHCI=
+ VBOX_WITH_EHCI_IMPL=
  VBOX_WITH_EXTPACK_PUEL=
  VBOX_WITH_PCI_PASSTHROUGH=

trunk/src/VBox/Devices/Makefile.kmk

@@ -58 +58 @@
   VBoxDDU_DEFS           += VBOX_WITH_USB IN_USBLIB
   VBoxDDU_SDKS.win        = WINPSDK W2K3DDK
-  if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL)
-   VBoxDDU_DEFS          += VBOX_WITH_EHCI
+  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+   VBoxDDU_DEFS          += VBOX_WITH_EHCI_IMPL
   endif
   ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
@@ -123 +123 @@
  ifdef VBOX_WITH_USB
   VBoxDD_DEFS           += VBOX_WITH_USB
-  if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL)
-   VBoxDD_DEFS          += VBOX_WITH_EHCI
+  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+   VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
   endif
  endif
@@ -449 +449 @@
  ifdef VBOX_WITH_USB
   DevicesR3_DEFS        += VBOX_WITH_USB
-  if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL)
-   DevicesR3_DEFS       += VBOX_WITH_EHCI
+  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+   DevicesR3_DEFS       += VBOX_WITH_EHCI_IMPL
    DevicesR3_SOURCES    += \
         USB/DevEHCI.cpp
@@ -604 +604 @@
   ifdef VBOX_WITH_USB
    VBoxDDGC_DEFS        += VBOX_WITH_USB
-   if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL)
-    VBoxDDGC_DEFS       += VBOX_WITH_EHCI
+   if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+    VBoxDDGC_DEFS       += VBOX_WITH_EHCI_IMPL
     VBoxDDGC_SOURCES    += \
         USB/DevEHCI.cpp
@@ -709 +709 @@
  ifdef VBOX_WITH_USB
  VBoxDDR0_DEFS          += VBOX_WITH_USB
-  if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_EXTPACK_PUEL)
-   VBoxDDR0_DEFS        += VBOX_WITH_EHCI
+  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+   VBoxDDR0_DEFS        += VBOX_WITH_EHCI_IMPL
    VBoxDDR0_SOURCES     += \
         USB/DevEHCI.cpp

trunk/src/VBox/Devices/build/VBoxDD.cpp

@@ -133 +133 @@
         return rc;
 #endif
-#ifdef VBOX_WITH_EHCI
+#ifdef VBOX_WITH_EHCI_IMPL
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEHCI);
     if (RT_FAILURE(rc))

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

@@ -29 +29 @@
         $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,) \
         $(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \
-        $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,) \
+        $(if $(VBOX_WITH_EHCI_IMPL),VBOX_WITH_EHCI_IMPL,) \
         $(if $(VBOX_WITH_AHCI),VBOX_WITH_AHCI,) \
         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \

trunk/src/VBox/Devices/testcase/tstDeviceStructSize.cpp

@@ -68 +68 @@
 # undef LOG_GROUP
 # include "../USB/DevOHCI.cpp"
-# ifdef VBOX_WITH_EHCI
+# ifdef VBOX_WITH_EHCI_IMPL
 #  include "../USB/DevEHCI.cpp"
 # endif
@@ -285 +285 @@
     //CHECK_MEMBER_ALIGNMENT(E1KSTATE, csTx, 8);
 #ifdef VBOX_WITH_USB
-# ifdef VBOX_WITH_EHCI
+# ifdef VBOX_WITH_EHCI_IMPL
     CHECK_MEMBER_ALIGNMENT(EHCI, RootHub, 8);
 #  ifdef VBOX_WITH_STATISTICS

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -63 +63 @@
 # undef LOG_GROUP
 # include "../USB/DevOHCI.cpp"
-# ifdef VBOX_WITH_EHCI
+# ifdef VBOX_WITH_EHCI_IMPL
 #  include "../USB/DevEHCI.cpp"
 # endif
@@ -929 +929 @@
     GEN_CHECK_OFF(OHCI, StatTimer);
 # endif
-# ifdef VBOX_WITH_EHCI
+# ifdef VBOX_WITH_EHCI_IMPL
     /* USB/DevEHCI.cpp */
     GEN_CHECK_SIZE(EHCIHUBPORT);
@@ -1006 +1006 @@
     GEN_CHECK_OFF(EHCI, pEOFTimerNoSyncR3);
     GEN_CHECK_OFF(EHCI, pEOFTimerNoSyncR0);
-# endif /* VBOX_WITH_EHCI */
+# endif /* VBOX_WITH_EHCI_IMPL */
 #endif /* VBOX_WITH_USB */