VirtualBox

Changeset 25971 in vbox for trunk/src/VBox/Devices


Ignore:
Timestamp:
Jan 22, 2010 12:54:19 PM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
56826
Message:

pdmifs.h: another batch of _IID changes.

Location:
trunk/src/VBox/Devices
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Graphics/DevVGA.cpp

    r25966 r25971  
    47414741    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
    47424742        return &pThis->Base;
    4743     if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_DISPLAY_PORT) == 0)
     4743    if (RTUuidCompare2Strs(pszIID, PDMIDISPLAYPORT_IID) == 0)
    47444744        return &pThis->Port;
    47454745#if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL)
    4746     if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_DISPLAY_VBVA_CALLBACKS) == 0)
     4746    if (RTUuidCompare2Strs(pszIID, PDMIDISPLAYVBVACALLBACKS_IID) == 0)
    47474747        return &pThis->VBVACallbacks;
    47484748#endif
    … …  
    57285728            if (RT_SUCCESS(rc))
    57295729            {
    5730                 pThis->pDrv = (PDMIDISPLAYCONNECTOR*)pThis->pDrvBase->pfnQueryInterface(pThis->pDrvBase, PDMINTERFACE_DISPLAY_CONNECTOR);
     5730                pThis->pDrv = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIDISPLAYCONNECTOR);
    57315731                if (pThis->pDrv)
    57325732                {

  • trunk/src/VBox/Devices/Graphics/DevVGA.h

    r25966 r25971  
    312312#if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL)
    313313    /** LUN\#0: VBVA callbacks interface */
    314     PDMDDISPLAYVBVACALLBACKS    VBVACallbacks;
     314    PDMIDISPLAYVBVACALLBACKS    VBVACallbacks;
    315315#else
    316316# if HC_ARCH_BITS == 32
    … …  
    464464
    465465# ifdef VBOX_WITH_VIDEOHWACCEL
    466 int vbvaVHWACommandCompleteAsynch(PPDMDDISPLAYVBVACALLBACKS pInterface, PVBOXVHWACMD pCmd);
     466int vbvaVHWACommandCompleteAsynch(PPDMIDISPLAYVBVACALLBACKS pInterface, PVBOXVHWACMD pCmd);
    467467int vbvaVHWAConstruct (PVGASTATE pVGAState);
    468468int vbvaVHWADisable (PVGASTATE pVGAState);

  • trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

    r25213 r25971  
    11771177}
    11781178
    1179 #define PPDMDDISPLAYVBVACALLBACKS_2_PVGASTATE(_pcb) ( (PVGASTATE)((uint8_t *)(_pcb) - RT_OFFSETOF(VGASTATE, VBVACallbacks)) )
    1180 
    1181 int vbvaVHWACommandCompleteAsynch(PPDMDDISPLAYVBVACALLBACKS pInterface, PVBOXVHWACMD pCmd)
     1179#define PPDMIDISPLAYVBVACALLBACKS_2_PVGASTATE(_pcb) ( (PVGASTATE)((uint8_t *)(_pcb) - RT_OFFSETOF(VGASTATE, VBVACallbacks)) )
     1180
     1181int vbvaVHWACommandCompleteAsynch(PPDMIDISPLAYVBVACALLBACKS pInterface, PVBOXVHWACMD pCmd)
    11821182{
    11831183    int rc;
    11841184    if((pCmd->Flags & VBOXVHWACMD_FLAG_HH_CMD) == 0)
    11851185    {
    1186         PVGASTATE pVGAState = PPDMDDISPLAYVBVACALLBACKS_2_PVGASTATE(pInterface);
     1186        PVGASTATE pVGAState = PPDMIDISPLAYVBVACALLBACKS_2_PVGASTATE(pInterface);
    11871187        PHGSMIINSTANCE pIns = pVGAState->pHGSMI;
    11881188        VBVAHOSTCMD *pHostCmd;

  • trunk/src/VBox/Devices/Input/DevPS2.cpp

    r25969 r25971  
    13631363    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
    13641364        return &pThis->Keyboard.Base;
    1365     if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_KEYBOARD_PORT) == 0)
     1365    if (RTUuidCompare2Strs(pszIID, PDMIKEYBOARDPORT_IID) == 0)
    13661366        return &pThis->Keyboard.Port;
    13671367    return NULL;
    … …  
    14671467            if (RT_SUCCESS(rc))
    14681468            {
    1469                 pThis->Keyboard.pDrv = (PDMIKEYBOARDCONNECTOR*)(pThis->Keyboard.pDrvBase->pfnQueryInterface(pThis->Keyboard.pDrvBase, PDMINTERFACE_KEYBOARD_CONNECTOR));
     1469                pThis->Keyboard.pDrv = PDMIBASE_QUERY_INTERFACE(pThis->Keyboard.pDrvBase, PDMIKEYBOARDCONNECTOR);
    14701470                if (!pThis->Keyboard.pDrv)
    14711471                {

  • trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp

    r25966 r25971  
    8787    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
    8888        return &pDrvIns->IBase;
    89     if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_KEYBOARD_CONNECTOR) == 0)
     89    if (RTUuidCompare2Strs(pszIID, PDMIKEYBOARDCONNECTOR_IID) == 0)
    9090        return &pThis->Connector;
    91     if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_KEYBOARD_PORT) == 0)
     91    if (RTUuidCompare2Strs(pszIID, PDMIKEYBOARDPORT_IID) == 0)
    9292        return &pThis->Port;
    9393    return NULL;
    … …  
    262262     * Get the IKeyboardPort interface of the above driver/device.
    263263     */
    264     pDrv->pUpPort = (PPDMIKEYBOARDPORT)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_KEYBOARD_PORT);
     264    pDrv->pUpPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIKEYBOARDPORT);
    265265    if (!pDrv->pUpPort)
    266266    {
    … …  
    279279        return rc;
    280280    }
    281     pDrv->pDownConnector = (PPDMIKEYBOARDCONNECTOR)pDownBase->pfnQueryInterface(pDownBase, PDMINTERFACE_KEYBOARD_CONNECTOR);
     281    pDrv->pDownConnector = PDMIBASE_QUERY_INTERFACE(pDownBase, PDMIKEYBOARDCONNECTOR);
    282282    if (!pDrv->pDownConnector)
    283283    {

  • trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp

    r25966 r25971  
    100100/* -=-=-=-=- IHostDeviceConnector -=-=-=-=- */
    101101
    102 /** @copydoc PDMICHAR::pfnWrite */
     102/** @copydoc PDMICHARCONNECTOR::pfnWrite */
    103103static DECLCALLBACK(int) drvHostParallelWrite(PPDMIHOSTPARALLELCONNECTOR pInterface, const void *pvBuf, size_t *cbWrite)
    104104{

  • trunk/src/VBox/Devices/Serial/DevSerial.cpp

    r25966 r25971  
    146146    R3PTRTYPE(PPDMIBASE)            pDrvBase;
    147147    /** Pointer to the attached character driver. */
    148     R3PTRTYPE(PPDMICHAR)            pDrvChar;
     148    R3PTRTYPE(PPDMICHARCONNECTOR)            pDrvChar;
    149149
    150150    uint16_t                        divider;
    … …  
    480480
    481481    /* Set new states. */
    482     if (newStatusLines & PDM_ICHAR_STATUS_LINES_DCD)
     482    if (newStatusLines & PDMICHARPORT_STATUS_LINES_DCD)
    483483        newMsr |= UART_MSR_DCD;
    484     if (newStatusLines & PDM_ICHAR_STATUS_LINES_RI)
     484    if (newStatusLines & PDMICHARPORT_STATUS_LINES_RI)
    485485        newMsr |= UART_MSR_RI;
    486     if (newStatusLines & PDM_ICHAR_STATUS_LINES_DSR)
     486    if (newStatusLines & PDMICHARPORT_STATUS_LINES_DSR)
    487487        newMsr |= UART_MSR_DSR;
    488     if (newStatusLines & PDM_ICHAR_STATUS_LINES_CTS)
     488    if (newStatusLines & PDMICHARPORT_STATUS_LINES_CTS)
    489489        newMsr |= UART_MSR_CTS;
    490490
    … …  
    740740    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
    741741        return &pThis->IBase;
    742     if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_CHAR_PORT) == 0)
     742    if (RTUuidCompare2Strs(pszIID, PDMICHARPORT_IID) == 0)
    743743        return &pThis->ICharPort;
    744744    return NULL;
    … …  
    953953    if (RT_SUCCESS(rc))
    954954    {
    955         pThis->pDrvChar = (PDMICHAR *)pThis->pDrvBase->pfnQueryInterface(pThis->pDrvBase, PDMINTERFACE_CHAR);
     955        pThis->pDrvChar = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMICHARCONNECTOR);
    956956        if (!pThis->pDrvChar)
    957957        {

  • trunk/src/VBox/Devices/Serial/DrvChar.cpp

    r25966 r25971  
    4343#define CHAR_MAX_SEND_QUEUE_MASK        0x7f
    4444
    45 /** Converts a pointer to DRVCHAR::IChar to a PDRVCHAR. */
    46 #define PDMICHAR_2_DRVCHAR(pInterface) ( (PDRVCHAR)((uintptr_t)pInterface - RT_OFFSETOF(DRVCHAR, IChar)) )
     45/** Converts a pointer to DRVCHAR::ICharConnector to a PDRVCHAR. */
     46#define PDMICHAR_2_DRVCHAR(pInterface)  RT_FROM_MEMBER(pInterface, DRVCHAR, ICharConnector)
    4747
    4848
    … …  
    5353 * Char driver instance data.
    5454 *
    55  * @implements PDMICHAR
     55 * @implements PDMICHARCONNECTOR
    5656 */
    5757typedef struct DRVCHAR
    … …  
    6464    PPDMISTREAM                 pDrvStream;
    6565    /** Our char interface. */
    66     PDMICHAR                    IChar;
     66    PDMICHARCONNECTOR           ICharConnector;
    6767    /** Flag to notify the receive thread it should terminate. */
    6868    volatile bool               fShutdown;
    … …  
    101101    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
    102102        return &pDrvIns->IBase;
    103     if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_CHAR) == 0)
    104         return &pThis->IChar;
     103    if (RTUuidCompare2Strs(pszIID, PDMICHARCONNECTOR_IID) == 0)
     104        return &pThis->ICharConnector;
    105105    return NULL;
    106106}
    107107
    108108
    109 /* -=-=-=-=- IChar -=-=-=-=- */
    110 
    111 /** @copydoc PDMICHAR::pfnWrite */
    112 static DECLCALLBACK(int) drvCharWrite(PPDMICHAR pInterface, const void *pvBuf, size_t cbWrite)
     109/* -=-=-=-=- ICharConnector -=-=-=-=- */
     110
     111/** @copydoc PDMICHARCONNECTOR::pfnWrite */
     112static DECLCALLBACK(int) drvCharWrite(PPDMICHARCONNECTOR pInterface, const void *pvBuf, size_t cbWrite)
    113113{
    114114    PDRVCHAR pThis = PDMICHAR_2_DRVCHAR(pInterface);
    … …  
    131131}
    132132
    133 /** @copydoc PDMICHAR::pfnSetParameters */
    134 static DECLCALLBACK(int) drvCharSetParameters(PPDMICHAR pInterface, unsigned Bps, char chParity, unsigned cDataBits, unsigned cStopBits)
     133/** @copydoc PDMICHARCONNECTOR::pfnSetParameters */
     134static DECLCALLBACK(int) drvCharSetParameters(PPDMICHARCONNECTOR pInterface, unsigned Bps, char chParity, unsigned cDataBits, unsigned cStopBits)
    135135{
    136136    /*PDRVCHAR pThis = PDMICHAR_2_DRVCHAR(pInterface); - unused*/
    … …  
    278278 * @param DataTerminalReady Set to true if this control line should be made active.
    279279 */
    280 static DECLCALLBACK(int) drvCharSetModemLines(PPDMICHAR pInterface, bool RequestToSend, bool DataTerminalReady)
     280static DECLCALLBACK(int) drvCharSetModemLines(PPDMICHARCONNECTOR pInterface, bool RequestToSend, bool DataTerminalReady)
    281281{
    282282    /* Nothing to do here. */
    … …  
    292292 * @thread  Any thread.
    293293 */
    294 static DECLCALLBACK(int) drvCharSetBreak(PPDMICHAR pInterface, bool fBreak)
     294static DECLCALLBACK(int) drvCharSetBreak(PPDMICHARCONNECTOR pInterface, bool fBreak)
    295295{
    296296    /* Nothing to do here. */
    … …  
    317317    /* IBase. */
    318318    pDrvIns->IBase.pfnQueryInterface        = drvCharQueryInterface;
    319     /* IChar. */
    320     pThis->IChar.pfnWrite                   = drvCharWrite;
    321     pThis->IChar.pfnSetParameters           = drvCharSetParameters;
    322     pThis->IChar.pfnSetModemLines           = drvCharSetModemLines;
    323     pThis->IChar.pfnSetBreak                = drvCharSetBreak;
     319    /* ICharConnector. */
     320    pThis->ICharConnector.pfnWrite          = drvCharWrite;
     321    pThis->ICharConnector.pfnSetParameters  = drvCharSetParameters;
     322    pThis->ICharConnector.pfnSetModemLines  = drvCharSetModemLines;
     323    pThis->ICharConnector.pfnSetBreak       = drvCharSetBreak;
    324324
    325325    /*
    326326     * Get the ICharPort interface of the above driver/device.
    327327     */
    328     pThis->pDrvCharPort = (PPDMICHARPORT)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_CHAR_PORT);
     328    pThis->pDrvCharPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMICHARPORT);
    329329    if (!pThis->pDrvCharPort)
    330330        return PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_MISSING_INTERFACE_ABOVE, RT_SRC_POS, N_("Char#%d has no char port interface above"), pDrvIns->iInstance);

  • trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

    r25966 r25971  
    9595 * Char driver instance data.
    9696 *
    97  * @implements  PDMICHAR
     97 * @implements  PDMICHARCONNECTOR
    9898 */
    9999typedef struct DRVHOSTSERIAL
    … …  
    104104    PPDMICHARPORT               pDrvCharPort;
    105105    /** Our char interface. */
    106     PDMICHAR                    IChar;
     106    PDMICHARCONNECTOR           ICharConnector;
    107107    /** Receive thread. */
    108108    PPDMTHREAD                  pRecvThread;
    … …  
    165165
    166166
    167 /** Converts a pointer to DRVCHAR::IChar to a PDRVHOSTSERIAL. */
    168 #define PDMICHAR_2_DRVHOSTSERIAL(pInterface) ( (PDRVHOSTSERIAL)((uintptr_t)pInterface - RT_OFFSETOF(DRVHOSTSERIAL, IChar)) )
     167/** Converts a pointer to DRVCHAR::ICharConnector to a PDRVHOSTSERIAL. */
     168#define PDMICHAR_2_DRVHOSTSERIAL(pInterface) RT_FROM_MEMBER(pInterface, DRVHOSTSERIAL, ICharConnector)
    169169
    170170
    … …  
    181181    if (RTUuidCompare2Strs(pszIID, PDMIBASE_IID) == 0)
    182182        return &pDrvIns->IBase;
    183     if (RTUuidCompare2Strs(pszIID, PDMINTERFACE_CHAR) == 0)
    184         return &pThis->IChar;
     183    if (RTUuidCompare2Strs(pszIID, PDMICHARCONNECTOR_IID) == 0)
     184        return &pThis->ICharConnector;
    185185    return NULL;
    186186}
    187187
    188188
    189 /* -=-=-=-=- IChar -=-=-=-=- */
    190 
    191 /** @copydoc PDMICHAR::pfnWrite */
    192 static DECLCALLBACK(int) drvHostSerialWrite(PPDMICHAR pInterface, const void *pvBuf, size_t cbWrite)
     189/* -=-=-=-=- ICharConnector -=-=-=-=- */
     190
     191/** @copydoc PDMICHARCONNECTOR::pfnWrite */
     192static DECLCALLBACK(int) drvHostSerialWrite(PPDMICHARCONNECTOR pInterface, const void *pvBuf, size_t cbWrite)
    193193{
    194194    PDRVHOSTSERIAL pThis = PDMICHAR_2_DRVHOSTSERIAL(pInterface);
    … …  
    237237}
    238238
    239 static DECLCALLBACK(int) drvHostSerialSetParameters(PPDMICHAR pInterface, unsigned Bps, char chParity, unsigned cDataBits, unsigned cStopBits)
     239static DECLCALLBACK(int) drvHostSerialSetParameters(PPDMICHARCONNECTOR pInterface, unsigned Bps, char chParity, unsigned cDataBits, unsigned cStopBits)
    240240{
    241241    PDRVHOSTSERIAL pThis = PDMICHAR_2_DRVHOSTSERIAL(pInterface);
    … …  
    859859                {
    860860                    if (dwNewStatusLinesState & MS_RLSD_ON)
    861                         uNewStatusLinesState |= PDM_ICHAR_STATUS_LINES_DCD;
     861                        uNewStatusLinesState |= PDMICHARPORT_STATUS_LINES_DCD;
    862862                    if (dwNewStatusLinesState & MS_RING_ON)
    863                         uNewStatusLinesState |= PDM_ICHAR_STATUS_LINES_RI;
     863                        uNewStatusLinesState |= PDMICHARPORT_STATUS_LINES_RI;
    864864                    if (dwNewStatusLinesState & MS_DSR_ON)
    865                         uNewStatusLinesState |= PDM_ICHAR_STATUS_LINES_DSR;
     865                        uNewStatusLinesState |= PDMICHARPORT_STATUS_LINES_DSR;
    866866                    if (dwNewStatusLinesState & MS_CTS_ON)
    867                         uNewStatusLinesState |= PDM_ICHAR_STATUS_LINES_CTS;
     867                        uNewStatusLinesState |= PDMICHARPORT_STATUS_LINES_CTS;
    868868                    rc = pThis->pDrvCharPort->pfnNotifyStatusLinesChanged(pThis->pDrvCharPort, uNewStatusLinesState);
    869869                    if (RT_FAILURE(rc))
    … …  
    10041004
    10051005        if (statusLines & TIOCM_CAR)
    1006             newStatusLine |= PDM_ICHAR_STATUS_LINES_DCD;
     1006            newStatusLine |= PDMICHARPORT_STATUS_LINES_DCD;
    10071007        if (statusLines & TIOCM_RNG)
    1008             newStatusLine |= PDM_ICHAR_STATUS_LINES_RI;
     1008            newStatusLine |= PDMICHARPORT_STATUS_LINES_RI;
    10091009        if (statusLines & TIOCM_LE)
    1010             newStatusLine |= PDM_ICHAR_STATUS_LINES_DSR;
     1010            newStatusLine |= PDMICHARPORT_STATUS_LINES_DSR;
    10111011        if (statusLines & TIOCM_CTS)
    1012             newStatusLine |= PDM_ICHAR_STATUS_LINES_CTS;
     1012            newStatusLine |= PDMICHARPORT_STATUS_LINES_CTS;
    10131013        rc = pThis->pDrvCharPort->pfnNotifyStatusLinesChanged(pThis->pDrvCharPort, newStatusLine);
    10141014    }
    … …  
    11361136 * @param DataTerminalReady Set to true if this control line should be made active.
    11371137 */
    1138 static DECLCALLBACK(int) drvHostSerialSetModemLines(PPDMICHAR pInterface, bool RequestToSend, bool DataTerminalReady)
     1138static DECLCALLBACK(int) drvHostSerialSetModemLines(PPDMICHARCONNECTOR pInterface, bool RequestToSend, bool DataTerminalReady)
    11391139{
    11401140    PDRVHOSTSERIAL pThis = PDMICHAR_2_DRVHOSTSERIAL(pInterface);
    … …  
    11821182 * @thread  Any thread.
    11831183 */
    1184 static DECLCALLBACK(int) drvHostSerialSetBreak(PPDMICHAR pInterface, bool fBreak)
     1184static DECLCALLBACK(int) drvHostSerialSetBreak(PPDMICHARCONNECTOR pInterface, bool fBreak)
    11851185{
    11861186    PDRVHOSTSERIAL pThis = PDMICHAR_2_DRVHOSTSERIAL(pInterface);
    … …  
    12261226#endif
    12271227    /* IBase. */
    1228     pDrvIns->IBase.pfnQueryInterface = drvHostSerialQueryInterface;
    1229     /* IChar. */
    1230     pThis->IChar.pfnWrite            = drvHostSerialWrite;
    1231     pThis->IChar.pfnSetParameters    = drvHostSerialSetParameters;
    1232     pThis->IChar.pfnSetModemLines    = drvHostSerialSetModemLines;
    1233     pThis->IChar.pfnSetBreak         = drvHostSerialSetBreak;
     1228    pDrvIns->IBase.pfnQueryInterface        = drvHostSerialQueryInterface;
     1229    /* ICharConnector. */
     1230    pThis->ICharConnector.pfnWrite          = drvHostSerialWrite;
     1231    pThis->ICharConnector.pfnSetParameters  = drvHostSerialSetParameters;
     1232    pThis->ICharConnector.pfnSetModemLines  = drvHostSerialSetModemLines;
     1233    pThis->ICharConnector.pfnSetBreak       = drvHostSerialSetBreak;
    12341234
    12351235/** @todo Initialize all members with NIL values!! The destructor is ALWAYS called. */
    … …  
    13511351     * Get the ICharPort interface of the above driver/device.
    13521352     */
    1353     pThis->pDrvCharPort = (PPDMICHARPORT)pDrvIns->pUpBase->pfnQueryInterface(pDrvIns->pUpBase, PDMINTERFACE_CHAR_PORT);
     1353    pThis->pDrvCharPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMICHARPORT);
    13541354    if (!pThis->pDrvCharPort)
    13551355        return PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_MISSING_INTERFACE_ABOVE, RT_SRC_POS, N_("HostSerial#%d has no char port interface above"), pDrvIns->iInstance);
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