VirtualBox

Changeset 11267 in vbox for trunk/src/VBox/Devices/Network


Ignore:
Timestamp:
Aug 8, 2008 4:15:43 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
34349
Message:

Devices: PDMINS2DATA -> PDMINS_2_DATA.

Location:
trunk/src/VBox/Devices/Network
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Network/DrvIntNet.cpp

    r11266 r11267  
    576576{
    577577    PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
    578     PDRVINTNET pThis = PDMINS2DATA(pDrvIns, PDRVINTNET);
     578    PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
    579579    switch (enmInterface)
    580580    {
    … …  
    597597{
    598598    LogFlow(("drvIntNetPowerOff\n"));
    599     PDRVINTNET pThis = PDMINS2DATA(pDrvIns, PDRVINTNET);
     599    PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
    600600    if (!pThis->fActivateEarlyDeactivateLate)
    601601    {
    … …  
    614614{
    615615    LogFlow(("drvIntNetPowerResume\n"));
    616     PDRVINTNET pThis = PDMINS2DATA(pDrvIns, PDRVINTNET);
     616    PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
    617617    if (!pThis->fActivateEarlyDeactivateLate)
    618618    {
    … …  
    633633{
    634634    LogFlow(("drvIntNetPowerSuspend\n"));
    635     PDRVINTNET pThis = PDMINS2DATA(pDrvIns, PDRVINTNET);
     635    PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
    636636    if (!pThis->fActivateEarlyDeactivateLate)
    637637    {
    … …  
    650650{
    651651    LogFlow(("drvIntNetPowerOn\n"));
    652     PDRVINTNET pThis = PDMINS2DATA(pDrvIns, PDRVINTNET);
     652    PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
    653653    if (!pThis->fActivateEarlyDeactivateLate)
    654654    {
    … …  
    672672{
    673673    LogFlow(("drvIntNetDestruct\n"));
    674     PDRVINTNET pThis = PDMINS2DATA(pDrvIns, PDRVINTNET);
     674    PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
    675675
    676676    /*
    … …  
    729729static DECLCALLBACK(int) drvIntNetConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle)
    730730{
    731     PDRVINTNET pThis = PDMINS2DATA(pDrvIns, PDRVINTNET);
     731    PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
    732732
    733733    /*

  • trunk/src/VBox/Devices/Network/DrvNAT.cpp

    r11266 r11267  
    220220static DECLCALLBACK(void) drvNATPoller(PPDMDRVINS pDrvIns)
    221221{
    222     PDRVNAT pData = PDMINS2DATA(pDrvIns, PDRVNAT);
     222    PDRVNAT pData = PDMINS_2_DATA(pDrvIns, PDRVNAT);
    223223    fd_set  ReadFDs;
    224224    fd_set  WriteFDs;
    … …  
    310310{
    311311    PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
    312     PDRVNAT pData = PDMINS2DATA(pDrvIns, PDRVNAT);
     312    PDRVNAT pData = PDMINS_2_DATA(pDrvIns, PDRVNAT);
    313313    switch (enmInterface)
    314314    {
    … …  
    333333static DECLCALLBACK(void) drvNATDestruct(PPDMDRVINS pDrvIns)
    334334{
    335     PDRVNAT pData = PDMINS2DATA(pDrvIns, PDRVNAT);
     335    PDRVNAT pData = PDMINS_2_DATA(pDrvIns, PDRVNAT);
    336336
    337337    LogFlow(("drvNATDestruct:\n"));
    … …  
    452452static DECLCALLBACK(int) drvNATLoadDone(PPDMDRVINS pDrvIns, PSSMHANDLE pSSMHandle)
    453453{
    454     PDRVNAT pData = PDMINS2DATA(pDrvIns, PDRVNAT);
     454    PDRVNAT pData = PDMINS_2_DATA(pDrvIns, PDRVNAT);
    455455    drvNATSetMac(pData);
    456456    return VINF_SUCCESS;
    … …  
    463463static DECLCALLBACK(void) drvNATPowerOn(PPDMDRVINS pDrvIns)
    464464{
    465     PDRVNAT pData = PDMINS2DATA(pDrvIns, PDRVNAT);
     465    PDRVNAT pData = PDMINS_2_DATA(pDrvIns, PDRVNAT);
    466466    drvNATSetMac(pData);
    467467}
    … …  
    480480static DECLCALLBACK(int) drvNATConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle)
    481481{
    482     PDRVNAT pData = PDMINS2DATA(pDrvIns, PDRVNAT);
     482    PDRVNAT pData = PDMINS_2_DATA(pDrvIns, PDRVNAT);
    483483    char szNetAddr[16];
    484484    char szNetwork[32]; /* xxx.xxx.xxx.xxx/yy */

  • trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp

    r11266 r11267  
    259259{
    260260    PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
    261     PDRVNETSNIFFER pThis = PDMINS2DATA(pDrvIns, PDRVNETSNIFFER);
     261    PDRVNETSNIFFER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSNIFFER);
    262262    switch (enmInterface)
    263263    {
    … …  
    286286static DECLCALLBACK(void) drvNetSnifferDestruct(PPDMDRVINS pDrvIns)
    287287{
    288     PDRVNETSNIFFER pThis = PDMINS2DATA(pDrvIns, PDRVNETSNIFFER);
     288    PDRVNETSNIFFER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSNIFFER);
    289289
    290290    if (RTCritSectIsInitialized(&pThis->Lock))
    … …  
    311311static DECLCALLBACK(int) drvNetSnifferConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle)
    312312{
    313     PDRVNETSNIFFER pThis = PDMINS2DATA(pDrvIns, PDRVNETSNIFFER);
     313    PDRVNETSNIFFER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSNIFFER);
    314314    LogFlow(("drvNetSnifferConstruct:\n"));
    315315

  • trunk/src/VBox/Devices/Network/DrvTAP.cpp

    r11266 r11267  
    233233static DECLCALLBACK(int) drvTAPAsyncIoThread(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
    234234{
    235     PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
     235    PDRVTAP pData = PDMINS_2_DATA(pDrvIns, PDRVTAP);
    236236    LogFlow(("drvTAPAsyncIoThread: pData=%p\n", pData));
    237237
    … …  
    377377static DECLCALLBACK(int) drvTapAsyncIoWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
    378378{
    379     PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
     379    PDRVTAP pData = PDMINS_2_DATA(pDrvIns, PDRVTAP);
    380380
    381381    int rc = RTFileWrite(pData->PipeWrite, "", 1, NULL);
    … …  
    785785{
    786786    PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
    787     PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
     787    PDRVTAP pData = PDMINS_2_DATA(pDrvIns, PDRVTAP);
    788788    switch (enmInterface)
    789789    {
    … …  
    809809{
    810810    LogFlow(("drvTAPDestruct\n"));
    811     PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
     811    PDRVTAP pData = PDMINS_2_DATA(pDrvIns, PDRVTAP);
    812812
    813813    /*
    … …  
    879879static DECLCALLBACK(int) drvTAPConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle)
    880880{
    881     PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
     881    PDRVTAP pData = PDMINS_2_DATA(pDrvIns, PDRVTAP);
    882882
    883883    /*

  • trunk/src/VBox/Devices/Network/DrvTAPOs2.cpp

    r11266 r11267  
    220220static DECLCALLBACK(int) drvTAPOs2ReceiveThread(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
    221221{
    222     PDRVTAPOS2 pThis = PDMINS2DATA(pDrvIns, PDRVTAPOS2);
     222    PDRVTAPOS2 pThis = PDMINS_2_DATA(pDrvIns, PDRVTAPOS2);
    223223
    224224    /*
    … …  
    307307static DECLCALLBACK(int) drvTAPOs2WakeupReceiveThread(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
    308308{
    309     PDRVTAPOS2 pThis = PDMINS2DATA(pDrvIns, PDRVTAPOS2);
     309    PDRVTAPOS2 pThis = PDMINS_2_DATA(pDrvIns, PDRVTAPOS2);
    310310    LogFlow(("%s: WakeupReceiveThread\n", pThis->szName));
    311311
    … …  
    336336{
    337337    PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
    338     PDRVTAPOS2 pThis = PDMINS2DATA(pDrvIns, PDRVTAPOS2);
     338    PDRVTAPOS2 pThis = PDMINS_2_DATA(pDrvIns, PDRVTAPOS2);
    339339    switch (enmInterface)
    340340    {
    … …  
    359359static DECLCALLBACK(void) drvTAPOs2Destruct(PPDMDRVINS pDrvIns)
    360360{
    361     PDRVTAPOS2 pThis = PDMINS2DATA(pDrvIns, PDRVTAPOS2);
     361    PDRVTAPOS2 pThis = PDMINS_2_DATA(pDrvIns, PDRVTAPOS2);
    362362    LogFlow(("%s: Destruct\n", pThis->szName));
    363363
    … …  
    404404static DECLCALLBACK(int) drvTAPOs2Construct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle)
    405405{
    406     PDRVTAPOS2 pThis = PDMINS2DATA(pDrvIns, PDRVTAPOS2);
     406    PDRVTAPOS2 pThis = PDMINS_2_DATA(pDrvIns, PDRVTAPOS2);
    407407
    408408    /*

  • trunk/src/VBox/Devices/Network/DrvTAPWin.cpp

    r11266 r11267  
    187187static DECLCALLBACK(int) drvTAPW32AsyncIoThread(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
    188188{
    189     PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
     189    PDRVTAP pData = PDMINS_2_DATA(pDrvIns, PDRVTAP);
    190190    HANDLE  haWait[2];
    191191    DWORD   rc = ERROR_SUCCESS, dwNumberOfBytesTransferred;
    … …  
    260260static DECLCALLBACK(int) drvTAPW32AsyncIoWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
    261261{
    262     PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
     262    PDRVTAP pData = PDMINS_2_DATA(pDrvIns, PDRVTAP);
    263263
    264264    /** @todo this isn't a safe method to notify the async thread; it might be using the instance
    … …  
    288288{
    289289    PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
    290     PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
     290    PDRVTAP pData = PDMINS_2_DATA(pDrvIns, PDRVTAP);
    291291    switch (enmInterface)
    292292    {
    … …  
    311311static DECLCALLBACK(void) drvTAPW32Destruct(PPDMDRVINS pDrvIns)
    312312{
    313     PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
     313    PDRVTAP pData = PDMINS_2_DATA(pDrvIns, PDRVTAP);
    314314    TAP_MEDIASTATUS mediastatus;
    315315    DWORD dwLength;
    … …  
    340340static DECLCALLBACK(int) drvTAPW32Construct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle)
    341341{
    342     PDRVTAP pData = PDMINS2DATA(pDrvIns, PDRVTAP);
     342    PDRVTAP pData = PDMINS_2_DATA(pDrvIns, PDRVTAP);
    343343
    344344    /*
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