Changeset 22456 in vbox

Timestamp:

Aug 26, 2009 8:39:33 AM (15 years ago)

Author:

vboxsync

Message:

ConsoleImpl.cpp: missing defined() around RT_OS_FREEBSD in the #elif, added @todos about moving the TAP init code out of Main to where it belongs (DrvTAP).

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (10 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -22 +22 @@
  */
 
+/** @todo Move the TAP mess back into the driver! */
 #if defined(RT_OS_WINDOWS)
 #elif defined(RT_OS_LINUX)
@@ -6047 +6048 @@
 
 #endif /* VBOX_WITH_USB */
-
+#if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT)
 
 /**
@@ -6056 +6057 @@
  *
  *  @note The caller must lock this object for writing.
+ *
+ *  @todo Move this back into the driver!
  */
-#if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT)
 HRESULT Console::attachToTapInterface(INetworkAdapter *networkAdapter)
 {
@@ -6077 +6079 @@
     AssertComRC(rc);
 
-#ifdef RT_OS_LINUX
+# ifdef RT_OS_LINUX
     /*
      * Allocate a host interface device
@@ -6159 +6161 @@
         }
     }
-#elif RT_OS_FREEBSD
+
+# elif defined(RT_OS_FREEBSD)
     /*
      * Set/obtain the tap interface.
@@ -6199 +6202 @@
         }
     }
-#endif /* RT_OS_FREEBSD */
+# else
+#  error "huh?"
+# endif
     /* in case of failure, cleanup. */
     if (VBOX_FAILURE(rcVBox) && SUCCEEDED(rc))
@@ -6218 +6223 @@
  *
  *  @note The caller must lock this object for writing.
+ *
+ *  @todo Move this back into the driver!
  */
 HRESULT Console::detachFromTapInterface(INetworkAdapter *networkAdapter)
@@ -6270 +6277 @@
     return rc;
 }
+
 #endif /* (RT_OS_LINUX || RT_OS_FREEBSD) && !VBOX_WITH_NETFLT */
-
 
 /**
@@ -7577 +7584 @@
     if (!CFGMR3AreValuesValid(pCfgHandle, "papLeds\0First\0Last\0"))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
-    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER, 
+    AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER,
                     ("Configuration error: Not possible to attach anything to this driver!\n"),
                     VERR_PDM_DRVINS_NO_ATTACH);
@@ -7674 +7681 @@
     NULL,
     /* pfnDetach */
-    NULL, 
+    NULL,
     /* pfnPowerOff */
-    NULL, 
+    NULL,
     /* pfnSoftReset */
     NULL,