VirtualBox

Changeset 81591 in vbox for trunk/src/VBox/Devices/EFI


Ignore:
Timestamp:
Oct 30, 2019 2:14:10 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
134346
Message:

Devices: Use PDMDEVINS_2_DATA and PDMDEVINS_2_DATA. bugref:9218

Location:
trunk/src/VBox/Devices/EFI
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/DevEFI.cpp

    r81557 r81591  
    11351135{
    11361136    RT_NOREF(pszArgs);
    1137     PDEVEFIR3 pThisCC = PDMINS_2_DATA_CC(pDevIns, PDEVEFIR3);
     1137    PDEVEFIR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
    11381138    PDMDevHlpCritSectEnter(pDevIns, pDevIns->pCritSectRoR3, VERR_IGNORED);
    11391139
    … …  
    14441444{
    14451445    RT_NOREF(pvUser);
    1446     PDEVEFIR3 pThisCC = PDMINS_2_DATA_CC(pDevIns, PDEVEFIR3);
     1446    PDEVEFIR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
    14471447    Log4(("EFI in: %x %x\n", Port, cb));
    14481448
    … …  
    15301530{
    15311531    RT_NOREF(pvUser);
    1532     PDEVEFIR3 pThisCC = PDMINS_2_DATA_CC(pDevIns, PDEVEFIR3);
     1532    PDEVEFIR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
    15331533    int     rc    = VINF_SUCCESS;
    15341534    Log4(("efi: out %x %x %d\n", Port, u32, cb));
    … …  
    16881688static DECLCALLBACK(VBOXSTRICTRC) efiR3NvMmioWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void const *pv, unsigned cb)
    16891689{
    1690     PDEVEFI pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
     1690    PDEVEFI pThis = PDMDEVINS_2_DATA(pDevIns, PDEVEFI);
    16911691    RT_NOREF(pvUser);
    16921692
    … …  
    17001700static DECLCALLBACK(VBOXSTRICTRC) efiR3NvMmioRead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void *pv, unsigned cb)
    17011701{
    1702     PDEVEFI pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
     1702    PDEVEFI pThis = PDMDEVINS_2_DATA(pDevIns, PDEVEFI);
    17031703    RT_NOREF(pvUser);
    17041704
    … …  
    17101710static DECLCALLBACK(int) efiSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
    17111711{
    1712     PDEVEFI pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
     1712    PDEVEFI pThis = PDMDEVINS_2_DATA(pDevIns, PDEVEFI);
    17131713    LogFlow(("efiSaveExec:\n"));
    17141714
    … …  
    17181718static DECLCALLBACK(int) efiLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
    17191719{
    1720     PDEVEFI         pThis   = PDMINS_2_DATA(pDevIns, PDEVEFI);
    1721     PDEVEFIR3       pThisCC = PDMINS_2_DATA_CC(pDevIns, PDEVEFIR3);
     1720    PDEVEFI         pThis   = PDMDEVINS_2_DATA(pDevIns, PDEVEFI);
     1721    PDEVEFIR3       pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
    17221722    PCPDMDEVHLPR3   pHlp    = pDevIns->pHlpR3;
    17231723    LogFlow(("efiLoadExec: uVersion=%d uPass=%d\n", uVersion, uPass));
    … …  
    18401840static DECLCALLBACK(int) efiInitComplete(PPDMDEVINS pDevIns)
    18411841{
    1842     PDEVEFIR3 pThisCC = PDMINS_2_DATA_CC(pDevIns, PDEVEFIR3);
     1842    PDEVEFIR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
    18431843
    18441844    PVM pVM                    = PDMDevHlpGetVM(pDevIns);
    … …  
    18861886{
    18871887    RT_NOREF(enmCtx);
    1888     PDEVEFIR3 pThisCC = PDMINS_2_DATA_CC(pDevIns, PDEVEFIR3);
     1888    PDEVEFIR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
    18891889
    18901890    /*
    … …  
    19251925static DECLCALLBACK(void) efiReset(PPDMDEVINS pDevIns)
    19261926{
    1927     PDEVEFI   pThis   = PDMINS_2_DATA(pDevIns, PDEVEFI);
    1928     PDEVEFIR3 pThisCC = PDMINS_2_DATA_CC(pDevIns, PDEVEFIR3);
     1927    PDEVEFI   pThis   = PDMDEVINS_2_DATA(pDevIns, PDEVEFI);
     1928    PDEVEFIR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
    19291929    LogFlow(("efiReset\n"));
    19301930
    … …  
    19531953static DECLCALLBACK(void) efiPowerOff(PPDMDEVINS pDevIns)
    19541954{
    1955     PDEVEFIR3  pThisCC = PDMINS_2_DATA_CC(pDevIns, PDEVEFIR3);
     1955    PDEVEFIR3  pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
    19561956
    19571957    if (pThisCC->Lun0.pNvramDrv)
    … …  
    19721972{
    19731973    PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
    1974     PDEVEFI   pThis   = PDMINS_2_DATA(pDevIns, PDEVEFI);
    1975     PDEVEFIR3 pThisCC = PDMINS_2_DATA_CC(pDevIns, PDEVEFIR3);
     1974    PDEVEFI   pThis   = PDMDEVINS_2_DATA(pDevIns, PDEVEFI);
     1975    PDEVEFIR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
    19761976
    19771977    nvramFlushDeviceVariableList(pThisCC);
    … …  
    23622362{
    23632363    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
    2364     PDEVEFI         pThis   = PDMINS_2_DATA(pDevIns, PDEVEFI);
    2365     PDEVEFIR3       pThisCC = PDMINS_2_DATA_CC(pDevIns, PDEVEFIR3);
     2364    PDEVEFI         pThis   = PDMDEVINS_2_DATA(pDevIns, PDEVEFI);
     2365    PDEVEFIR3       pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
    23662366    PCPDMDEVHLPR3   pHlp    = pDevIns->pHlpR3;
    23672367    int             rc;
    … …  
    26962696{
    26972697    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
    2698     PDEVEFI pThis = PDMINS_2_DATA(pDevIns, PDEVEFI);
     2698    PDEVEFI pThis = PDMDEVINS_2_DATA(pDevIns, PDEVEFI);
    26992699
    27002700# if 1

  • trunk/src/VBox/Devices/EFI/DevFlash.cpp

    r81516 r81591  
    7777PDMBOTHCBDECL(VBOXSTRICTRC) flashMMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void const *pv, unsigned cb)
    7878{
    79     PDEVFLASH pThis = PDMINS_2_DATA(pDevIns, PDEVFLASH);
     79    PDEVFLASH pThis = PDMDEVINS_2_DATA(pDevIns, PDEVFLASH);
    8080    RT_NOREF1(pvUser);
    8181    return flashWrite(&pThis->Core, off, pv, cb);
    … …  
    8888PDMBOTHCBDECL(VBOXSTRICTRC) flashMMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void *pv, unsigned cb)
    8989{
    90     PDEVFLASH pThis = PDMINS_2_DATA(pDevIns, PDEVFLASH);
     90    PDEVFLASH pThis = PDMDEVINS_2_DATA(pDevIns, PDEVFLASH);
    9191    RT_NOREF1(pvUser);
    9292    return flashRead(&pThis->Core, off, pv, cb);
    … …  
    100100static DECLCALLBACK(int) flashSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
    101101{
    102     PDEVFLASH pThis = PDMINS_2_DATA(pDevIns, PDEVFLASH);
     102    PDEVFLASH pThis = PDMDEVINS_2_DATA(pDevIns, PDEVFLASH);
    103103    return flashR3SaveExec(&pThis->Core, pDevIns, pSSM);
    104104}
    … …  
    110110static DECLCALLBACK(int) flashLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
    111111{
    112     PDEVFLASH pThis = PDMINS_2_DATA(pDevIns, PDEVFLASH);
     112    PDEVFLASH pThis = PDMDEVINS_2_DATA(pDevIns, PDEVFLASH);
    113113    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
    114114
    … …  
    126126static DECLCALLBACK(void) flashReset(PPDMDEVINS pDevIns)
    127127{
    128     PDEVFLASH pThis = PDMINS_2_DATA(pDevIns, PDEVFLASH);
     128    PDEVFLASH pThis = PDMDEVINS_2_DATA(pDevIns, PDEVFLASH);
    129129    flashR3Reset(&pThis->Core);
    130130}
    … …  
    137137{
    138138    PDMDEV_CHECK_VERSIONS_RETURN_QUIET(pDevIns);
    139     PDEVFLASH   pThis   = PDMINS_2_DATA(pDevIns, PDEVFLASH);
    140     PDEVFLASHR3 pThisR3 = PDMINS_2_DATA_CC(pDevIns, PDEVFLASHR3);
     139    PDEVFLASH   pThis   = PDMDEVINS_2_DATA(pDevIns, PDEVFLASH);
     140    PDEVFLASHR3 pThisR3 = PDMDEVINS_2_DATA_CC(pDevIns, PDEVFLASHR3);
    141141
    142142    if (pThisR3->pszFlashFile)
    … …  
    161161{
    162162    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
    163     PDEVFLASH       pThis   = PDMINS_2_DATA(pDevIns, PDEVFLASH);
    164     PDEVFLASHR3     pThisR3 = PDMINS_2_DATA_CC(pDevIns, PDEVFLASHR3);
     163    PDEVFLASH       pThis   = PDMDEVINS_2_DATA(pDevIns, PDEVFLASH);
     164    PDEVFLASHR3     pThisR3 = PDMDEVINS_2_DATA_CC(pDevIns, PDEVFLASHR3);
    165165    PCPDMDEVHLPR3   pHlp    = pDevIns->pHlpR3;
    166166
    … …  
    248248{
    249249    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
    250     PDEVFLASH pThis = PDMINS_2_DATA(pDevIns, PDEVFLASH);
     250    PDEVFLASH pThis = PDMDEVINS_2_DATA(pDevIns, PDEVFLASH);
    251251
    252252# if 1

  • trunk/src/VBox/Devices/EFI/DevSmc.cpp

    r81520 r81591  
    485485static DECLCALLBACK(int) devR0SmcReqHandler(PPDMDEVINS pDevIns, uint32_t uReq, uint64_t uArg)
    486486{
    487     PDEVSMC pThis = PDMINS_2_DATA(pDevIns, PDEVSMC);
     487    PDEVSMC pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSMC);
    488488    int     rc    = VERR_INVALID_FUNCTION;
    489489    RT_NOREF_PV(uArg);
    … …  
    12931293     * The first register, usually only one is accessed.
    12941294     */
    1295     PDEVSMC pThis = PDMINS_2_DATA(pDevIns, PDEVSMC);
     1295    PDEVSMC pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSMC);
    12961296    AssertReturn(offPort < RT_ELEMENTS(g_aSmcRegs), VERR_INTERNAL_ERROR_3); /* impossible*/
    12971297    VBOXSTRICTRC rc = g_aSmcRegs[offPort].pfnWrite(pThis, offPort, u32);
    … …  
    13341334#endif
    13351335
    1336     PDEVSMC        pThis = PDMINS_2_DATA(pDevIns, PDEVSMC);
     1336    PDEVSMC        pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSMC);
    13371337#ifdef LOG_ENABLED
    13381338    RTIOPORT const offPortLog = offPort;
    … …  
    13821382static DECLCALLBACK(int) smcR3SaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
    13831383{
    1384     PDEVSMC pThis = PDMINS_2_DATA(pDevIns, PDEVSMC);
     1384    PDEVSMC pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSMC);
    13851385    RT_NOREF2(pSSM, pThis);
    13861386
    … …  
    13941394static DECLCALLBACK(int) smcR3LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
    13951395{
    1396     PDEVSMC pThis = PDMINS_2_DATA(pDevIns, PDEVSMC);
     1396    PDEVSMC pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSMC);
    13971397    Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
    13981398    RT_NOREF2(pSSM, pThis);
    … …  
    14241424{
    14251425    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
    1426     PDEVSMC         pThis = PDMINS_2_DATA(pDevIns, PDEVSMC);
     1426    PDEVSMC         pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSMC);
    14271427    PCPDMDEVHLPR3   pHlp = pDevIns->pHlpR3;
    14281428
    … …  
    15071507{
    15081508    PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
    1509     PDEVSMC pThis = PDMINS_2_DATA(pDevIns, PDEVSMC);
     1509    PDEVSMC pThis = PDMDEVINS_2_DATA(pDevIns, PDEVSMC);
    15101510
    15111511    int rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPorts, smcIoPortWrite, smcIoPortRead, NULL /*pvUser*/);
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