Changeset 22456 in vbox for trunk/src/VBox/Main
- Timestamp:
- Aug 26, 2009 8:39:33 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/ConsoleImpl.cpp
r22455 r22456 22 22 */ 23 23 24 /** @todo Move the TAP mess back into the driver! */ 24 25 #if defined(RT_OS_WINDOWS) 25 26 #elif defined(RT_OS_LINUX) … … 6047 6048 6048 6049 #endif /* VBOX_WITH_USB */ 6049 6050 #if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT) 6050 6051 6051 6052 /** … … 6056 6057 * 6057 6058 * @note The caller must lock this object for writing. 6059 * 6060 * @todo Move this back into the driver! 6058 6061 */ 6059 #if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT)6060 6062 HRESULT Console::attachToTapInterface(INetworkAdapter *networkAdapter) 6061 6063 { … … 6077 6079 AssertComRC(rc); 6078 6080 6079 # ifdef RT_OS_LINUX6081 # ifdef RT_OS_LINUX 6080 6082 /* 6081 6083 * Allocate a host interface device … … 6159 6161 } 6160 6162 } 6161 #elif RT_OS_FREEBSD 6163 6164 # elif defined(RT_OS_FREEBSD) 6162 6165 /* 6163 6166 * Set/obtain the tap interface. … … 6199 6202 } 6200 6203 } 6201 #endif /* RT_OS_FREEBSD */ 6204 # else 6205 # error "huh?" 6206 # endif 6202 6207 /* in case of failure, cleanup. */ 6203 6208 if (VBOX_FAILURE(rcVBox) && SUCCEEDED(rc)) … … 6218 6223 * 6219 6224 * @note The caller must lock this object for writing. 6225 * 6226 * @todo Move this back into the driver! 6220 6227 */ 6221 6228 HRESULT Console::detachFromTapInterface(INetworkAdapter *networkAdapter) … … 6270 6277 return rc; 6271 6278 } 6279 6272 6280 #endif /* (RT_OS_LINUX || RT_OS_FREEBSD) && !VBOX_WITH_NETFLT */ 6273 6274 6281 6275 6282 /** … … 7577 7584 if (!CFGMR3AreValuesValid(pCfgHandle, "papLeds\0First\0Last\0")) 7578 7585 return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES; 7579 AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER, 7586 AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER, 7580 7587 ("Configuration error: Not possible to attach anything to this driver!\n"), 7581 7588 VERR_PDM_DRVINS_NO_ATTACH); … … 7674 7681 NULL, 7675 7682 /* pfnDetach */ 7676 NULL, 7683 NULL, 7677 7684 /* pfnPowerOff */ 7678 NULL, 7685 NULL, 7679 7686 /* pfnSoftReset */ 7680 7687 NULL,
Note:
See TracChangeset
for help on using the changeset viewer.