Changeset 52249 in vbox

Timestamp:

Jul 31, 2014 7:40:11 PM (11 years ago)

Author:

vboxsync

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

95332

Message:

USB: Initial xHCI device commit (WIP).

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (5 diffs)
• build/VBoxDD.cpp (modified) (1 diff)
• build/VBoxDD.h (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -68 +68 @@
   if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
    VBoxDDU_DEFS          += VBOX_WITH_EHCI_IMPL
+  endif
+  if defined(VBOX_WITH_XHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+   VBoxDDU_DEFS          += VBOX_WITH_XHCI_IMPL
   endif
   ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
@@ -322 +325 @@
   endif
 
+  if defined(VBOX_WITH_XHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+   VBoxDD_DEFS          += VBOX_WITH_XHCI_IMPL
+   VBoxDD_SOURCES       += \
+        USB/DevXHCI.cpp
+  endif
+
   if defined(VBOX_WITH_USB_VIDEO_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
    if1of ($(KBUILD_TARGET), linux)
@@ -937 +946 @@
     VBoxDDGC_SOURCES    += \
         USB/DevEHCI.cpp
+   endif
+   if defined(VBOX_WITH_XHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+    VBoxDDGC_DEFS       += VBOX_WITH_XHCI_IMPL
+    VBoxDDGC_SOURCES    += \
+        USB/DevXHCI.cpp
    endif
   endif
@@ -1103 +1117 @@
         USB/DevEHCI.cpp
   endif
+  if defined(VBOX_WITH_XHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
+   VBoxDDR0_DEFS        += VBOX_WITH_XHCI_IMPL
+   VBoxDDR0_SOURCES     += \
+        USB/DevXHCI.cpp
+  endif
  endif
 
@@ -1275 +1294 @@
   DLLS += VBoxEhciR3
   VBoxEhciR3_TEMPLATE = VBoxR3ExtPackPuel
-  VBoxEhciR3_SOURCES  = USB/DevEHCI.cpp
+  VBoxEhciR3_SOURCES  = \
+        USB/DevEHCI.cpp \
+        USB/DevXHCI.cpp
 
   SYSMODS += VBoxEhciR0
   VBoxEhciR0_TEMPLATE = VBoxR0ExtPackPuel
-  VBoxEhciR0_SOURCES  = USB/DevEHCI.cpp
+  VBoxEhciR0_SOURCES  = \
+        USB/DevEHCI.cpp \
+        USB/DevXHCI.cpp
 
   ifdef VBOX_WITH_RAW_MODE
    SYSMODS += VBoxEhciRC
    VBoxEhciRC_TEMPLATE = VBoxRcExtPackPuel
-   VBoxEhciRC_SOURCES  = USB/DevEHCI.cpp
+   VBoxEhciRC_SOURCES  = \
+        USB/DevEHCI.cpp \
+        USB/DevXHCI.cpp
   endif
  endif

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

@@ -146 +146 @@
         return rc;
 #endif
+#ifdef VBOX_WITH_XHCI_IMPL
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceXHCI);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
 #ifdef VBOX_ACPI
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceACPI);

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

@@ -61 +61 @@
 extern const PDMDEVREG g_DeviceOHCI;
 extern const PDMDEVREG g_DeviceEHCI;
+extern const PDMDEVREG g_DeviceXHCI;
 extern const PDMDEVREG g_DeviceACPI;
 extern const PDMDEVREG g_DeviceDMA;