Changeset 33352 in vbox

Timestamp:

Oct 22, 2010 1:18:58 PM (14 years ago)

Author:

vboxsync

Message:

Some sketches from last night.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (7 diffs)

trunk/Config.kmk

@@ -3431 +3431 @@
 
 
+
+#
+# Templates used for building the add-ons.
+#
+TEMPLATE_VBoxR3AddOn = For the ring-3 context addons.
+TEMPLATE_VBoxR3AddOn_EXTENDS = VBOXR3
+ifeq ($(KBUILD_TARGET),win)
+else
+ TEMPLATE_VBoxR3AddOn_CXXFLAGS = $(filter-out $(TEMPLATE_VBOX_CXXFLAGS), -fexceptions) -fno-exceptions
+ TEMPLATE_VBoxR3AddOn_CFLAGS   = $(filter-out $(TEMPLATE_VBOX_CFLAGS), -fexceptions -frtti) -fno-exceptions -fno-rtti
+endif
+TEMPLATE_VBoxR3AddOn_LIBS = \
+        $(TEMPLATE_LIBS_VBOXR3) \
+        $(LIB_RUNTIME) \
+        $(LIB_VMM)
+
+TEMPLATE_VBoxR0AddOn = For the ring-0 context addons.
+TEMPLATE_VBoxR0AddOn_EXTENDS = VBoxR0
+
+TEMPLATE_VBoxRcAddOn = For the raw-mode context addons.
+TEMPLATE_VBoxRcAddOn_EXTENDS = VBoxRc
+
+
+
 #
 # Qt 4

trunk/src/VBox/Devices/Makefile.kmk

@@ -67 +67 @@
  VBoxDDU_DEFS           += VBOX_WITH_USB IN_USBLIB
  VBoxDDU_SDKS.win        = WINPSDK W2K3DDK
- ifdef VBOX_WITH_EHCI
+ if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_ADDONS)
   VBoxDDU_DEFS          += VBOX_WITH_EHCI
  endif
@@ -136 +136 @@
 ifdef VBOX_WITH_USB
  VBoxDD_DEFS           += VBOX_WITH_USB
- ifdef VBOX_WITH_EHCI
+ if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_ADDONS)
   VBoxDD_DEFS          += VBOX_WITH_EHCI
  endif
@@ -452 +452 @@
 ifdef VBOX_WITH_USB
  DevicesR3_DEFS        += VBOX_WITH_USB
- ifdef VBOX_WITH_EHCI
+ if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_ADDONS)
   DevicesR3_DEFS       += VBOX_WITH_EHCI
   DevicesR3_SOURCES    += \
@@ -610 +610 @@
 
  ifdef VBOX_WITH_USB
- VBoxDDGC_DEFS         += VBOX_WITH_USB
-  ifdef VBOX_WITH_EHCI
+  VBoxDDGC_DEFS        += VBOX_WITH_USB
+  if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_ADDONS)
    VBoxDDGC_DEFS       += VBOX_WITH_EHCI
    VBoxDDGC_SOURCES    += \
@@ -630 +630 @@
   VBoxDDGC_DEFS        += VBOX_WITH_CRHGSMI
  endif
- 
+
  ifdef VBOXWDDM_WITH_VBVA
   VBoxDDGC_DEFS         += VBOXWDDM_WITH_VBVA
@@ -737 +737 @@
 ifdef VBOX_WITH_USB
 VBoxDDR0_DEFS          += VBOX_WITH_USB
- ifdef VBOX_WITH_EHCI
+ if defined(VBOX_WITH_EHCI) && !defined(VBOX_WITH_ADDONS)
   VBoxDDR0_DEFS        += VBOX_WITH_EHCI
   VBoxDDR0_SOURCES     += \
@@ -1190 +1190 @@
 
 #
+# The EHCI (USB 2.0) Add-On Modules.
+#
+if defined(VBOX_WITH_USB) && defined(VBOX_WITH_ADDONS)
+ DLLS += VBoxEhciR3
+ VBoxEhciR3_TEMPLATE = VBoxR3AddOn
+ VBoxEhciR3_SOURCES  = USB/DevEHCI.cpp
+
+ SYSMODS += VBoxEhciR0
+ VBoxEhciR0_TEMPLATE = VBoxR0AddOn
+ VBoxEhciR0_SOURCES  = USB/DevEHCI.cpp
+
+ ifdef VBOX_WITH_RAW_MODE
+  SYSMODS += VBoxEhciRC
+  VBoxEhciRC_TEMPLATE = VBoxRcAddOn
+  VBoxEhciRC_SOURCES  = USB/DevEHCI.cpp
+ endif
+endif # VBOX_WITH_USB && VBOX_WITH_ADDONS
+
+
+#
 # Internal Networking - Ring-3 Testcase for the Ring-0 code (a bit hackish).
 #