VirtualBox

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


Ignore:
Timestamp:
Feb 2, 2010 6:02:15 PM (15 years ago)
Author:
vboxsync
Message:

PDMDEVHLPR3 cleanup; reduced the number of strict functions.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Bus/DevPCI.cpp

    r25780 r26157  
    21052105    if (fGCEnabled)
    21062106    {
    2107         rc = PDMDevHlpIOPortRegisterGC(pDevIns, 0x0cf8, 1, NIL_RTGCPTR, "pciIOPortAddressWrite", "pciIOPortAddressRead", NULL, NULL, "i440FX (PCI)");
     2107        rc = PDMDevHlpIOPortRegisterRC(pDevIns, 0x0cf8, 1, NIL_RTGCPTR, "pciIOPortAddressWrite", "pciIOPortAddressRead", NULL, NULL, "i440FX (PCI)");
    21082108        if (RT_FAILURE(rc))
    21092109            return rc;
    2110         rc = PDMDevHlpIOPortRegisterGC(pDevIns, 0x0cfc, 4, NIL_RTGCPTR, "pciIOPortDataWrite", "pciIOPortDataRead", NULL, NULL, "i440FX (PCI)");
     2110        rc = PDMDevHlpIOPortRegisterRC(pDevIns, 0x0cfc, 4, NIL_RTGCPTR, "pciIOPortDataWrite", "pciIOPortDataRead", NULL, NULL, "i440FX (PCI)");
    21112111        if (RT_FAILURE(rc))
    21122112            return rc;

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

    r26110 r26157  
    318318                    LogRel(("EFI Panic: Unexpected trap!!\n"));
    319319#ifdef VBOX_STRICT
    320                     return PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "EFI Panic: Unexpected trap during early bootstrap!\n");
     320                    return PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "EFI Panic: Unexpected trap during early bootstrap!\n");
    321321#else
    322322                    AssertReleaseMsgFailed(("Unexpected trap during early EFI bootstrap!!\n"));
    … …  
    332332                    LogRel(("EFI Panic: %s\n", pThis->szPanicMsg));
    333333#ifdef VBOX_STRICT
    334                     return PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "EFI Panic: %s\n", pThis->szPanicMsg);
     334                    return PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "EFI Panic: %s\n", pThis->szPanicMsg);
    335335#else
    336336                    return VERR_INTERNAL_ERROR;
    … …  
    432432    FwCommonPlantMpsTable(pDevIns,
    433433                          pThis->au8DMIPage + VBOX_DMI_TABLE_SIZE,
    434                           pThis->cCpus);   
     434                          pThis->cCpus);
    435435
    436436    /*

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

    r26001 r26157  
    60566056    if (pThis->fGCEnabled)
    60576057    {
    6058         rc = PDMDevHlpIOPortRegisterGC(pDevIns,  0x3c0, 16, 0, "vgaIOPortWrite",       "vgaIOPortRead", NULL, NULL,     "VGA - 3c0 (GC)");
     6058        rc = PDMDevHlpIOPortRegisterRC(pDevIns,  0x3c0, 16, 0, "vgaIOPortWrite",       "vgaIOPortRead", NULL, NULL,     "VGA - 3c0 (GC)");
    60596059        if (RT_FAILURE(rc))
    60606060            return rc;
    6061         rc = PDMDevHlpIOPortRegisterGC(pDevIns,  0x3b4,  2, 0, "vgaIOPortWrite",       "vgaIOPortRead", NULL, NULL,     "VGA - 3b4 (GC)");
     6061        rc = PDMDevHlpIOPortRegisterRC(pDevIns,  0x3b4,  2, 0, "vgaIOPortWrite",       "vgaIOPortRead", NULL, NULL,     "VGA - 3b4 (GC)");
    60626062        if (RT_FAILURE(rc))
    60636063            return rc;
    6064         rc = PDMDevHlpIOPortRegisterGC(pDevIns,  0x3ba,  1, 0, "vgaIOPortWrite",       "vgaIOPortRead", NULL, NULL,     "VGA - 3ba (GC)");
     6064        rc = PDMDevHlpIOPortRegisterRC(pDevIns,  0x3ba,  1, 0, "vgaIOPortWrite",       "vgaIOPortRead", NULL, NULL,     "VGA - 3ba (GC)");
    60656065        if (RT_FAILURE(rc))
    60666066            return rc;
    6067         rc = PDMDevHlpIOPortRegisterGC(pDevIns,  0x3d4,  2, 0, "vgaIOPortWrite",       "vgaIOPortRead", NULL, NULL,     "VGA - 3d4 (GC)");
     6067        rc = PDMDevHlpIOPortRegisterRC(pDevIns,  0x3d4,  2, 0, "vgaIOPortWrite",       "vgaIOPortRead", NULL, NULL,     "VGA - 3d4 (GC)");
    60686068        if (RT_FAILURE(rc))
    60696069            return rc;
    6070         rc = PDMDevHlpIOPortRegisterGC(pDevIns,  0x3da,  1, 0, "vgaIOPortWrite",       "vgaIOPortRead", NULL, NULL,     "VGA - 3da (GC)");
     6070        rc = PDMDevHlpIOPortRegisterRC(pDevIns,  0x3da,  1, 0, "vgaIOPortWrite",       "vgaIOPortRead", NULL, NULL,     "VGA - 3da (GC)");
    60716071        if (RT_FAILURE(rc))
    60726072            return rc;
    60736073#ifdef CONFIG_BOCHS_VBE
    6074         rc = PDMDevHlpIOPortRegisterGC(pDevIns,  0x1ce,  1, 0, "vgaIOPortWriteVBEIndex", "vgaIOPortReadVBEIndex", NULL, NULL, "VGA/VBE - Index (GC)");
     6074        rc = PDMDevHlpIOPortRegisterRC(pDevIns,  0x1ce,  1, 0, "vgaIOPortWriteVBEIndex", "vgaIOPortReadVBEIndex", NULL, NULL, "VGA/VBE - Index (GC)");
    60756075        if (RT_FAILURE(rc))
    60766076            return rc;
    6077         rc = PDMDevHlpIOPortRegisterGC(pDevIns,  0x1cf,  1, 0, "vgaIOPortWriteVBEData", "vgaIOPortReadVBEData", NULL, NULL, "VGA/VBE - Data (GC)");
     6077        rc = PDMDevHlpIOPortRegisterRC(pDevIns,  0x1cf,  1, 0, "vgaIOPortWriteVBEData", "vgaIOPortReadVBEData", NULL, NULL, "VGA/VBE - Data (GC)");
    60786078        if (RT_FAILURE(rc))
    60796079            return rc;
    … …  
    60836083           and try to map other devices there */
    60846084        /* Old Bochs. */
    6085         rc = PDMDevHlpIOPortRegisterGC(pDevIns, 0xff80,  1, 0, "vgaIOPortWriteVBEIndex", "vgaIOPortReadVBEIndex", "VGA/VBE - Index Old (GC)");
     6085        rc = PDMDevHlpIOPortRegisterRC(pDevIns, 0xff80,  1, 0, "vgaIOPortWriteVBEIndex", "vgaIOPortReadVBEIndex", "VGA/VBE - Index Old (GC)");
    60866086        if (RT_FAILURE(rc))
    60876087            return rc;
    6088         rc = PDMDevHlpIOPortRegisterGC(pDevIns, 0xff81,  1, 0, "vgaIOPortWriteVBEData", "vgaIOPortReadVBEData", "VGA/VBE - Index Old (GC)");
     6088        rc = PDMDevHlpIOPortRegisterRC(pDevIns, 0xff81,  1, 0, "vgaIOPortWriteVBEData", "vgaIOPortReadVBEData", "VGA/VBE - Index Old (GC)");
    60896089        if (RT_FAILURE(rc))
    60906090            return rc;
    … …  
    61416141    if (pThis->fGCEnabled)
    61426142    {
    6143         rc = PDMDevHlpMMIORegisterGC(pDevIns, 0x000a0000, 0x00020000, 0, "vgaMMIOWrite", "vgaMMIORead", "vgaMMIOFill");
     6143        rc = PDMDevHlpMMIORegisterRC(pDevIns, 0x000a0000, 0x00020000, 0, "vgaMMIOWrite", "vgaMMIORead", "vgaMMIOFill");
    61446144        if (RT_FAILURE(rc))
    61456145            return rc;

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

    r26001 r26157  
    16471647    if (fGCEnabled)
    16481648    {
    1649         rc = PDMDevHlpIOPortRegisterGC(pDevIns, 0x60, 1, 0, "kbdIOPortDataWrite",    "kbdIOPortDataRead", NULL, NULL,   "PC Keyboard - Data");
     1649        rc = PDMDevHlpIOPortRegisterRC(pDevIns, 0x60, 1, 0, "kbdIOPortDataWrite",    "kbdIOPortDataRead", NULL, NULL,   "PC Keyboard - Data");
    16501650        if (RT_FAILURE(rc))
    16511651            return rc;
    1652         rc = PDMDevHlpIOPortRegisterGC(pDevIns, 0x64, 1, 0, "kbdIOPortCommandWrite", "kbdIOPortStatusRead", NULL, NULL, "PC Keyboard - Command / Status");
     1652        rc = PDMDevHlpIOPortRegisterRC(pDevIns, 0x64, 1, 0, "kbdIOPortCommandWrite", "kbdIOPortStatusRead", NULL, NULL, "PC Keyboard - Command / Status");
    16531653        if (RT_FAILURE(rc))
    16541654            return rc;

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

    r26001 r26157  
    13421342        E1kLog2(("%s ==> FAILED to enter critical section at %s:%d:%s with rc=\n",
    13431343                INSTANCE(pState), RT_SRC_POS_ARGS, rc));
    1344         PDMDeviceDBGFStop(pState->CTX_SUFF(pDevIns), RT_SRC_POS_ARGS,
     1344        PDMDevHlpDBGFStop(pState->CTX_SUFF(pDevIns), RT_SRC_POS_ARGS,
    13451345                          "%s Failed to enter critical section, rc=%Rrc\n",
    13461346                          INSTANCE(pState), rc);
    … …  
    36653665        case 4: mask = 0xFFFFFFFF; break;
    36663666        default:
    3667             return PDMDeviceDBGFStop(pState->CTX_SUFF(pDevIns), RT_SRC_POS,
     3667            return PDMDevHlpDBGFStop(pState->CTX_SUFF(pDevIns), RT_SRC_POS,
    36683668                                     "%s e1kRegRead: unsupported op size: offset=%#10x cb=%#10x\n",
    36693669                                     szInst, uOffset, cb);
    … …  
    36773677            mask <<= shift;
    36783678            if (!mask)
    3679                 return PDMDeviceDBGFStop(pState->CTX_SUFF(pDevIns), RT_SRC_POS,
     3679                return PDMDevHlpDBGFStop(pState->CTX_SUFF(pDevIns), RT_SRC_POS,
    36803680                                         "%s e1kRegRead: Zero mask: offset=%#10x cb=%#10x\n",
    36813681                                         szInst, uOffset, cb);
    … …  
    38463846    {
    38473847        E1kLog(("%s e1kMMIOWrite: invalid op size: offset=%#10x cb=%#10x", pDevIns, uOffset, cb));
    3848         rc = PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "e1kMMIOWrite: invalid op size: offset=%#10x cb=%#10x\n", uOffset, cb);
     3848        rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "e1kMMIOWrite: invalid op size: offset=%#10x cb=%#10x\n", uOffset, cb);
    38493849    }
    38503850    else
    … …  
    38793879    {
    38803880        E1kLog(("%s e1kIOPortIn: invalid op size: port=%RTiop cb=%08x", szInst, port, cb));
    3881         rc = PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "%s e1kIOPortIn: invalid op size: port=%RTiop cb=%08x\n", szInst, port, cb);
     3881        rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "%s e1kIOPortIn: invalid op size: port=%RTiop cb=%08x\n", szInst, port, cb);
    38823882    }
    38833883    else
    … …  
    39303930    {
    39313931        E1kLog(("%s e1kIOPortOut: invalid op size: port=%RTiop cb=%08x\n", szInst, port, cb));
    3932         rc = PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "%s e1kIOPortOut: invalid op size: port=%RTiop cb=%08x\n", szInst, port, cb);
     3932        rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "%s e1kIOPortOut: invalid op size: port=%RTiop cb=%08x\n", szInst, port, cb);
    39333933    }
    39343934    else
    … …  
    39533953                 * bird: VINF_SUCCESS is fine for unhandled cases of an OUT handler. (If you're curious
    39543954                 *       about the guest code and a bit adventuresome, try rc = PDMDeviceDBGFStop(...);) */
    3955                 rc = PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "e1kIOPortOut: invalid port %#010x\n", port);
     3955                rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "e1kIOPortOut: invalid port %#010x\n", port);
    39563956        }
    39573957    }
    … …  
    40414041            if (pState->fGCEnabled)
    40424042            {
    4043                 rc = PDMDevHlpIOPortRegisterGC(pPciDev->pDevIns, pState->addrIOPort, cb, 0,
     4043                rc = PDMDevHlpIOPortRegisterRC(pPciDev->pDevIns, pState->addrIOPort, cb, 0,
    40444044                                               "e1kIOPortOut", "e1kIOPortIn", NULL, NULL, "E1000");
    40454045            }
    … …  
    40584058            if (pState->fGCEnabled)
    40594059            {
    4060                 rc = PDMDevHlpMMIORegisterGC(pPciDev->pDevIns, GCPhysAddress, cb, 0,
     4060                rc = PDMDevHlpMMIORegisterRC(pPciDev->pDevIns, GCPhysAddress, cb, 0,
    40614061                                             "e1kMMIOWrite", "e1kMMIORead", NULL);
    40624062            }
    … …  
    51755175
    51765176    /* Create transmit queue */
    5177     rc = PDMDevHlpPDMQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 1, 0,
    5178                                  e1kTxQueueConsumer, true, "E1000-Xmit", &pState->pTxQueueR3);
     5177    rc = PDMDevHlpQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 1, 0,
     5178                              e1kTxQueueConsumer, true, "E1000-Xmit", &pState->pTxQueueR3);
    51795179    if (RT_FAILURE(rc))
    51805180        return rc;
    … …  
    51835183
    51845184    /* Create the RX notifier signaller. */
    5185     rc = PDMDevHlpPDMQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 1, 0,
    5186                                  e1kCanRxQueueConsumer, true, "E1000-Rcv", &pState->pCanRxQueueR3);
     5185    rc = PDMDevHlpQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 1, 0,
     5186                              e1kCanRxQueueConsumer, true, "E1000-Rcv", &pState->pCanRxQueueR3);
    51875187    if (RT_FAILURE(rc))
    51885188        return rc;
    … …  
    52835283    e1kHardReset(pState);
    52845284
    5285     rc = PDMDevHlpPDMThreadCreate(pDevIns, &pState->pTxThread, pState, e1kTxThread, e1kTxThreadWakeUp, 0, RTTHREADTYPE_IO, "E1000_TX");
     5285    rc = PDMDevHlpThreadCreate(pDevIns, &pState->pTxThread, pState, e1kTxThread, e1kTxThreadWakeUp, 0, RTTHREADTYPE_IO, "E1000_TX");
    52865286    if (RT_FAILURE(rc))
    52875287        return rc;

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

    r26001 r26157  
    36643664            case 4: *pu32 = pcnetIoportReadU32(pThis, Port, &rc); break;
    36653665            default:
    3666                 rc = PDMDeviceDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
     3666                rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
    36673667                                       "pcnetIOPortRead: unsupported op size: offset=%#10x cb=%u\n",
    36683668                                       Port, cb);
    … …  
    37073707            case 4: rc = pcnetIoportWriteU32(pThis, Port, u32); break;
    37083708            default:
    3709                 rc = PDMDeviceDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
     3709                rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
    37103710                                       "pcnetIOPortWrite: unsupported op size: offset=%#10x cb=%u\n",
    37113711                                       Port, cb);
    … …  
    37553755                case 4:  *(uint32_t *)pv = pcnetMMIOReadU32(pThis, GCPhysAddr); break;
    37563756                default:
    3757                     rc = PDMDeviceDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
     3757                    rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
    37583758                                           "pcnetMMIORead: unsupported op size: address=%RGp cb=%u\n",
    37593759                                           GCPhysAddr, cb);
    … …  
    38083808                case 4:  pcnetMMIOWriteU32(pThis, GCPhysAddr, *(uint32_t *)pv); break;
    38093809                default:
    3810                     rc = PDMDeviceDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
     3810                    rc = PDMDevHlpDBGFStop(pThis->CTX_SUFF(pDevIns), RT_SRC_POS,
    38113811                                           "pcnetMMIOWrite: unsupported op size: address=%RGp cb=%u\n",
    38123812                                           GCPhysAddr, cb);
    … …  
    39363936    if (pThis->fGCEnabled)
    39373937    {
    3938         rc = PDMDevHlpIOPortRegisterGC(pDevIns, Port, 0x10, 0, "pcnetIOPortAPromWrite",
     3938        rc = PDMDevHlpIOPortRegisterRC(pDevIns, Port, 0x10, 0, "pcnetIOPortAPromWrite",
    39393939                                       "pcnetIOPortAPromRead", NULL, NULL, "PCNet aprom");
    39403940        if (RT_FAILURE(rc))
    39413941            return rc;
    3942         rc = PDMDevHlpIOPortRegisterGC(pDevIns, Port + 0x10, 0x10, 0, "pcnetIOPortWrite",
     3942        rc = PDMDevHlpIOPortRegisterRC(pDevIns, Port + 0x10, 0x10, 0, "pcnetIOPortWrite",
    39433943                                       "pcnetIOPortRead", NULL, NULL, "PCNet");
    39443944        if (RT_FAILURE(rc))
    … …  
    51605160     * Create the transmit queue.
    51615161     */
    5162     rc = PDMDevHlpPDMQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 1, 0,
    5163                                  pcnetXmitQueueConsumer, true, "PCNet-Xmit", &pThis->pXmitQueueR3);
     5162    rc = PDMDevHlpQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 1, 0,
     5163                              pcnetXmitQueueConsumer, true, "PCNet-Xmit", &pThis->pXmitQueueR3);
    51645164    if (RT_FAILURE(rc))
    51655165        return rc;
    … …  
    51705170     * Create the RX notifer signaller.
    51715171     */
    5172     rc = PDMDevHlpPDMQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 1, 0,
    5173                                  pcnetCanRxQueueConsumer, true, "PCNet-Rcv", &pThis->pCanRxQueueR3);
     5172    rc = PDMDevHlpQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 1, 0,
     5173                              pcnetCanRxQueueConsumer, true, "PCNet-Rcv", &pThis->pCanRxQueueR3);
    51745174    if (RT_FAILURE(rc))
    51755175        return rc;
    … …  
    52305230
    52315231    /* Create asynchronous thread */
    5232     rc = PDMDevHlpPDMThreadCreate(pDevIns, &pThis->pSendThread, pThis, pcnetAsyncSendThread, pcnetAsyncSendThreadWakeUp, 0, RTTHREADTYPE_IO, "PCNET_TX");
     5232    rc = PDMDevHlpThreadCreate(pDevIns, &pThis->pSendThread, pThis, pcnetAsyncSendThread, pcnetAsyncSendThreadWakeUp, 0, RTTHREADTYPE_IO, "PCNET_TX");
    52335233    AssertRCReturn(rc, rc);
    52345234

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

    r26055 r26157  
    14281428                                   NULL, NULL, "VirtioNet");
    14291429    AssertRCReturn(rc, rc);
    1430     rc = PDMDevHlpIOPortRegisterGC(pPciDev->pDevIns, pState->VPCI.addrIOPort,
     1430    rc = PDMDevHlpIOPortRegisterRC(pPciDev->pDevIns, pState->VPCI.addrIOPort,
    14311431                                   cb, 0, "vnetIOPortOut", "vnetIOPortIn",
    14321432                                   NULL, NULL, "VirtioNet");
    … …  
    17111711
    17121712    /* Create the RX notifier signaller. */
    1713     rc = PDMDevHlpPDMQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 1, 0,
    1714                                  vnetCanRxQueueConsumer, true, "VNet-Rcv", &pState->pCanRxQueueR3);
     1713    rc = PDMDevHlpQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 1, 0,
     1714                              vnetCanRxQueueConsumer, true, "VNet-Rcv", &pState->pCanRxQueueR3);
    17151715    if (RT_FAILURE(rc))
    17161716        return rc;

  • trunk/src/VBox/Devices/PC/DevACPI.cpp

    r26115 r26157  
    471471                                                     [14]    reserved
    472472                                                     [13]    COUNT_SIZE_CAP counter size
    473                                                      [12:8]  number of comparators in first timer block 
     473                                                     [12:8]  number of comparators in first timer block
    474474                                                     [7:0]   hardware rev ID */
    475475    ACPIGENADDR   HpetAddr;                     /**< lower 32-bit base address */
    … …  
    17901790#undef R
    17911791
    1792     /* register GC stuff */
     1792    /* register RC stuff */
    17931793    if (pThis->fGCEnabled)
    17941794    {
    1795         rc = PDMDevHlpIOPortRegisterGC(pThis->pDevIns, acpiPmPort(pThis, PM_TMR_OFFSET),
     1795        rc = PDMDevHlpIOPortRegisterRC(pThis->pDevIns, acpiPmPort(pThis, PM_TMR_OFFSET),
    17961796                                       1, 0, NULL, "acpiPMTmrRead",
    17971797                                       NULL, NULL, "ACPI PM Timer");

  • trunk/src/VBox/Devices/PC/DevAPIC.cpp

    r25058 r26157  
    29142914        pThis->pCritSectRC = pThis->pApicHlpR3->pfnGetRCCritSect(pDevIns);
    29152915
    2916         rc = PDMDevHlpMMIORegisterGC(pDevIns, ApicBase, 0x1000, 0,
     2916        rc = PDMDevHlpMMIORegisterRC(pDevIns, ApicBase, 0x1000, 0,
    29172917                                     "apicMMIOWrite", "apicMMIORead", NULL);
    29182918        if (RT_FAILURE(rc))
    … …  
    32693269        s->pIoApicHlpRC = s->pIoApicHlpR3->pfnGetRCHelpers(pDevIns);
    32703270
    3271         rc = PDMDevHlpMMIORegisterGC(pDevIns, 0xfec00000, 0x1000, 0,
     3271        rc = PDMDevHlpMMIORegisterRC(pDevIns, 0xfec00000, 0x1000, 0,
    32723272                                     "ioapicMMIOWrite", "ioapicMMIORead", NULL);
    32733273        if (RT_FAILURE(rc))

  • trunk/src/VBox/Devices/PC/DevPIC.cpp

    r24012 r26157  
    991991    if (fGCEnabled)
    992992    {
    993         rc = PDMDevHlpIOPortRegisterGC(pDevIns,  0x20, 2, 0, "picIOPortWrite", "picIOPortRead", NULL, NULL, "i8259 PIC #0");
     993        rc = PDMDevHlpIOPortRegisterRC(pDevIns,  0x20, 2, 0, "picIOPortWrite", "picIOPortRead", NULL, NULL, "i8259 PIC #0");
    994994        if (RT_FAILURE(rc))
    995995            return rc;
    996         rc = PDMDevHlpIOPortRegisterGC(pDevIns,  0xa0, 2, 1, "picIOPortWrite", "picIOPortRead", NULL, NULL, "i8259 PIC #1");
     996        rc = PDMDevHlpIOPortRegisterRC(pDevIns,  0xa0, 2, 1, "picIOPortWrite", "picIOPortRead", NULL, NULL, "i8259 PIC #1");
    997997        if (RT_FAILURE(rc))
    998998            return rc;
    … …  
    10191019    {
    10201020        RTRCPTR pDataRC = PDMINS_2_DATA_RCPTR(pDevIns);
    1021         rc = PDMDevHlpIOPortRegisterGC(pDevIns, 0x4d0, 1, pDataRC + RT_OFFSETOF(DEVPIC, aPics[0]),
     1021        rc = PDMDevHlpIOPortRegisterRC(pDevIns, 0x4d0, 1, pDataRC + RT_OFFSETOF(DEVPIC, aPics[0]),
    10221022                                       "picIOPortElcrWrite", "picIOPortElcrRead", NULL, NULL, "i8259 PIC #0 - elcr");
    10231023        if (RT_FAILURE(rc))
    10241024            return rc;
    1025         rc = PDMDevHlpIOPortRegisterGC(pDevIns, 0x4d1, 1, pDataRC + RT_OFFSETOF(DEVPIC, aPics[1]),
     1025        rc = PDMDevHlpIOPortRegisterRC(pDevIns, 0x4d1, 1, pDataRC + RT_OFFSETOF(DEVPIC, aPics[1]),
    10261026                                       "picIOPortElcrWrite", "picIOPortElcrRead", NULL, NULL, "i8259 PIC #1 - elcr");
    10271027        if (RT_FAILURE(rc))

  • trunk/src/VBox/Devices/PC/DevPcArch.c

    r25647 r26157  
    6464    int rc;
    6565    NOREF(pvUser); NOREF(pDevIns); NOREF(pu32);
    66     rc = PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d\n", Port, cb);
     66    rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d\n", Port, cb);
    6767    if (rc == VINF_SUCCESS)
    6868        rc = VERR_IOM_IOPORT_UNUSED;
    … …  
    115115            case 0xfc:
    116116            default:
    117                 rc = PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", Port, cb, u32);
     117                rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", Port, cb, u32);
    118118                break;
    119119        }
    … …  
    122122    }
    123123    else
    124         rc = PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", Port, cb, u32);
     124        rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", Port, cb, u32);
    125125    return rc;
    126126}
    … …  
    177177        return VINF_SUCCESS;
    178178    }
    179     return PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d\n", Port, cb);
     179    return PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d\n", Port, cb);
    180180}
    181181
    … …  
    210210        return VINF_SUCCESS;
    211211    }
    212     return PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", Port, cb, u32);
     212    return PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "Port=%#x cb=%d u32=%#x\n", Port, cb, u32);
    213213}
    214214

  • trunk/src/VBox/Devices/PC/DevPit-i8254.cpp

    r24265 r26157  
    10521052    if (fGCEnabled)
    10531053    {
    1054         rc = PDMDevHlpIOPortRegisterGC(pDevIns, u16Base, 4, 0, "pitIOPortWrite", "pitIOPortRead", NULL, NULL, "i8254 Programmable Interval Timer");
     1054        rc = PDMDevHlpIOPortRegisterRC(pDevIns, u16Base, 4, 0, "pitIOPortWrite", "pitIOPortRead", NULL, NULL, "i8254 Programmable Interval Timer");
    10551055        if (RT_FAILURE(rc))
    10561056            return rc;
    … …  
    10701070        if (fGCEnabled)
    10711071        {
    1072             rc = PDMDevHlpIOPortRegisterGC(pDevIns, 0x61, 1, 0, NULL, "pitIOPortSpeakerRead", NULL, NULL, "PC Speaker");
     1072            rc = PDMDevHlpIOPortRegisterRC(pDevIns, 0x61, 1, 0, NULL, "pitIOPortSpeakerRead", NULL, NULL, "PC Speaker");
    10731073            if (RT_FAILURE(rc))
    10741074                return rc;

  • trunk/src/VBox/Devices/PC/DevRTC.cpp

    r25127 r26157  
    962962    if (fGCEnabled)
    963963    {
    964         rc = PDMDevHlpIOPortRegisterGC(pDevIns, pThis->IOPortBase, 2, 0,
     964        rc = PDMDevHlpIOPortRegisterRC(pDevIns, pThis->IOPortBase, 2, 0,
    965965                                       "rtcIOPortWrite", "rtcIOPortRead", NULL, NULL, "MC146818 RTC/CMOS");
    966966        if (RT_FAILURE(rc))

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

    r26001 r26157  
    791791    if (pThis->fGCEnabled)
    792792    {
    793         rc = PDMDevHlpIOPortRegisterGC(pDevIns, io_base, 8, 0, "parallelIOPortWrite",
     793        rc = PDMDevHlpIOPortRegisterRC(pDevIns, io_base, 8, 0, "parallelIOPortWrite",
    794794                                      "parallelIOPortRead", NULL, NULL, "Parallel");
    795795        if (RT_FAILURE(rc))

  • trunk/src/VBox/Devices/Samples/VBoxSampleDevice.cpp

    r22985 r26157  
    5858     */
    5959    AssertMsgReturn(pDevIns->u32Version            == PDM_DEVINS_VERSION, ("%#x, expected %#x\n", pDevIns->u32Version,            PDM_DEVINS_VERSION), VERR_VERSION_MISMATCH);
    60     AssertMsgReturn(pDevIns->pDevHlpR3->u32Version == PDM_DEVHLP_VERSION, ("%#x, expected %#x\n", pDevIns->pDevHlpR3->u32Version, PDM_DEVHLP_VERSION), VERR_VERSION_MISMATCH);
     60    AssertMsgReturn(pDevIns->pDevHlpR3->u32Version == PDM_DEVHLPR3_VERSION, ("%#x, expected %#x\n", pDevIns->pDevHlpR3->u32Version, PDM_DEVHLPR3_VERSION), VERR_VERSION_MISMATCH);
    6161
    6262    return VINF_SUCCESS;
    … …  
    7070     */
    7171    AssertLogRelMsgReturn(pDevIns->u32Version            == PDM_DEVINS_VERSION, ("%#x, expected %#x\n", pDevIns->u32Version,            PDM_DEVINS_VERSION), VERR_VERSION_MISMATCH);
    72     AssertLogRelMsgReturn(pDevIns->pDevHlpR3->u32Version == PDM_DEVHLP_VERSION, ("%#x, expected %#x\n", pDevIns->pDevHlpR3->u32Version, PDM_DEVHLP_VERSION), VERR_VERSION_MISMATCH);
     72    AssertLogRelMsgReturn(pDevIns->pDevHlpR3->u32Version == PDM_DEVHLPR3_VERSION, ("%#x, expected %#x\n", pDevIns->pDevHlpR3->u32Version, PDM_DEVHLPR3_VERSION), VERR_VERSION_MISMATCH);
    7373
    7474    /*

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

    r26001 r26157  
    922922    if (pThis->fGCEnabled)
    923923    {
    924         rc = PDMDevHlpIOPortRegisterGC(pDevIns, io_base, 8, 0, "serialIOPortWrite",
     924        rc = PDMDevHlpIOPortRegisterRC(pDevIns, io_base, 8, 0, "serialIOPortWrite",
    925925                                      "serialIOPortRead", NULL, NULL, "Serial");
    926926        if (RT_FAILURE(rc))

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

    r26001 r26157  
    23152315    if (pThis->fGCEnabled)
    23162316    {
    2317         rc = PDMDevHlpMMIORegisterGC(pDevIns, GCPhysAddress, cb, 0,
     2317        rc = PDMDevHlpMMIORegisterRC(pDevIns, GCPhysAddress, cb, 0,
    23182318                                     "ahciMMIOWrite", "ahciMMIORead", NULL);
    23192319        if (RT_FAILURE(rc))
    … …  
    23542354    if (pThis->fGCEnabled)
    23552355    {
    2356         rc = PDMDevHlpIOPortRegisterGC(pDevIns, (RTIOPORT)GCPhysAddress, cb, 0,
     2356        rc = PDMDevHlpIOPortRegisterRC(pDevIns, (RTIOPORT)GCPhysAddress, cb, 0,
    23572357                                       "ahciLegacyFakeWrite", "ahciLegacyFakeRead", NULL, NULL, "AHCI Fake");
    23582358        if (RT_FAILURE(rc))
    … …  
    63776377
    63786378            /* Create the async IO thread. */
    6379             rc = PDMDevHlpPDMThreadCreate(pDevIns, &pAhciPort->pAsyncIOThread, pAhciPort, ahciAsyncIOLoop, ahciAsyncIOLoopWakeUp, 0,
    6380                                           RTTHREADTYPE_IO, szName);
     6379            rc = PDMDevHlpThreadCreate(pDevIns, &pAhciPort->pAsyncIOThread, pAhciPort, ahciAsyncIOLoop, ahciAsyncIOLoopWakeUp, 0,
     6380                                       RTTHREADTYPE_IO, szName);
    63816381            if (RT_FAILURE(rc))
    63826382            {
    … …  
    66416641     * Create the transmit queue.
    66426642     */
    6643     rc = PDMDevHlpPDMQueueCreate(pDevIns, sizeof(DEVPORTNOTIFIERQUEUEITEM), 30*32 /*Maximum of 30 ports multiplied with 32 tasks each port*/, 0,
    6644                                  ahciNotifyQueueConsumer, true, "AHCI-Xmit", &pThis->pNotifierQueueR3);
     6643    rc = PDMDevHlpQueueCreate(pDevIns, sizeof(DEVPORTNOTIFIERQUEUEITEM), 30*32 /*Maximum of 30 ports multiplied with 32 tasks each port*/, 0,
     6644                              ahciNotifyQueueConsumer, true, "AHCI-Xmit", &pThis->pNotifierQueueR3);
    66456645    if (RT_FAILURE(rc))
    66466646        return rc;
    … …  
    68326832
    68336833
    6834                 rc = PDMDevHlpPDMThreadCreate(pDevIns, &pAhciPort->pAsyncIOThread, pAhciPort, ahciAsyncIOLoop, ahciAsyncIOLoopWakeUp, 0,
    6835                                               RTTHREADTYPE_IO, szName);
     6834                rc = PDMDevHlpThreadCreate(pDevIns, &pAhciPort->pAsyncIOThread, pAhciPort, ahciAsyncIOLoop, ahciAsyncIOLoopWakeUp, 0,
     6835                                           RTTHREADTYPE_IO, szName);
    68366836                AssertMsgRC(rc, ("%s: Async IO Thread creation for %s failed rc=%Rrc\n", szName, rc));
    68376837            }
    … …  
    69316931        if (pThis->fGCEnabled)
    69326932        {
    6933             rc = PDMDevHlpIOPortRegisterGC(pDevIns, pCtl->IOPortBase1, 8, (RTGCPTR)i,
     6933            rc = PDMDevHlpIOPortRegisterRC(pDevIns, pCtl->IOPortBase1, 8, (RTGCPTR)i,
    69346934                                            "ahciIOPortWrite1", "ahciIOPortRead1", NULL, NULL, "AHCI GC");
    69356935            if (RT_FAILURE(rc))
    … …  
    69526952        if (pThis->fGCEnabled)
    69536953        {
    6954             rc = PDMDevHlpIOPortRegisterGC(pDevIns, pCtl->IOPortBase2, 1, (RTGCPTR)i,
     6954            rc = PDMDevHlpIOPortRegisterRC(pDevIns, pCtl->IOPortBase2, 1, (RTGCPTR)i,
    69556955                                            "ahciIOPortWrite2", "ahciIOPortRead2", NULL, NULL, "AHCI GC");
    69566956            if (RT_FAILURE(rc))

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

    r26049 r26157  
    52255225        if (pThis->fGCEnabled)
    52265226        {
    5227             rc2 = PDMDevHlpIOPortRegisterGC(pPciDev->pDevIns, (RTIOPORT)GCPhysAddress + i * 8, 8,
     5227            rc2 = PDMDevHlpIOPortRegisterRC(pPciDev->pDevIns, (RTIOPORT)GCPhysAddress + i * 8, 8,
    52285228                                            (RTGCPTR)i, "ataBMDMAIOPortWrite", "ataBMDMAIOPortRead", NULL, NULL, "ATA Bus Master DMA");
    52295229            AssertRC(rc2);
    … …  
    66946694        if (fGCEnabled)
    66956695        {
    6696             rc = PDMDevHlpIOPortRegisterGC(pDevIns, pThis->aCts[i].IOPortBase1, 8, (RTGCPTR)i,
     6696            rc = PDMDevHlpIOPortRegisterRC(pDevIns, pThis->aCts[i].IOPortBase1, 8, (RTGCPTR)i,
    66976697                                           "ataIOPortWrite1", "ataIOPortRead1", "ataIOPortWriteStr1", "ataIOPortReadStr1", "ATA I/O Base 1");
    66986698            if (RT_FAILURE(rc))
    … …  
    67206720        if (fGCEnabled)
    67216721        {
    6722             rc = PDMDevHlpIOPortRegisterGC(pDevIns, pThis->aCts[i].IOPortBase2, 1, (RTGCPTR)i,
     6722            rc = PDMDevHlpIOPortRegisterRC(pDevIns, pThis->aCts[i].IOPortBase2, 1, (RTGCPTR)i,
    67236723                                           "ataIOPortWrite2", "ataIOPortRead2", NULL, NULL, "ATA I/O Base 2");
    67246724            if (RT_FAILURE(rc))

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

    r26001 r26157  
    19201920        if (pThis->fGCEnabled)
    19211921        {
    1922             rc = PDMDevHlpMMIORegisterGC(pDevIns, GCPhysAddress, cb, 0,
     1922            rc = PDMDevHlpMMIORegisterRC(pDevIns, GCPhysAddress, cb, 0,
    19231923                                         "buslogicMMIOWrite", "buslogicMMIORead", NULL);
    19241924            if (RT_FAILURE(rc))
    … …  
    19451945        if (pThis->fGCEnabled)
    19461946        {
    1947             rc = PDMDevHlpIOPortRegisterGC(pDevIns, (RTIOPORT)GCPhysAddress, 32,
     1947            rc = PDMDevHlpIOPortRegisterRC(pDevIns, (RTIOPORT)GCPhysAddress, 32,
    19481948                                           0, "buslogicIOPortWrite", "buslogicIOPortRead", NULL, NULL, "BusLogic");
    19491949            if (RT_FAILURE(rc))
    … …  
    26082608
    26092609    /* Intialize task queue. */
    2610     rc = PDMDevHlpPDMQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 5, 0,
    2611                                  buslogicNotifyQueueConsumer, true, "BugLogicTask", &pThis->pNotifierQueueR3);
     2610    rc = PDMDevHlpQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 5, 0,
     2611                              buslogicNotifyQueueConsumer, true, "BugLogicTask", &pThis->pNotifierQueueR3);
    26122612    if (RT_FAILURE(rc))
    26132613        return rc;

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

    r26001 r26157  
    36663666        if (pThis->fGCEnabled)
    36673667        {
    3668             rc = PDMDevHlpMMIORegisterGC(pDevIns, GCPhysAddress, cb, 0,
     3668            rc = PDMDevHlpMMIORegisterRC(pDevIns, GCPhysAddress, cb, 0,
    36693669                                         "lsilogicMMIOWrite", "lsilogicMMIORead", NULL);
    36703670            if (RT_FAILURE(rc))
    … …  
    36923692        if (pThis->fGCEnabled)
    36933693        {
    3694             rc = PDMDevHlpMMIORegisterGC(pDevIns, GCPhysAddress, cb, 0,
     3694            rc = PDMDevHlpMMIORegisterRC(pDevIns, GCPhysAddress, cb, 0,
    36953695                                         "lsilogicDiagnosticWrite", "lsilogicDiagnosticRead", NULL);
    36963696            if (RT_FAILURE(rc))
    … …  
    37153715        if (pThis->fGCEnabled)
    37163716        {
    3717             rc = PDMDevHlpIOPortRegisterGC(pDevIns, (RTIOPORT)GCPhysAddress, LSILOGIC_PCI_SPACE_IO_SIZE,
     3717            rc = PDMDevHlpIOPortRegisterRC(pDevIns, (RTIOPORT)GCPhysAddress, LSILOGIC_PCI_SPACE_IO_SIZE,
    37183718                                           0, "lsilogicIOPortWrite", "lsilogicIOPortRead", NULL, NULL, "LsiLogic");
    37193719            if (RT_FAILURE(rc))
    … …  
    45014501
    45024502    /* Intialize task queue. */
    4503     rc = PDMDevHlpPDMQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 2, 0,
    4504                                  lsilogicNotifyQueueConsumer, true, "LsiLogic-Task", &pThis->pNotificationQueueR3);
     4503    rc = PDMDevHlpQueueCreate(pDevIns, sizeof(PDMQUEUEITEMCORE), 2, 0,
     4504                              lsilogicNotifyQueueConsumer, true, "LsiLogic-Task", &pThis->pNotificationQueueR3);
    45054505    if (RT_FAILURE(rc))
    45064506        return rc;

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

    r21321 r26157  
    192192                        /* This is a read from the device. */
    193193                        ASMAtomicXchgBool(&pVBoxSCSI->fBusy, true);
    194                         rc = VERR_MORE_DATA; /* @todo: Better return value to indicate ready command? */
     194                        rc = VERR_MORE_DATA; /** @todo Better return value to indicate ready command? */
    195195                    }
    196196                }
    … …  
    308308    RTGCPTR  GCDst      = *pGCPtrDst;
    309309    uint32_t cbTransfer = *pcTransfer * cb;
    310     int rc              = VINF_SUCCESS;
    311310
    312311    LogFlowFunc(("pDevIns=%#p pVBoxSCSI=%#p iRegister=%d cTransfer=%u cb=%u\n",
    … …  
    317316    Assert(pVBoxSCSI->pBuf);
    318317
    319     rc = PGMPhysSimpleDirtyWriteGCPtr(PDMDevHlpGetVMCPU(pDevIns), GCDst, pVBoxSCSI->pBuf, cbTransfer);
     318    int rc = PGMPhysSimpleDirtyWriteGCPtr(PDMDevHlpGetVMCPU(pDevIns), GCDst, pVBoxSCSI->pBuf, cbTransfer);
    320319    AssertRC(rc);
    321320
    … …  
    337336
    338337int vboxscsiWriteString(PPDMDEVINS pDevIns, PVBOXSCSI pVBoxSCSI, uint8_t iRegister,
    339                        RTGCPTR *pGCPtrSrc, PRTGCUINTREG pcTransfer, unsigned cb)
     338                        RTGCPTR *pGCPtrSrc, PRTGCUINTREG pcTransfer, unsigned cb)
    340339{
    341340    RTGCPTR  GCSrc      = *pGCPtrSrc;
    342341    uint32_t cbTransfer = *pcTransfer * cb;
    343     int rc              = VINF_SUCCESS;
    344342
    345343    /* Read string only valid for data in register. */
    … …  
    347345    AssertMsg(cbTransfer == 512, ("Only 512 byte transfers are allowed\n"));
    348346
    349     rc = PGMPhysSimpleReadGCPtr(PDMDevHlpGetVMCPU(pDevIns), pVBoxSCSI->pBuf, GCSrc, cbTransfer);
     347
     348    int rc = PDMDevHlpPhysReadGCVirt(pDevIns, pVBoxSCSI->pBuf, GCSrc, cbTransfer);
    350349    AssertRC(rc);
    351350

  • trunk/src/VBox/Devices/VirtIO/Virtio.cpp

    r25985 r26157  
    378378            {
    379379                *pu32 = 0xFFFFFFFF;
    380                 rc = PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "%s vpciIOPortIn: "
     380                rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "%s vpciIOPortIn: "
    381381                                       "no valid port at offset port=%RTiop "
    382382                                       "cb=%08x\n", szInst, port, cb);
    … …  
    513513                rc = pfnSetConfig(pState, port - VPCI_CONFIG, cb, &u32);
    514514            else
    515                 rc = PDMDeviceDBGFStop(pDevIns, RT_SRC_POS, "%s vpciIOPortOut: no valid port at offset port=%RTiop cb=%08x\n", szInst, port, cb);
     515                rc = PDMDevHlpDBGFStop(pDevIns, RT_SRC_POS, "%s vpciIOPortOut: no valid port at offset port=%RTiop cb=%08x\n", szInst, port, cb);
    516516            break;
    517517    }
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