VirtualBox

Changeset 22456 in vbox for trunk/src/VBox/Main


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Main/ConsoleImpl.cpp

    r22455 r22456  
    2222 */
    2323
     24/** @todo Move the TAP mess back into the driver! */
    2425#if defined(RT_OS_WINDOWS)
    2526#elif defined(RT_OS_LINUX)
     
    60476048
    60486049#endif /* VBOX_WITH_USB */
    6049 
     6050#if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT)
    60506051
    60516052/**
     
    60566057 *
    60576058 *  @note The caller must lock this object for writing.
     6059 *
     6060 *  @todo Move this back into the driver!
    60586061 */
    6059 #if (defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT)
    60606062HRESULT Console::attachToTapInterface(INetworkAdapter *networkAdapter)
    60616063{
     
    60776079    AssertComRC(rc);
    60786080
    6079 #ifdef RT_OS_LINUX
     6081# ifdef RT_OS_LINUX
    60806082    /*
    60816083     * Allocate a host interface device
     
    61596161        }
    61606162    }
    6161 #elif RT_OS_FREEBSD
     6163
     6164# elif defined(RT_OS_FREEBSD)
    61626165    /*
    61636166     * Set/obtain the tap interface.
     
    61996202        }
    62006203    }
    6201 #endif /* RT_OS_FREEBSD */
     6204# else
     6205#  error "huh?"
     6206# endif
    62026207    /* in case of failure, cleanup. */
    62036208    if (VBOX_FAILURE(rcVBox) && SUCCEEDED(rc))
     
    62186223 *
    62196224 *  @note The caller must lock this object for writing.
     6225 *
     6226 *  @todo Move this back into the driver!
    62206227 */
    62216228HRESULT Console::detachFromTapInterface(INetworkAdapter *networkAdapter)
     
    62706277    return rc;
    62716278}
     6279
    62726280#endif /* (RT_OS_LINUX || RT_OS_FREEBSD) && !VBOX_WITH_NETFLT */
    6273 
    62746281
    62756282/**
     
    75777584    if (!CFGMR3AreValuesValid(pCfgHandle, "papLeds\0First\0Last\0"))
    75787585        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,
    75807587                    ("Configuration error: Not possible to attach anything to this driver!\n"),
    75817588                    VERR_PDM_DRVINS_NO_ATTACH);
     
    76747681    NULL,
    76757682    /* pfnDetach */
    7676     NULL, 
     7683    NULL,
    76777684    /* pfnPowerOff */
    7678     NULL, 
     7685    NULL,
    76797686    /* pfnSoftReset */
    76807687    NULL,
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette