Changeset 18068 in vbox for trunk/src/VBox

Timestamp:

Mar 18, 2009 2:42:47 PM (16 years ago)

Author:

vboxsync

Message:

remove tap for non-linux platforms

Location:

trunk/src/VBox

Files:

• Devices/Builtins.cpp (modified) (1 diff)
• Devices/Builtins.h (modified) (1 diff)
• Devices/Makefile.kmk (modified) (4 diffs)
• Devices/Network/DrvTAPOs2.cpp (deleted)
• Devices/Network/DrvTAPOs2.h (deleted)
• Devices/Network/DrvTAPWin.cpp (deleted)
• Main/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Builtins.cpp

@@ -225 +225 @@
         return rc;
 #endif
-#if defined(RT_OS_L4) || defined(RT_OS_LINUX) || defined(RT_OS_OS2) || (defined(RT_OS_SOLARIS) && !defined(RT_OS_SOLARIS_10)) || defined(RT_OS_WINDOWS)
+#if defined(RT_OS_LINUX)
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostInterface);
     if (RT_FAILURE(rc))

trunk/src/VBox/Devices/Builtins.h

@@ -94 +94 @@
 extern const PDMDRVREG g_DrvISCSI;
 extern const PDMDRVREG g_DrvISCSITransportTcp;
+#ifdef RT_OS_LINUX
 extern const PDMDRVREG g_DrvHostInterface;
+#endif
 extern const PDMDRVREG g_DrvIntNet;
 extern const PDMDRVREG g_DrvNAT;

trunk/src/VBox/Devices/Makefile.kmk

@@ -727 +727 @@
 
 Drivers_SOURCES.l4    = \
-        Network/DrvTAP.cpp \
         Audio/ossaudio.c
 endif # l4
@@ -741 +740 @@
         Storage/DrvHost% \
         , $(Drivers_SOURCES))
-Drivers_SOURCES.os2   = \
-        Network/DrvTAPOs2.cpp
 endif
 
@@ -751 +748 @@
 Drivers_SOURCES.solaris = \
         Audio/solaudio.c \
-        $(if $(VBOX_SOLARIS_10),,Network/DrvTAP.cpp) \
         Storage/DrvHostBase.cpp \
         Storage/DrvHostDVD.cpp \
@@ -765 +761 @@
 
 Drivers_SOURCES.win   = \
-        Network/DrvTAPWin.cpp \
         Audio/dsoundaudio.c \
         Serial/DrvHostSerial.cpp

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1651 +1651 @@
                     else
                     {
-# ifndef VBOX_WITH_NETFLT
-                        rc = CFGMR3InsertString(pLunL0, "Driver", "HostInterface");                     RC_CHECK();
-                        rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg);                                 RC_CHECK();
-                        rc = CFGMR3InsertString(pCfg, "HostInterfaceName", Utf8Str(hostInterfaceName)); RC_CHECK();
-# else
+# ifdef VBOX_WITH_NETFLT
                         rc = CFGMR3InsertString(pLunL0, "Driver", "IntNet");                            RC_CHECK();
                         rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg);                                 RC_CHECK();
@@ -1837 +1833 @@
                     hrc = hostInterface->EnableStaticIpConfig(Bstr(VBOXNET_IPV4ADDR_DEFAULT),
                                                               Bstr(VBOXNET_IPV4MASK_DEFAULT));
-                
-                
+
+
                 hrc = virtualBox->GetExtraData(Bstr("HostOnly/vboxnet0/IPV6Address"), tmpAddr.asOutParam());
                 if (SUCCEEDED(hrc))
@@ -1844 +1840 @@
                 if (SUCCEEDED(hrc) && !tmpAddr.isEmpty())
                     hrc = hostInterface->EnableStaticIpConfigV6(tmpAddr, Utf8Str(tmpMask).toUInt32());
-#endif 
+#endif
                 break;
             }