Changeset 1345 in vbox for trunk/src

Timestamp:

Mar 8, 2007 9:21:41 PM (18 years ago)

Author:

vboxsync

Message:

VBOX_WITH_INTERNAL_NETWORKING. disabled for L4 and Darwin.

Location:

trunk/src/VBox

Files:

• Devices/Builtins.cpp (modified) (3 diffs)
• Devices/Makefile (modified) (1 diff)
• VMM/Makefile (modified) (1 diff)
• VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -31 +31 @@
 
 #include <VBox/log.h>
+#include <VBox/config.h>
 #include <iprt/assert.h>
 
@@ -102 +103 @@
     if (VBOX_FAILURE(rc))
         return rc;
-#if 0 /** @todo remove this, see #1407. */
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceUSBBackend);
-    if (VBOX_FAILURE(rc))
-        return rc;
-#endif
 #if defined(VBOX_WITH_USB) && (defined(__WIN__) || defined(__LINUX__) || defined(__L4ENV__))
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceOHCI);
@@ -185 +181 @@
         return rc;
 #endif
-#if !defined(__DARWIN__) && !defined(__OS2__)
+#ifdef VBOX_WITH_INTERNAL_NETWORKING
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostInterface);
     if (VBOX_FAILURE(rc))

trunk/src/VBox/Devices/Makefile

@@ -50 +50 @@
 ifdef VBOX_WITH_VRDP
 DEFS += VBOX_VRDP
+endif
+ifdef VBOX_WITH_INTERNAL_NETWORKING
+DEFS += VBOX_WITH_INTERNAL_NETWORKING
 endif
 

trunk/src/VBox/VMM/Makefile

@@ -37 +37 @@
 # Enable the PDM lock.
 #DEFS += VBOX_WITH_PDM_LOCK
+ifdef VBOX_WITH_INTERNAL_NETWORKING
+DEFS += VBOX_WITH_INTERNAL_NETWORKING
+endif
 
 

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -581 +581 @@
         }
 
-#if !defined(__L4__) && !defined(__AMD64__) /** @todo Port this to L4. */ /** @todo fix logging and other services problems on AMD64. */
+#ifdef VBOX_WITH_INTERNAL_NETWORKING
         /*
          * Services.
@@ -651 +651 @@
             }
         }
-#endif /* !__L4__ */
+#endif /* VBOX_WITH_INTERNAL_NETWORKING */
 
         /*