VirtualBox

Changeset 25986 in vbox


Ignore:
Timestamp:
Jan 23, 2010 1:32:03 AM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
56851
Message:

pdmifs.h: cleaned out the remaining references to PDMINTERFACE. (assertion texts mostly)

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/pdmifs.h

    r25984 r25986  
    5555 * PDMIBASE::pfnQueryInterface respectively.
    5656 *
     57 * In most interface descriptions the orientation of the interface is given as
     58 * 'down' or 'up'.  This refers to a model with the device on the top and the
     59 * drivers stacked below it.  Sometimes there is mention of 'main' or 'external'
     60 * which normally means the same, i.e. the Main or VBoxBFE API.  Pickture the
     61 * orientation of 'main' as horisontal.
     62 *
    5763 * @{
    5864 */
    59 
    60 
    61 /** @name Common Driver Interface Identficators.
    62  * @todo Convert all these to _IID.
    63  * @{
    64  */
    65 
    66 /* gsrc -r PDMINTERFACE */
    67 
    68 
    69 /** @} */
    7065
    7166

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

    r25985 r25986  
    50705070        }
    50715071        pState->pDrv = PDMIBASE_QUERY_INTERFACE(pState->pDrvBase, PDMINETWORKCONNECTOR);
    5072         if (!pState->pDrv)
    5073         {
    5074             AssertMsgFailed(("%s Failed to obtain the PDMINTERFACE_NETWORK_CONNECTOR interface!\n"));
    5075             return VERR_PDM_MISSING_INTERFACE_BELOW;
    5076         }
     5072        AssertMsgReturn(pState->pDrv, ("Failed to obtain the PDMINETWORKCONNECTOR interface!\n"),
     5073                        VERR_PDM_MISSING_INTERFACE_BELOW);
    50775074    }
    50785075    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
    … …  
    52875284        }
    52885285        pState->pDrv = PDMIBASE_QUERY_INTERFACE(pState->pDrvBase, PDMINETWORKCONNECTOR);
    5289         if (!pState->pDrv)
    5290         {
    5291             AssertMsgFailed(("Failed to obtain the PDMINTERFACE_NETWORK_CONNECTOR interface!\n"));
    5292             rc = VERR_PDM_MISSING_INTERFACE_BELOW;
    5293         }
     5286        AssertMsgStmt(pState->pDrv, ("Failed to obtain the PDMINETWORKCONNECTOR interface!\n"),
     5287                      rc = VERR_PDM_MISSING_INTERFACE_BELOW);
    52945288    }
    52955289    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)

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

    r25985 r25986  
    531531        if (!pThis->pDrv)
    532532        {
    533             AssertMsgFailed(("Failed to obtain the PDMINTERFACE_NETWORK_CONNECTOR interface!\n"));
     533            AssertMsgFailed(("Failed to obtain the PDMINETWORKCONNECTOR interface!\n"));
    534534            rc = VERR_PDM_MISSING_INTERFACE_BELOW;
    535535            goto out;

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

    r25985 r25986  
    48214821        }
    48224822        pThis->pDrv = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMINETWORKCONNECTOR);
    4823         if (!pThis->pDrv)
    4824         {
    4825             AssertMsgFailed(("Failed to obtain the PDMINTERFACE_NETWORK_CONNECTOR interface!\n"));
    4826             rc = VERR_PDM_MISSING_INTERFACE_BELOW;
    4827         }
     4823        AssertMsgStmt(pThis->pDrv, ("Failed to obtain the PDMINETWORKCONNECTOR interface!\n"),
     4824                      rc = VERR_PDM_MISSING_INTERFACE_BELOW);
    48284825    }
    48294826    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
    … …  
    52135210        }
    52145211        pThis->pDrv = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMINETWORKCONNECTOR);
    5215         if (!pThis->pDrv)
    5216         {
    5217             AssertMsgFailed(("Failed to obtain the PDMINTERFACE_NETWORK_CONNECTOR interface!\n"));
    5218             return VERR_PDM_MISSING_INTERFACE_BELOW;
    5219         }
     5212        AssertMsgReturn(pThis->pDrv, ("Failed to obtain the PDMINETWORKCONNECTOR interface!\n"),
     5213                        VERR_PDM_MISSING_INTERFACE_BELOW);
    52205214    }
    52215215    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)

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

    r25981 r25986  
    15631563        }
    15641564        pState->pDrv = PDMIBASE_QUERY_INTERFACE(pState->pDrvBase, PDMINETWORKCONNECTOR);
    1565         if (!pState->pDrv)
    1566         {
    1567             AssertMsgFailed(("%s Failed to obtain the PDMINTERFACE_NETWORK_CONNECTOR interface!\n"));
    1568             return VERR_PDM_MISSING_INTERFACE_BELOW;
    1569         }
     1565        AssertMsgReturn(pState->pDrv, ("Failed to obtain the PDMINETWORKCONNECTOR interface!\n"),
     1566                        VERR_PDM_MISSING_INTERFACE_BELOW);
    15701567    }
    15711568    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
    … …  
    17441741        }
    17451742        pState->pDrv = PDMIBASE_QUERY_INTERFACE(pState->pDrvBase, PDMINETWORKCONNECTOR);
    1746         if (!pState->pDrv)
    1747         {
    1748             AssertMsgFailed(("Failed to obtain the PDMINTERFACE_NETWORK_CONNECTOR interface!\n"));
    1749             rc = VERR_PDM_MISSING_INTERFACE_BELOW;
    1750         }
     1743        AssertMsgStmt(pState->pDrv, ("Failed to obtain the PDMINETWORKCONNECTOR interface!\n"),
     1744                      rc = VERR_PDM_MISSING_INTERFACE_BELOW);
    17511745    }
    17521746    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)

  • trunk/src/VBox/Devices/Storage/ATAController.cpp

    r25974 r25986  
    45904590
    45914591/**
    4592  * Queries an interface to the driver.
    4593  *
    4594  * @returns Pointer to interface.
    4595  * @returns NULL if the interface was not supported by the device.
    4596  * @param   pInterface          Pointer to AHCIATADevState::IBase.
    4597  * @param   enmInterface        The requested interface identification.
     4592 * @interface_method_impl{PDMIBASE,pfnQueryInterface}
    45984593 */
    4599 static DECLCALLBACK(void *)  ataQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface)
    4600 {
    4601     AHCIATADevState *pIf = PDMIBASE_2_ATASTATE(pInterface);
    4602     switch (enmInterface)
    4603     {
    4604         case PDMINTERFACE_BASE:
    4605             return &pIf->IBase;
    4606         case PDMINTERFACE_BLOCK_PORT:
    4607             return &pIf->IPort;
    4608         case PDMINTERFACE_MOUNT_NOTIFY:
    4609             return &pIf->IMountNotify;
    4610         default:
    4611             return NULL;
    4612     }
     4594static DECLCALLBACK(void *)  ataQueryInterface(PPDMIBASE pInterface, const char *pszIID)
     4595{
     4596    ATADevState *pIf = PDMIBASE_2_ATASTATE(pInterface);
     4597    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pIf->IBase);
     4598    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBLOCKPORT, &pIf->IPort);
     4599    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIMOUNTNOTIFY, &pIf->IMountNotify);
     4600    return NULL;
    46134601}
    46144602#endif

  • trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

    r25985 r25986  
    818818         */
    819819        CFMutableDictionaryRef PropsRef = 0;
    820         kern_return_t krc = IORegistryEntryCreateCFProperties(DVDService, &PropsRef, kCFAllocatorDefault, kNilOptions);
     820        krc = IORegistryEntryCreateCFProperties(DVDService, &PropsRef, kCFAllocatorDefault, kNilOptions);
    821821        if (krc == KERN_SUCCESS)
    822822        {
Note: See TracChangeset for help on using the changeset viewer.

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