VirtualBox

Changeset 64274 in vbox


Ignore:
Timestamp:
Oct 14, 2016 10:33:43 AM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
111287
Message:

Devices/Storage: Doxygen fixes

Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/pci.h

    r63690 r64274  
    8787 *                          state to reflect this.
    8888 *
     89 * @param   cb              Size of the region in bytes.
    8990 * @param   enmType         One of the PCI_ADDRESS_SPACE_* values.
    9091 *

  • trunk/include/VBox/vd-ifs.h

    r64272 r64274  
    11521152     * @retval  VERR_NOT_SUPPORTED if the combination of flags is not supported.
    11531153     * @param   fFlags    Combination of the VD_INTERFACETCPNET_CONNECT_* \#defines.
    1154      * @param   pSock     Where to store the handle.
    1155      */
    1156     DECLR3CALLBACKMEMBER(int, pfnSocketCreate, (uint32_t fFlags, PVDSOCKET pSock));
     1154     * @param   phVdSock  Where to store the handle.
     1155     */
     1156    DECLR3CALLBACKMEMBER(int, pfnSocketCreate, (uint32_t fFlags, PVDSOCKET phVdSock));
    11571157
    11581158    /**
    … …  
    11601160     *
    11611161     * @return iprt status code.
    1162      * @param  Sock       Socket handle (/ pointer).
    1163      */
    1164     DECLR3CALLBACKMEMBER(int, pfnSocketDestroy, (VDSOCKET Sock));
     1162     * @param  hVdSock    Socket handle (/ pointer).
     1163     */
     1164    DECLR3CALLBACKMEMBER(int, pfnSocketDestroy, (VDSOCKET hVdSock));
    11651165
    11661166    /**
    … …  
    11681168     *
    11691169     * @return  iprt status code.
    1170      * @param   Sock            Socket handle (/ pointer)..
     1170     * @param   hVdSock         Socket handle (/ pointer)..
    11711171     * @param   pszAddress      The address to connect to.
    11721172     * @param   uPort           The port to connect to.
    … …  
    11761176     *                          configured on the running system.
    11771177     */
    1178     DECLR3CALLBACKMEMBER(int, pfnClientConnect, (VDSOCKET Sock, const char *pszAddress, uint32_t uPort,
     1178    DECLR3CALLBACKMEMBER(int, pfnClientConnect, (VDSOCKET hVdSock, const char *pszAddress, uint32_t uPort,
    11791179                                                 RTMSINTERVAL cMillies));
    11801180
    … …  
    11831183     *
    11841184     * @return  iprt status code.
    1185      * @param   Sock            Socket handle (/ pointer).
    1186      */
    1187     DECLR3CALLBACKMEMBER(int, pfnClientClose, (VDSOCKET Sock));
     1185     * @param   hVdSock         Socket handle (/ pointer).
     1186     */
     1187    DECLR3CALLBACKMEMBER(int, pfnClientClose, (VDSOCKET hVdSock));
    11881188
    11891189    /**
    … …  
    11921192     * @returns true if the socket is connected.
    11931193     *          false otherwise.
    1194      * @param   Sock        Socket handle (/ pointer).
    1195      */
    1196     DECLR3CALLBACKMEMBER(bool, pfnIsClientConnected, (VDSOCKET Sock));
     1194     * @param   hVdSock     Socket handle (/ pointer).
     1195     */
     1196    DECLR3CALLBACKMEMBER(bool, pfnIsClientConnected, (VDSOCKET hVdSock));
    11971197
    11981198    /**
    … …  
    12011201     *
    12021202     * @return  iprt status code.
    1203      * @param   Sock        Socket handle (/ pointer).
     1203     * @param   hVdSock     Socket handle (/ pointer).
    12041204     * @param   cMillies    Number of milliseconds to wait for the socket.
    12051205     *                      Use RT_INDEFINITE_WAIT to wait for ever.
    12061206     */
    1207     DECLR3CALLBACKMEMBER(int, pfnSelectOne, (VDSOCKET Sock, RTMSINTERVAL cMillies));
     1207    DECLR3CALLBACKMEMBER(int, pfnSelectOne, (VDSOCKET hVdSock, RTMSINTERVAL cMillies));
    12081208
    12091209    /**
    … …  
    12111211     *
    12121212     * @return  iprt status code.
    1213      * @param   Sock        Socket handle (/ pointer).
     1213     * @param   hVdSock     Socket handle (/ pointer).
    12141214     * @param   pvBuffer    Where to put the data we read.
    12151215     * @param   cbBuffer    Read buffer size.
    … …  
    12181218     *                      If not NULL a partial read can be done successfully.
    12191219     */
    1220     DECLR3CALLBACKMEMBER(int, pfnRead, (VDSOCKET Sock, void *pvBuffer, size_t cbBuffer, size_t *pcbRead));
     1220    DECLR3CALLBACKMEMBER(int, pfnRead, (VDSOCKET hVdSock, void *pvBuffer, size_t cbBuffer, size_t *pcbRead));
    12211221
    12221222    /**
    … …  
    12241224     *
    12251225     * @return  iprt status code.
    1226      * @param   Sock        Socket handle (/ pointer).
     1226     * @param   hVdSock     Socket handle (/ pointer).
    12271227     * @param   pvBuffer    Buffer to write data to socket.
    12281228     * @param   cbBuffer    How much to write.
    12291229     */
    1230     DECLR3CALLBACKMEMBER(int, pfnWrite, (VDSOCKET Sock, const void *pvBuffer, size_t cbBuffer));
     1230    DECLR3CALLBACKMEMBER(int, pfnWrite, (VDSOCKET hVdSock, const void *pvBuffer, size_t cbBuffer));
    12311231
    12321232    /**
    … …  
    12341234     *
    12351235     * @return  iprt status code.
    1236      * @param   Sock        Socket handle (/ pointer).
    1237      * @param   pSgBuffer   Scatter/gather buffer to write data to socket.
    1238      */
    1239     DECLR3CALLBACKMEMBER(int, pfnSgWrite, (VDSOCKET Sock, PCRTSGBUF pSgBuffer));
     1236     * @param   hVdSock     Socket handle (/ pointer).
     1237     * @param   pSgBuf      Scatter/gather buffer to write data to socket.
     1238     */
     1239    DECLR3CALLBACKMEMBER(int, pfnSgWrite, (VDSOCKET hVdSock, PCRTSGBUF pSgBuf));
    12401240
    12411241    /**
    … …  
    12431243     *
    12441244     * @return  iprt status code.
    1245      * @param   Sock        Socket handle (/ pointer).
     1245     * @param   hVdSock     Socket handle (/ pointer).
    12461246     * @param   pvBuffer    Where to put the data we read.
    12471247     * @param   cbBuffer    Read buffer size.
    12481248     * @param   pcbRead     Number of bytes read.
    12491249     */
    1250     DECLR3CALLBACKMEMBER(int, pfnReadNB, (VDSOCKET Sock, void *pvBuffer, size_t cbBuffer, size_t *pcbRead));
     1250    DECLR3CALLBACKMEMBER(int, pfnReadNB, (VDSOCKET hVdSock, void *pvBuffer, size_t cbBuffer, size_t *pcbRead));
    12511251
    12521252    /**
    … …  
    12541254     *
    12551255     * @return  iprt status code.
    1256      * @param   Sock        Socket handle (/ pointer).
     1256     * @param   hVdSock     Socket handle (/ pointer).
    12571257     * @param   pvBuffer    Buffer to write data to socket.
    12581258     * @param   cbBuffer    How much to write.
    12591259     * @param   pcbWritten  Number of bytes written.
    12601260     */
    1261     DECLR3CALLBACKMEMBER(int, pfnWriteNB, (VDSOCKET Sock, const void *pvBuffer, size_t cbBuffer, size_t *pcbWritten));
     1261    DECLR3CALLBACKMEMBER(int, pfnWriteNB, (VDSOCKET hVdSock, const void *pvBuffer, size_t cbBuffer, size_t *pcbWritten));
    12621262
    12631263    /**
    … …  
    12651265     *
    12661266     * @return  iprt status code.
    1267      * @param   Sock        Socket handle (/ pointer).
    1268      * @param   pSgBuffer   Scatter/gather buffer to write data to socket.
     1267     * @param   hVdSock     Socket handle (/ pointer).
     1268     * @param   pSgBuf      Scatter/gather buffer to write data to socket.
    12691269     * @param   pcbWritten  Number of bytes written.
    12701270     */
    1271     DECLR3CALLBACKMEMBER(int, pfnSgWriteNB, (VDSOCKET Sock, PRTSGBUF pSgBuffer, size_t *pcbWritten));
     1271    DECLR3CALLBACKMEMBER(int, pfnSgWriteNB, (VDSOCKET hVdSock, PRTSGBUF pSgBuf, size_t *pcbWritten));
    12721272
    12731273    /**
    … …  
    12751275     *
    12761276     * @return  iprt status code.
    1277      * @param   Sock        Socket handle (/ pointer).
    1278      */
    1279     DECLR3CALLBACKMEMBER(int, pfnFlush, (VDSOCKET Sock));
     1277     * @param   hVdSock     Socket handle (/ pointer).
     1278     */
     1279    DECLR3CALLBACKMEMBER(int, pfnFlush, (VDSOCKET hVdSock));
    12801280
    12811281    /**
    … …  
    12831283     *
    12841284     * @return  iprt status code.
    1285      * @param   Sock        Socket handle (/ pointer).
     1285     * @param   hVdSock     Socket handle (/ pointer).
    12861286     * @param   fEnable     When set to true enables coalescing.
    12871287     */
    1288     DECLR3CALLBACKMEMBER(int, pfnSetSendCoalescing, (VDSOCKET Sock, bool fEnable));
     1288    DECLR3CALLBACKMEMBER(int, pfnSetSendCoalescing, (VDSOCKET hVdSock, bool fEnable));
    12891289
    12901290    /**
    … …  
    12921292     *
    12931293     * @return  iprt status code.
    1294      * @param   Sock        Socket handle (/ pointer).
     1294     * @param   hVdSock     Socket handle (/ pointer).
    12951295     * @param   pAddr       Where to store the local address on success.
    12961296     */
    1297     DECLR3CALLBACKMEMBER(int, pfnGetLocalAddress, (VDSOCKET Sock, PRTNETADDR pAddr));
     1297    DECLR3CALLBACKMEMBER(int, pfnGetLocalAddress, (VDSOCKET hVdSock, PRTNETADDR pAddr));
    12981298
    12991299    /**
    … …  
    13011301     *
    13021302     * @return  iprt status code.
    1303      * @param   Sock        Socket handle (/ pointer).
     1303     * @param   hVdSock     Socket handle (/ pointer).
    13041304     * @param   pAddr       Where to store the peer address on success.
    13051305     */
    1306     DECLR3CALLBACKMEMBER(int, pfnGetPeerAddress, (VDSOCKET Sock, PRTNETADDR pAddr));
     1306    DECLR3CALLBACKMEMBER(int, pfnGetPeerAddress, (VDSOCKET hVdSock, PRTNETADDR pAddr));
    13071307
    13081308    /**
    … …  
    13181318     *                      Use RT_INDEFINITE_WAIT to wait for ever.
    13191319     */
    1320     DECLR3CALLBACKMEMBER(int, pfnSelectOneEx, (VDSOCKET Sock, uint32_t fEvents,
     1320    DECLR3CALLBACKMEMBER(int, pfnSelectOneEx, (VDSOCKET hVdSock, uint32_t fEvents,
    13211321                                               uint32_t *pfEvents, RTMSINTERVAL cMillies));
    13221322
    … …  
    13271327     * @param  hVdSock      VD Socket handle(/pointer).
    13281328     */
    1329     DECLR3CALLBACKMEMBER(int, pfnPoke, (VDSOCKET Sock));
     1329    DECLR3CALLBACKMEMBER(int, pfnPoke, (VDSOCKET hVdSock));
    13301330
    13311331} VDINTERFACETCPNET, *PVDINTERFACETCPNET;

  • trunk/include/VBox/vmm/pdmstorageifs.h

    r64131 r64274  
    291291     * @param   enmTxDir        Direction of transfer.
    292292     * @param   pvBuf           Pointer tp the transfer buffer.
    293      * @param   cbBuf           Size of the transfer buffer.
    294      * @param   pbSenseKey      Status of the command (when return value is VERR_DEV_IO_ERROR).
     293     * @param   pcbBuf          Size of the transfer buffer.
     294     * @param   pabSense        Status of the command (when return value is VERR_DEV_IO_ERROR).
     295     * @param   cbSense         Size of the sense buffer in bytes.
    295296     * @param   cTimeoutMillies Command timeout in milliseconds.
    296297     * @thread  Any thread.
    297298     */
    298     DECLR3CALLBACKMEMBER(int, pfnSendCmd,(PPDMIMEDIA pInterface, const uint8_t *pbCmd, PDMMEDIATXDIR enmTxDir, void *pvBuf, uint32_t *pcbBuf, uint8_t *pabSense, size_t cbSense, uint32_t cTimeoutMillies));
     299    DECLR3CALLBACKMEMBER(int, pfnSendCmd,(PPDMIMEDIA pInterface, const uint8_t *pbCmd, PDMMEDIATXDIR enmTxDir,
     300                                          void *pvBuf, uint32_t *pcbBuf, uint8_t *pabSense, size_t cbSense,
     301                                          uint32_t cTimeoutMillies));
    299302
    300303    /**

  • trunk/include/VBox/vscsi.h

    r64132 r64274  
    119119     *
    120120     * @returns VBox status code.
    121      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
    122      * @param   cbIoReqAlloc    The size of the allocator specific memory in bytes.
     121     * @param   hVScsiLun            Virtual SCSI LUN handle.
     122     * @param   pvScsiLunUser        Opaque user data which may be used to identify the
     123     *                               medium.
     124     * @param   cbVScsiIoReqAlloc    The size of the allocator specific memory in bytes.
    123125     * @thread  EMT.
    124126     */

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

    r63369 r64274  
    307307 * @returns VBox status code.
    308308 * @param   pTrackList    The track list to update.
     309 * @param   iTrack        The first track the TOC has data for.
    309310 * @param   fMSF          Flag whether block addresses are in MSF or LBA format.
    310311 * @param   pbBuf         Buffer holding the formatted TOC.

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

    r64209 r64274  
    20202020 * Hardware reset used for machine power on and reset.
    20212021 *
    2022  * @param pAhciport     The port to reset.
     2022 * @param pAhciPort     The port to reset.
    20232023 */
    20242024static void ahciPortHwReset(PAHCIPort pAhciPort)
    … …  
    23612361 * @param   pvUser      User argument.
    23622362 * @param   Port        Port address where the write starts.
    2363  * @param   pv          Where to fetch the result.
     2363 * @param   u32         Where to fetch the result.
    23642364 * @param   cb          Number of bytes to write.
    23652365 */
    … …  
    24052405 * @param   pvUser      User argument.
    24062406 * @param   Port        Port address where the read starts.
    2407  * @param   pv          Where to fetch the result.
     2407 * @param   pu32        Where to fetch the result.
    24082408 * @param   cb          Number of bytes to write.
    24092409 */
    … …  
    35703570 * @returns Whether all active tasks were canceled.
    35713571 * @param   pAhciPort        The AHCI port.
    3572  * @param   pAhciReqExcept   The given request is excepted from the cancelling
    3573  *                           (used for error page reading).
    35743572 */
    35753573static bool ahciCancelActiveTasks(PAHCIPort pAhciPort)
    … …  
    36903688 * @returns nothing.
    36913689 * @param   pAhciPort    The AHCI port.
     3690 * @param   pAhciReq     The request to free.
    36923691 */
    36933692static void ahciR3ReqFree(PAHCIPort pAhciPort, PAHCIREQ pAhciReq)
    … …  
    40264025 *
    40274026 * @returns The direction of the data transfer
    4028  * @param   pCmdHdr Pointer to the command header.
     4027 * @param   pAhciPort     The AHCI port of the request.
     4028 * @param   pAhciReq      The AHCI request state.
     4029 * @param   pCmdFis       Pointer to the command FIS.
    40294030 */
    40304031static PDMMEDIAEXIOREQTYPE ahciProcessCmd(PAHCIPort pAhciPort, PAHCIREQ pAhciReq, uint8_t *pCmdFis)
    … …  
    43044305 *
    43054306 * @returns whether the H2D FIS was successfully read from the guest memory.
    4306  * @param pAhciReq The state of the actual task.
     4307 * @param pAhciPort    The AHCI port of the request.
     4308 * @param pAhciReq     The state of the actual task.
    43074309 */
    43084310static bool ahciPortTaskGetCommandFis(PAHCIPort pAhciPort, PAHCIREQ pAhciReq)
    … …  
    53375339
    53385340/**
    5339  * Callback employed by ahciR3Suspend and ahciR3PowerOff..
     5341 * Callback employed by ahciR3Suspend and ahciR3PowerOff.
    53405342 *
    53415343 * @returns true if we've quiesced, false if we're still working.
    … …  
    54195421 * @param   pDevIns      The device instance.
    54205422 * @param   pAhciPort    The attached device.
    5421  * @param   szName       Name of the port to get the CFGM node.
     5423 * @param   pszName      Name of the port to get the CFGM node.
    54225424 */
    54235425static int ahciR3VpdInit(PPDMDEVINS pDevIns, PAHCIPort pAhciPort, const char *pszName)
    … …  
    56615663 * @param   pDevIns     The device instance data.
    56625664 */
    5663 static int ahciR3ResetCommon(PPDMDEVINS pDevIns, bool fConstructor)
    5664 {
    5665     RT_NOREF(fConstructor);
     5665static int ahciR3ResetCommon(PPDMDEVINS pDevIns)
     5666{
    56665667    PAHCI pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
    56675668
    … …  
    56885689    ASMAtomicWriteBool(&pThis->fSignalIdle, false);
    56895690
    5690     ahciR3ResetCommon(pDevIns, false /*fConstructor*/);
     5691    ahciR3ResetCommon(pDevIns);
    56915692    return true;
    56925693}
    … …  
    57075708    {
    57085709        ASMAtomicWriteBool(&pThis->fSignalIdle, false);
    5709         ahciR3ResetCommon(pDevIns, false /*fConstructor*/);
     5710        ahciR3ResetCommon(pDevIns);
    57105711    }
    57115712}
    … …  
    61326133    PDMDevHlpDBGFInfoRegister(pDevIns, szTmp, "AHCI info", ahciR3Info);
    61336134
    6134     return ahciR3ResetCommon(pDevIns, true /*fConstructor*/);
     6135    return ahciR3ResetCommon(pDevIns);
    61356136}
    61366137

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

    r64093 r64274  
    61186118 *                          I/O port, else it's a physical address.
    61196119 *                          This address is *NOT* relative to pci_mem_base like earlier!
     6120 * @param   cb              Size of the region in bytes.
    61206121 * @param   enmType         One of the PCI_ADDRESS_SPACE_* values.
    61216122 */
    … …  
    66456646 * @returns true on success.
    66466647 * @returns false when one or more threads is still processing.
    6647  * @param   pThis               Pointer to the instance data.
     6648 * @param   pDevIns               Pointer to the PDM device instance.
    66486649 */
    66496650static bool ataR3AllAsyncIOIsIdle(PPDMDEVINS pDevIns)

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

    r64225 r64274  
    10161016 * @param   pBusLogic       Pointer to the BusLogic device instance.
    10171017 * @param   fSuppressIrq    Flag to suppress IRQ generation regardless of fIRQEnabled
    1018  * @param   uFlag           Type of interrupt being generated.
     1018 * @param   uIrqType        Type of interrupt being generated.
    10191019 */
    10201020static void buslogicSetInterrupt(PBUSLOGIC pBusLogic, bool fSuppressIrq, uint8_t uIrqType)
    … …  
    10471047 * Deasserts the interrupt line of the BusLogic adapter.
    10481048 *
    1049  * @returns nothing
    1050  * @param   pBuslogic  Pointer to the BusLogic device instance.
     1049 * @returns nothing.
     1050 * @param   pBusLogic  Pointer to the BusLogic device instance.
    10511051 */
    10521052static void buslogicClearInterrupt(PBUSLOGIC pBusLogic)
    … …  
    10681068/**
    10691069 * Advances the mailbox pointer to the next slot.
     1070 *
     1071 * @returns nothing.
     1072 * @param   pBusLogic       The BusLogic controller instance.
    10701073 */
    10711074DECLINLINE(void) buslogicR3OutgoingMailboxAdvance(PBUSLOGIC pBusLogic)
    … …  
    10781081 *
    10791082 * @returns nothing.
    1080  * @param   pBusLogic.
     1083 * @param   pBusLogic       The BusLogic controller instance.
    10811084 */
    10821085static void buslogicR3InitializeLocalRam(PBUSLOGIC pBusLogic)
    … …  
    12021205 * @param   pBusLogic                 Pointer to the BusLogic device instance.
    12031206 * @param   GCPhysAddrCCB             The physical guest address of the CCB the mailbox is for.
    1204  * @param   pCCBGuet                  The command control block.
     1207 * @param   pCCBGuest                 The command control block.
    12051208 * @param   uHostAdapterStatus        The host adapter status code to set.
    12061209 * @param   uDeviceStatus             The target device status to set.
    … …  
    13811384 * @param   pCCBGuest     The CCB of the guest.
    13821385 * @param   fIs24Bit      Flag whether the 24bit SG format is used.
    1383  * @para    cbSGEntry     Size of one SG entry in bytes.
    13841386 * @param   pcbBuf        Where to store the size of the guest data buffer on success.
    13851387 */
    … …  
    24962498 * @param   cb          Number of bytes read.
    24972499 */
    2498 PDMBOTHCBDECL(int) buslogicIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
     2500PDMBOTHCBDECL(int) buslogicIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb)
    24992501{
    25002502    PBUSLOGIC pBusLogic = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
    2501     unsigned iRegister = Port % 4;
     2503    unsigned iRegister = uPort % 4;
    25022504    RT_NOREF_PV(pvUser); RT_NOREF_PV(cb);
    25032505
    … …  
    25182520 * @param   cb          The value size in bytes.
    25192521 */
    2520 PDMBOTHCBDECL(int) buslogicIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
     2522PDMBOTHCBDECL(int) buslogicIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb)
    25212523{
    25222524    PBUSLOGIC pBusLogic = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
    2523     unsigned iRegister = Port % 4;
     2525    unsigned iRegister = uPort % 4;
    25242526    uint8_t uVal = (uint8_t)u32;
    25252527    RT_NOREF2(pvUser, cb);
    … …  
    25292531    int rc = buslogicRegisterWrite(pBusLogic, iRegister, (uint8_t)uVal);
    25302532
    2531     Log2(("#%d %s: pvUser=%#p cb=%d u32=%#x Port=%#x rc=%Rrc\n",
    2532           pDevIns->iInstance, __FUNCTION__, pvUser, cb, u32, Port, rc));
     2533    Log2(("#%d %s: pvUser=%#p cb=%d u32=%#x uPort=%#x rc=%Rrc\n",
     2534          pDevIns->iInstance, __FUNCTION__, pvUser, cb, u32, uPort, rc));
    25332535
    25342536    return rc;
    … …  
    26102612 * @param   cb          Number of bytes read.
    26112613 */
    2612 static DECLCALLBACK(int) buslogicR3BiosIoPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
     2614static DECLCALLBACK(int) buslogicR3BiosIoPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb)
    26132615{
    26142616    RT_NOREF(pvUser, cb);
    … …  
    26172619    Assert(cb == 1);
    26182620
    2619     int rc = vboxscsiReadRegister(&pBusLogic->VBoxSCSI, (Port - BUSLOGIC_BIOS_IO_PORT), pu32);
     2621    int rc = vboxscsiReadRegister(&pBusLogic->VBoxSCSI, (uPort - BUSLOGIC_BIOS_IO_PORT), pu32);
    26202622
    26212623    //Log2(("%s: pu32=%p:{%.*Rhxs} iRegister=%d rc=%Rrc\n",
    2622     //      __FUNCTION__, pu32, 1, pu32, (Port - BUSLOGIC_BIOS_IO_PORT), rc));
     2624    //      __FUNCTION__, pu32, 1, pu32, (uPort - BUSLOGIC_BIOS_IO_PORT), rc));
    26232625
    26242626    return rc;
    … …  
    26362638 * @param   cb          The value size in bytes.
    26372639 */
    2638 static DECLCALLBACK(int) buslogicR3BiosIoPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
     2640static DECLCALLBACK(int) buslogicR3BiosIoPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb)
    26392641{
    26402642    RT_NOREF(pvUser, cb);
    26412643    PBUSLOGIC pThis = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
    2642     Log2(("#%d %s: pvUser=%#p cb=%d u32=%#x Port=%#x\n", pDevIns->iInstance, __FUNCTION__, pvUser, cb, u32, Port));
     2644    Log2(("#%d %s: pvUser=%#p cb=%d u32=%#x uPort=%#x\n", pDevIns->iInstance, __FUNCTION__, pvUser, cb, u32, uPort));
    26432645
    26442646    /*
    … …  
    26512653    Assert(cb == 1);
    26522654
    2653     int rc = vboxscsiWriteRegister(&pThis->VBoxSCSI, (Port - BUSLOGIC_BIOS_IO_PORT), (uint8_t)u32);
     2655    int rc = vboxscsiWriteRegister(&pThis->VBoxSCSI, (uPort - BUSLOGIC_BIOS_IO_PORT), (uint8_t)u32);
    26542656    if (rc == VERR_MORE_DATA)
    26552657    {
    … …  
    37463748
    37473749/**
    3748  * Callback employed by buslogicR3Suspend and buslogicR3PowerOff..
     3750 * Callback employed by buslogicR3Suspend and buslogicR3PowerOff.
    37493751 *
    37503752 * @returns true if we've quiesced, false if we're still working.

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

    r63562 r64274  
    24062406 * @callback_method_impl{FNIOMIOPORTOUT}
    24072407 */
    2408 static DECLCALLBACK(int) fdcIoPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
     2408static DECLCALLBACK(int) fdcIoPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb)
    24092409{
    24102410    RT_NOREF(pDevIns);
    24112411    if (cb == 1)
    2412         fdctrl_write (pvUser, Port & 7, u32);
     2412        fdctrl_write (pvUser, uPort & 7, u32);
    24132413    else
    2414         AssertMsgFailed(("Port=%#x cb=%d u32=%#x\n", Port, cb, u32));
     2414        AssertMsgFailed(("uPort=%#x cb=%d u32=%#x\n", uPort, cb, u32));
    24152415    return VINF_SUCCESS;
    24162416}
    … …  
    24182418
    24192419/**
    2420  * @callback_method_impl{FNIOMIOPORTOUT}
     2420 * @callback_method_impl{FNIOMIOPORTIN}
    24212421 */
    2422 static DECLCALLBACK(int) fdcIoPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
     2422static DECLCALLBACK(int) fdcIoPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb)
    24232423{
    24242424    RT_NOREF(pDevIns);
    24252425    if (cb == 1)
    24262426    {
    2427         *pu32 = fdctrl_read (pvUser, Port & 7);
     2427        *pu32 = fdctrl_read (pvUser, uPort & 7);
    24282428        return VINF_SUCCESS;
    24292429    }

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

    r64225 r64274  
    16881688 * @callback_method_impl{FNIOMIOPORTOUT}
    16891689 */
    1690 PDMBOTHCBDECL(int) lsilogicIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
     1690PDMBOTHCBDECL(int) lsilogicIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb)
    16911691{
    16921692    PLSILOGICSCSI   pThis  = PDMINS_2_DATA(pDevIns, PLSILOGICSCSI);
    1693     uint32_t        offReg = Port - pThis->IOPortBase;
     1693    uint32_t        offReg = uPort - pThis->IOPortBase;
    16941694    int             rc;
    16951695    RT_NOREF2(pvUser, cb);
    … …  
    17131713 * @callback_method_impl{FNIOMIOPORTIN}
    17141714 */
    1715 PDMBOTHCBDECL(int) lsilogicIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
     1715PDMBOTHCBDECL(int) lsilogicIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb)
    17161716{
    17171717    PLSILOGICSCSI   pThis   = PDMINS_2_DATA(pDevIns, PLSILOGICSCSI);
    1718     uint32_t        offReg  = Port - pThis->IOPortBase;
     1718    uint32_t        offReg  = uPort - pThis->IOPortBase;
    17191719    RT_NOREF_PV(pvUser);
    17201720    RT_NOREF_PV(cb);
    … …  
    23112311
    23122312/**
    2313  * @interface_method_impl{PDMIMEDIA,pfnQueryDeviceLocation}
     2313 * @interface_method_impl{PDMIMEDIAPORT,pfnQueryDeviceLocation}
    23142314 */
    23152315static DECLCALLBACK(int) lsilogicR3QueryDeviceLocation(PPDMIMEDIAPORT pInterface, const char **ppcszController,
    … …  
    24272427 * @returns VINF_SUCCESS if successful
    24282428 *          VERR_NOT_FOUND if the requested page could be found.
     2429 * @param   pThis         The LsiLogic controller instance data.
     2430 * @param   pPages        The pages supported by the controller.
    24292431 * @param   u8PageNumber  Number of the page to get.
    24302432 * @param   ppPageHeader  Where to store the pointer to the page header.
    24312433 * @param   ppbPageData   Where to store the pointer to the page data.
     2434 * @param   pcbPage       Where to store the size of the page data in bytes on success.
    24322435 */
    24332436static int lsilogicR3ConfigurationIOUnitPageGetFromNumber(PLSILOGICSCSI pThis,
    … …  
    24822485 * @returns VINF_SUCCESS if successful
    24832486 *          VERR_NOT_FOUND if the requested page could be found.
     2487 * @param   pThis         The LsiLogic controller instance data.
     2488 * @param   pPages        The pages supported by the controller.
    24842489 * @param   u8PageNumber  Number of the page to get.
    24852490 * @param   ppPageHeader  Where to store the pointer to the page header.
    24862491 * @param   ppbPageData   Where to store the pointer to the page data.
     2492 * @param   pcbPage       Where to store the size of the page data in bytes on success.
    24872493 */
    24882494static int lsilogicR3ConfigurationIOCPageGetFromNumber(PLSILOGICSCSI pThis,
    … …  
    25422548 * @returns VINF_SUCCESS if successful
    25432549 *          VERR_NOT_FOUND if the requested page could be found.
     2550 * @param   pThis         The LsiLogic controller instance data.
     2551 * @param   pPages        The pages supported by the controller.
    25442552 * @param   u8PageNumber  Number of the page to get.
    25452553 * @param   ppPageHeader  Where to store the pointer to the page header.
    25462554 * @param   ppbPageData   Where to store the pointer to the page data.
     2555 * @param   pcbPage       Where to store the size of the page data in bytes on success.
    25472556 */
    25482557static int lsilogicR3ConfigurationManufacturingPageGetFromNumber(PLSILOGICSCSI pThis,
    … …  
    26312640 * @returns VINF_SUCCESS if successful
    26322641 *          VERR_NOT_FOUND if the requested page could be found.
     2642 * @param   pThis         The LsiLogic controller instance data.
     2643 * @param   pPages        The pages supported by the controller.
    26332644 * @param   u8PageNumber  Number of the page to get.
    26342645 * @param   ppPageHeader  Where to store the pointer to the page header.
    26352646 * @param   ppbPageData   Where to store the pointer to the page data.
     2647 * @param   pcbPage       Where to store the size of the page data in bytes on success.
    26362648 */
    26372649static int lsilogicR3ConfigurationBiosPageGetFromNumber(PLSILOGICSCSI pThis,
    … …  
    26762688 * @returns VINF_SUCCESS if successful
    26772689 *          VERR_NOT_FOUND if the requested page could be found.
     2690 * @param   pThis         The LsiLogic controller instance data.
     2691 * @param   pPages        The pages supported by the controller.
     2692 * @param   u8Port        The port to retrieve the page for.
    26782693 * @param   u8PageNumber  Number of the page to get.
    26792694 * @param   ppPageHeader  Where to store the pointer to the page header.
    26802695 * @param   ppbPageData   Where to store the pointer to the page data.
     2696 * @param   pcbPage       Where to store the size of the page data in bytes on success.
    26812697 */
    26822698static int lsilogicR3ConfigurationSCSISPIPortPageGetFromNumber(PLSILOGICSCSI pThis,
    … …  
    27252741 * @returns VINF_SUCCESS if successful
    27262742 *          VERR_NOT_FOUND if the requested page could be found.
     2743 * @param   pThis         The LsiLogic controller instance data.
     2744 * @param   pPages        The pages supported by the controller.
     2745 * @param   u8Bus         The bus the device is on the page should be returned.
     2746 * @param   u8TargetID    The target ID of the device to return the page for.
    27272747 * @param   u8PageNumber  Number of the page to get.
    27282748 * @param   ppPageHeader  Where to store the pointer to the page header.
    27292749 * @param   ppbPageData   Where to store the pointer to the page data.
     2750 * @param   pcbPage       Where to store the size of the page data in bytes on success.
    27302751 */
    27312752static int lsilogicR3ConfigurationSCSISPIDevicePageGetFromNumber(PLSILOGICSCSI pThis,
    … …  
    29752996 * @param   pThis               Pointer to the LsiLogic device state.
    29762997 * @param   pConfigurationReq   The configuration request.
    2977  * @param   u8PageNumber        Number of the page to get.
    2978  * @param   ppPageHeader        Where to store the pointer to the page header.
     2998 * @param   ppPageHeader        Where to return the pointer to the page header on success.
    29792999 * @param   ppbPageData         Where to store the pointer to the page data.
     3000 * @param   pcbPage             Where to store the size of the page in bytes.
    29803001 */
    29813002static int lsilogicR3ConfigurationPageGetExtended(PLSILOGICSCSI pThis, PMptConfigurationRequest pConfigurationReq,
    … …  
    49574978
    49584979/**
    4959  * @interface_method_impl{PDMILEDPORTS,pfnQueryInterface, For a SCSI device.}
     4980 * @interface_method_impl{PDMILEDPORTS,pfnQueryStatusLed, For a SCSI device.}
    49604981 *
    49614982 * @remarks Called by the scsi driver, proxying the main calls.

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

    r64019 r64274  
    375375 * @param   cSeg     Number of segments.
    376376 * @param   off      Start offset.
    377  * @param   cbWrite  Number of bytes to verify.
     377 * @param   cbRead   Number of bytes to verify.
    378378 */
    379379static int drvdiskintReadVerify(PDRVDISKINTEGRITY pThis, PCRTSGSEG paSeg, unsigned cSeg,

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

    r64252 r64274  
    133133/* -=-=-=-=- IBlock -=-=-=-=- */
    134134
    135 /** @interface_method_impl{PDMIBLOCK,pfnRead} */
     135/** @interface_method_impl{PDMIMEDIA,pfnRead} */
    136136static DECLCALLBACK(int) drvHostBaseRead(PPDMIMEDIA pInterface, uint64_t off, void *pvBuf, size_t cbRead)
    137137{
    … …  
    171171
    172172
    173 /** @interface_method_impl{PDMIBLOCK,pfnWrite} */
     173/** @interface_method_impl{PDMIMEDIA,pfnWrite} */
    174174static DECLCALLBACK(int) drvHostBaseWrite(PPDMIMEDIA pInterface, uint64_t off, const void *pvBuf, size_t cbWrite)
    175175{
    … …  
    212212
    213213
    214 /** @interface_method_impl{PDMIBLOCK,pfnFlush} */
     214/** @interface_method_impl{PDMIMEDIA,pfnFlush} */
    215215static DECLCALLBACK(int) drvHostBaseFlush(PPDMIMEDIA pInterface)
    216216{
    … …  
    232232
    233233
    234 /** @interface_method_impl{PDMIBLOCK,pfnIsReadOnly} */
     234/** @interface_method_impl{PDMIMEDIA,pfnIsReadOnly} */
    235235static DECLCALLBACK(bool) drvHostBaseIsReadOnly(PPDMIMEDIA pInterface)
    236236{
    … …  
    248248
    249249
    250 /** @interface_method_impl{PDMIBLOCK,pfnGetSize} */
     250/** @interface_method_impl{PDMIMEDIA,pfnGetSize} */
    251251static DECLCALLBACK(uint64_t) drvHostBaseGetSize(PPDMIMEDIA pInterface)
    252252{
    … …  
    264264
    265265
    266 /** @interface_method_impl{PDMIBLOCK,pfnGetType} */
     266/** @interface_method_impl{PDMIMEDIA,pfnGetType} */
    267267static DECLCALLBACK(PDMMEDIATYPE) drvHostBaseGetType(PPDMIMEDIA pInterface)
    268268{
    … …  
    273273
    274274
    275 /** @interface_method_impl{PDMIBLOCK,pfnGetUuid} */
     275/** @interface_method_impl{PDMIMEDIA,pfnGetUuid} */
    276276static DECLCALLBACK(int) drvHostBaseGetUuid(PPDMIMEDIA pInterface, PRTUUID pUuid)
    277277{
    … …  
    285285
    286286
    287 /** @interface_method_impl{PDMIBLOCKBIOS,pfnBiosGetPCHSGeometry} */
     287/** @interface_method_impl{PDMIMEDIA,pfnBiosGetPCHSGeometry} */
    288288static DECLCALLBACK(int) drvHostBaseGetPCHSGeometry(PPDMIMEDIA pInterface, PPDMMEDIAGEOMETRY pPCHSGeometry)
    289289{
    … …  
    313313
    314314
    315 /** @interface_method_impl{PDMIBLOCKBIOS,pfnBiosSetPCHSGeometry} */
     315/** @interface_method_impl{PDMIMEDIA,pfnBiosSetPCHSGeometry} */
    316316static DECLCALLBACK(int) drvHostBaseSetPCHSGeometry(PPDMIMEDIA pInterface, PCPDMMEDIAGEOMETRY pPCHSGeometry)
    317317{
    … …  
    337337
    338338
    339 /** @interface_method_impl{PDMIBLOCKBIOS,pfnGetLCHSGeometry} */
     339/** @interface_method_impl{PDMIMEDIA,pfnBiosGetLCHSGeometry} */
    340340static DECLCALLBACK(int) drvHostBaseGetLCHSGeometry(PPDMIMEDIA pInterface, PPDMMEDIAGEOMETRY pLCHSGeometry)
    341341{
    … …  
    365365
    366366
    367 /** @interface_method_impl{PDMIBLOCKBIOS,pfnSetLCHSGeometry} */
     367/** @interface_method_impl{PDMIMEDIA,pfnBiosSetLCHSGeometry} */
    368368static DECLCALLBACK(int) drvHostBaseSetLCHSGeometry(PPDMIMEDIA pInterface, PCPDMMEDIAGEOMETRY pLCHSGeometry)
    369369{
    … …  
    389389
    390390
    391 /** @interface_method_impl{PDMIBLOCKBIOS,pfnIsVisible} */
     391/** @interface_method_impl{PDMIMEDIA,pfnBiosIsVisible} */
    392392static DECLCALLBACK(bool) drvHostBaseIsVisible(PPDMIMEDIA pInterface)
    393393{

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

    r64019 r64274  
    309309
    310310/**
    311  * Verifies a read request.
     311 * Read data from the ram disk.
    312312 *
    313313 * @returns VBox status code.
    314  * @param   pThis    Disk integrity driver instance data.
     314 * @param   pThis    RAM disk driver instance data.
    315315 * @param   pSgBuf   The S/G buffer to store the data.
    316316 * @param   off      Start offset.
    317  * @param   cbWrite  Number of bytes to verify.
     317 * @param   cbRead   Number of bytes to read.
    318318 */
    319319static int drvramdiskReadWorker(PDRVRAMDISK pThis, PRTSGBUF pSgBuf,
    … …  
    872872 *
    873873 * @returns VBox status code.
    874  * @param   VINF_PDM_MEDIAEX_IOREQ_IN_PROGRESS if there is no I/O memory available to allocate and
     874 * @retval  VINF_PDM_MEDIAEX_IOREQ_IN_PROGRESS if there is no I/O memory available to allocate and
    875875 *          the request was placed on a waiting list.
    876876 * @param   pThis     VBox disk container instance data.
    … …  
    14451445
    14461446/**
    1447  * @interface_method_impl{PDMIMEDIAEX,pfnIoReqQuerySuspendedFirst}
     1447 * @interface_method_impl{PDMIMEDIAEX,pfnIoReqQuerySuspendedStart}
    14481448 */
    14491449static DECLCALLBACK(int) drvramdiskIoReqQuerySuspendedStart(PPDMIMEDIAEX pInterface, PPDMMEDIAEXIOREQ phIoReq,

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

    r64093 r64274  
    7171 * useful for those nasty problems with the ultra-slow host filesystems.
    7272 * If this is enabled, it can be configured via the CFGM key
    73  * "VBoxInternal/Devices/piix3ide/0/LUN#<x>/Config/FlushInterval". <x>
     73 * "VBoxInternal/Devices/piix3ide/0/LUN#<x>/Config/FlushInterval". @verbatim<x>@endverbatim
    7474 * must be replaced with the correct LUN number of the disk that should
    7575 * do the periodic flushes. The value of the key is the number of bytes
    … …  
    8383 * the periodic flush cache feature above.
    8484 * If this feature is enabled, it can be configured via the CFGM key
    85  * "VBoxInternal/Devices/piix3ide/0/LUN#<x>/Config/IgnoreFlush". <x>
     85 * "VBoxInternal/Devices/piix3ide/0/LUN#<x>/Config/IgnoreFlush". @verbatim<x>@endverbatim
    8686 * must be replaced with the correct LUN number of the disk that should
    8787 * ignore flush requests. The value of the key is a boolean. The default
    … …  
    13491349
    13501350/** @interface_method_impl{VDINTERFACETCPNET,pfnSocketCreate} */
    1351 static DECLCALLBACK(int) drvvdTcpSocketCreate(uint32_t fFlags, PVDSOCKET pSock)
     1351static DECLCALLBACK(int) drvvdTcpSocketCreate(uint32_t fFlags, PVDSOCKET phVdSock)
    13521352{
    13531353    int rc = VINF_SUCCESS;
    … …  
    13791379                if (RT_SUCCESS(rc))
    13801380                {
    1381                     *pSock = pSockInt;
     1381                    *phVdSock = pSockInt;
    13821382                    return VINF_SUCCESS;
    13831383                }
    … …  
    13961396    else
    13971397    {
    1398         *pSock = pSockInt;
     1398        *phVdSock = pSockInt;
    13991399        return VINF_SUCCESS;
    14001400    }
    … …  
    14061406
    14071407/** @interface_method_impl{VDINTERFACETCPNET,pfnSocketDestroy} */
    1408 static DECLCALLBACK(int) drvvdTcpSocketDestroy(VDSOCKET Sock)
     1408static DECLCALLBACK(int) drvvdTcpSocketDestroy(VDSOCKET hVdSock)
    14091409{
    14101410    int rc = VINF_SUCCESS;
    1411     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1411    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    14121412
    14131413    /* Destroy the pipe and pollset if necessary. */
    … …  
    14381438
    14391439/** @interface_method_impl{VDINTERFACETCPNET,pfnClientConnect} */
    1440 static DECLCALLBACK(int) drvvdTcpClientConnect(VDSOCKET Sock, const char *pszAddress, uint32_t uPort,
     1440static DECLCALLBACK(int) drvvdTcpClientConnect(VDSOCKET hVdSock, const char *pszAddress, uint32_t uPort,
    14411441                                               RTMSINTERVAL cMillies)
    14421442{
    14431443    int rc = VINF_SUCCESS;
    1444     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1444    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    14451445
    14461446    rc = RTTcpClientConnectEx(pszAddress, uPort, &pSockInt->hSocket, cMillies, NULL);
    … …  
    14661466
    14671467/** @interface_method_impl{VDINTERFACETCPNET,pfnClientClose} */
    1468 static DECLCALLBACK(int) drvvdTcpClientClose(VDSOCKET Sock)
     1468static DECLCALLBACK(int) drvvdTcpClientClose(VDSOCKET hVdSock)
    14691469{
    14701470    int rc = VINF_SUCCESS;
    1471     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1471    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    14721472
    14731473    if (pSockInt->hPollSet != NIL_RTPOLLSET)
    … …  
    14841484
    14851485/** @interface_method_impl{VDINTERFACETCPNET,pfnIsClientConnected} */
    1486 static DECLCALLBACK(bool) drvvdTcpIsClientConnected(VDSOCKET Sock)
    1487 {
    1488     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1486static DECLCALLBACK(bool) drvvdTcpIsClientConnected(VDSOCKET hVdSock)
     1487{
     1488    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    14891489
    14901490    return pSockInt->hSocket != NIL_RTSOCKET;
    … …  
    14921492
    14931493/** @interface_method_impl{VDINTERFACETCPNET,pfnSelectOne} */
    1494 static DECLCALLBACK(int) drvvdTcpSelectOne(VDSOCKET Sock, RTMSINTERVAL cMillies)
    1495 {
    1496     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1494static DECLCALLBACK(int) drvvdTcpSelectOne(VDSOCKET hVdSock, RTMSINTERVAL cMillies)
     1495{
     1496    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    14971497
    14981498    return RTTcpSelectOne(pSockInt->hSocket, cMillies);
    … …  
    15001500
    15011501/** @interface_method_impl{VDINTERFACETCPNET,pfnRead} */
    1502 static DECLCALLBACK(int) drvvdTcpRead(VDSOCKET Sock, void *pvBuffer, size_t cbBuffer, size_t *pcbRead)
    1503 {
    1504     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1502static DECLCALLBACK(int) drvvdTcpRead(VDSOCKET hVdSock, void *pvBuffer, size_t cbBuffer, size_t *pcbRead)
     1503{
     1504    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    15051505
    15061506    return RTTcpRead(pSockInt->hSocket, pvBuffer, cbBuffer, pcbRead);
    … …  
    15081508
    15091509/** @interface_method_impl{VDINTERFACETCPNET,pfnWrite} */
    1510 static DECLCALLBACK(int) drvvdTcpWrite(VDSOCKET Sock, const void *pvBuffer, size_t cbBuffer)
    1511 {
    1512     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1510static DECLCALLBACK(int) drvvdTcpWrite(VDSOCKET hVdSock, const void *pvBuffer, size_t cbBuffer)
     1511{
     1512    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    15131513
    15141514    return RTTcpWrite(pSockInt->hSocket, pvBuffer, cbBuffer);
    … …  
    15161516
    15171517/** @interface_method_impl{VDINTERFACETCPNET,pfnSgWrite} */
    1518 static DECLCALLBACK(int) drvvdTcpSgWrite(VDSOCKET Sock, PCRTSGBUF pSgBuf)
    1519 {
    1520     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1518static DECLCALLBACK(int) drvvdTcpSgWrite(VDSOCKET hVdSock, PCRTSGBUF pSgBuf)
     1519{
     1520    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    15211521
    15221522    return RTTcpSgWrite(pSockInt->hSocket, pSgBuf);
    … …  
    15241524
    15251525/** @interface_method_impl{VDINTERFACETCPNET,pfnReadNB} */
    1526 static DECLCALLBACK(int) drvvdTcpReadNB(VDSOCKET Sock, void *pvBuffer, size_t cbBuffer, size_t *pcbRead)
    1527 {
    1528     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1526static DECLCALLBACK(int) drvvdTcpReadNB(VDSOCKET hVdSock, void *pvBuffer, size_t cbBuffer, size_t *pcbRead)
     1527{
     1528    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    15291529
    15301530    return RTTcpReadNB(pSockInt->hSocket, pvBuffer, cbBuffer, pcbRead);
    … …  
    15321532
    15331533/** @interface_method_impl{VDINTERFACETCPNET,pfnWriteNB} */
    1534 static DECLCALLBACK(int) drvvdTcpWriteNB(VDSOCKET Sock, const void *pvBuffer, size_t cbBuffer, size_t *pcbWritten)
    1535 {
    1536     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1534static DECLCALLBACK(int) drvvdTcpWriteNB(VDSOCKET hVdSock, const void *pvBuffer, size_t cbBuffer, size_t *pcbWritten)
     1535{
     1536    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    15371537
    15381538    return RTTcpWriteNB(pSockInt->hSocket, pvBuffer, cbBuffer, pcbWritten);
    … …  
    15401540
    15411541/** @interface_method_impl{VDINTERFACETCPNET,pfnSgWriteNB} */
    1542 static DECLCALLBACK(int) drvvdTcpSgWriteNB(VDSOCKET Sock, PRTSGBUF pSgBuf, size_t *pcbWritten)
    1543 {
    1544     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1542static DECLCALLBACK(int) drvvdTcpSgWriteNB(VDSOCKET hVdSock, PRTSGBUF pSgBuf, size_t *pcbWritten)
     1543{
     1544    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    15451545
    15461546    return RTTcpSgWriteNB(pSockInt->hSocket, pSgBuf, pcbWritten);
    … …  
    15481548
    15491549/** @interface_method_impl{VDINTERFACETCPNET,pfnFlush} */
    1550 static DECLCALLBACK(int) drvvdTcpFlush(VDSOCKET Sock)
    1551 {
    1552     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1550static DECLCALLBACK(int) drvvdTcpFlush(VDSOCKET hVdSock)
     1551{
     1552    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    15531553
    15541554    return RTTcpFlush(pSockInt->hSocket);
    … …  
    15561556
    15571557/** @interface_method_impl{VDINTERFACETCPNET,pfnSetSendCoalescing} */
    1558 static DECLCALLBACK(int) drvvdTcpSetSendCoalescing(VDSOCKET Sock, bool fEnable)
    1559 {
    1560     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1558static DECLCALLBACK(int) drvvdTcpSetSendCoalescing(VDSOCKET hVdSock, bool fEnable)
     1559{
     1560    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    15611561
    15621562    return RTTcpSetSendCoalescing(pSockInt->hSocket, fEnable);
    … …  
    15641564
    15651565/** @interface_method_impl{VDINTERFACETCPNET,pfnGetLocalAddress} */
    1566 static DECLCALLBACK(int) drvvdTcpGetLocalAddress(VDSOCKET Sock, PRTNETADDR pAddr)
    1567 {
    1568     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1566static DECLCALLBACK(int) drvvdTcpGetLocalAddress(VDSOCKET hVdSock, PRTNETADDR pAddr)
     1567{
     1568    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    15691569
    15701570    return RTTcpGetLocalAddress(pSockInt->hSocket, pAddr);
    … …  
    15721572
    15731573/** @interface_method_impl{VDINTERFACETCPNET,pfnGetPeerAddress} */
    1574 static DECLCALLBACK(int) drvvdTcpGetPeerAddress(VDSOCKET Sock, PRTNETADDR pAddr)
    1575 {
    1576     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1574static DECLCALLBACK(int) drvvdTcpGetPeerAddress(VDSOCKET hVdSock, PRTNETADDR pAddr)
     1575{
     1576    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    15771577
    15781578    return RTTcpGetPeerAddress(pSockInt->hSocket, pAddr);
    15791579}
    15801580
    1581 static DECLCALLBACK(int) drvvdTcpSelectOneExPoll(VDSOCKET Sock, uint32_t fEvents,
     1581static DECLCALLBACK(int) drvvdTcpSelectOneExPoll(VDSOCKET hVdSock, uint32_t fEvents,
    15821582                                                 uint32_t *pfEvents, RTMSINTERVAL cMillies)
    15831583{
    … …  
    15851585    uint32_t id = 0;
    15861586    uint32_t fEventsRecv = 0;
    1587     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1587    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    15881588
    15891589    *pfEvents = 0;
    … …  
    16541654
    16551655/** @interface_method_impl{VDINTERFACETCPNET,pfnSelectOneEx} */
    1656 static DECLCALLBACK(int) drvvdTcpSelectOneExNoPoll(VDSOCKET Sock, uint32_t fEvents, uint32_t *pfEvents, RTMSINTERVAL cMillies)
     1656static DECLCALLBACK(int) drvvdTcpSelectOneExNoPoll(VDSOCKET hVdSock, uint32_t fEvents, uint32_t *pfEvents, RTMSINTERVAL cMillies)
    16571657{
    16581658    RT_NOREF(cMillies); /** @todo timeouts */
    16591659    int rc = VINF_SUCCESS;
    1660     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1660    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    16611661
    16621662    *pfEvents = 0;
    … …  
    17941794
    17951795/** @interface_method_impl{VDINTERFACETCPNET,pfnPoke} */
    1796 static DECLCALLBACK(int) drvvdTcpPoke(VDSOCKET Sock)
     1796static DECLCALLBACK(int) drvvdTcpPoke(VDSOCKET hVdSock)
    17971797{
    17981798    int rc = VINF_SUCCESS;
    17991799    size_t cbWritten = 0;
    1800     PVDSOCKETINT pSockInt = (PVDSOCKETINT)Sock;
     1800    PVDSOCKETINT pSockInt = (PVDSOCKETINT)hVdSock;
    18011801
    18021802    ASMAtomicXchgBool(&pSockInt->fWokenUp, true);
    … …  
    24652465
    24662466/** @copydoc FNPDMBLKCACHEXFERCOMPLETEDRV */
    2467 static DECLCALLBACK(void) drvvdBlkCacheXferCompleteIoReq(PPDMDRVINS pDrvIns, void *pvUser, int rcReq)
     2467static DECLCALLBACK(void) drvvdBlkCacheXferCompleteIoReq(PPDMDRVINS pDrvIns, void *pvUser, int rc)
    24682468{
    24692469    PVBOXDISK pThis = PDMINS_2_DATA(pDrvIns, PVBOXDISK);
    24702470
    2471     drvvdMediaExIoReqCompleteWorker(pThis, (PPDMMEDIAEXIOREQINT)pvUser, rcReq, true /* fUpNotify */);
     2471    drvvdMediaExIoReqCompleteWorker(pThis, (PPDMMEDIAEXIOREQINT)pvUser, rc, true /* fUpNotify */);
    24722472}
    24732473
    … …  
    24762476                                                  PDMBLKCACHEXFERDIR enmXferDir,
    24772477                                                  uint64_t off, size_t cbXfer,
    2478                                                   PCRTSGBUF pcSgBuf, PPDMBLKCACHEIOXFER hIoXfer)
     2478                                                  PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer)
    24792479{
    24802480    int rc = VINF_SUCCESS;
    … …  
    24862486    {
    24872487        case PDMBLKCACHEXFERDIR_READ:
    2488             rc = VDAsyncRead(pThis->pDisk, off, cbXfer, pcSgBuf, drvvdBlkCacheReqComplete,
     2488            rc = VDAsyncRead(pThis->pDisk, off, cbXfer, pSgBuf, drvvdBlkCacheReqComplete,
    24892489                             pThis, hIoXfer);
    24902490            break;
    24912491        case PDMBLKCACHEXFERDIR_WRITE:
    2492             rc = VDAsyncWrite(pThis->pDisk, off, cbXfer, pcSgBuf, drvvdBlkCacheReqComplete,
     2492            rc = VDAsyncWrite(pThis->pDisk, off, cbXfer, pSgBuf, drvvdBlkCacheReqComplete,
    24932493                              pThis, hIoXfer);
    24942494            break;
    … …  
    28922892 *
    28932893 * @returns VBox status code.
    2894  * @param   VINF_PDM_MEDIAEX_IOREQ_IN_PROGRESS if there is no I/O memory available to allocate and
     2894 * @retval  VINF_PDM_MEDIAEX_IOREQ_IN_PROGRESS if there is no I/O memory available to allocate and
    28952895 *          the request was placed on a waiting list.
    28962896 * @param   pThis     VBox disk container instance data.
    … …  
    36843684
    36853685/**
    3686  * @interface_method_impl{PDMIMEDIAEX,pfnIoReqQuerySuspendedFirst}
     3686 * @interface_method_impl{PDMIMEDIAEX,pfnIoReqQuerySuspendedStart}
    36873687 */
    36883688static DECLCALLBACK(int) drvvdIoReqQuerySuspendedStart(PPDMIMEDIAEX pInterface, PPDMMEDIAEXIOREQ phIoReq,

  • trunk/src/VBox/Devices/Storage/HBDMgmt-darwin.cpp

    r63470 r64274  
    242242 * @returns Reference to a DADissenter object which contains the result.
    243243 * @param   hDiskRef         The disk that is about to be mounted.
    244  * @param   pvCOntext        Pointer to the block device manager.
     244 * @param   pvContext        Pointer to the block device manager.
    245245 */
    246246static DADissenterRef hbdMgrDAMountApprovalCallback(DADiskRef hDiskRef, void *pvContext)

  • trunk/src/VBox/Devices/Storage/HBDMgmt-win.cpp

    r62679 r64274  
    187187 *
    188188 * @returns VBox status code.
    189  * @param   pwszDriveWin32  The Win32 path to the block device (e.g. \\.\PhysicalDrive0 for example)
     189 * @param   pwszDriveWin32  The Win32 path to the block device (e.g. "\\.\PhysicalDrive0" for example)
    190190 * @param   ppwszDriveNt    Where to store the NT path to the volume on success.
    191191 *                          Must be freed with RTUtf16Free().

  • trunk/src/VBox/Devices/Storage/IOBufMgmt.h

    r59452 r64274  
    7373 *
    7474 * @returns VBox status code.
    75  * @param   VERR_INVALID_STATE if there is still memory allocated by the given manager.
     75 * @retval  VERR_INVALID_STATE if there is still memory allocated by the given manager.
    7676 * @param   hIoBufMgr          The I/O buffer manager.
    7777 */

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

    r64223 r64274  
    19391939
    19401940/**
    1941  * @interface_method_impl{PDMUSBREG,pfnQueue}
     1941 * @interface_method_impl{PDMUSBREG,pfnUrbQueue}
    19421942 */
    19431943static DECLCALLBACK(int) usbMsdQueue(PPDMUSBINS pUsbIns, PVUSBURB pUrb)

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

    r64224 r64274  
    277277 * @returns VBox status code.
    278278 * @param   pVBoxSCSI      Pointer to the SCSI state.
    279  * @paam    puLun          Where to store the LUN on success.
     279 * @param   puLun          Where to store the LUN on success.
    280280 * @param   ppbCdb         Where to store the pointer to the CDB on success.
    281281 * @param   pcbCdb         Where to store the size of the CDB on success.
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