VirtualBox

Changeset 64276 in vbox


Ignore:
Timestamp:
Oct 14, 2016 11:16:06 AM (8 years ago)
Author:
vboxsync
Message:

Serial,Parallel: Doxygen fixes

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r63606 r64276  
    12491249     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
    12501250     * @param   pvBuf           Where to store the read bits.
    1251      * @param   cbRead          Number of bytes to read/bytes actually read.
     1251     * @param   pcbRead         Number of bytes to read/bytes actually read.
    12521252     * @thread  Any thread.
    12531253     */
    1254     DECLR3CALLBACKMEMBER(int, pfnRead,(PPDMISTREAM pInterface, void *pvBuf, size_t *cbRead));
     1254    DECLR3CALLBACKMEMBER(int, pfnRead,(PPDMISTREAM pInterface, void *pvBuf, size_t *pcbRead));
    12551255
    12561256    /**
    … …  
    12601260     * @param   pInterface      Pointer to the interface structure containing the called function pointer.
    12611261     * @param   pvBuf           Where to store the write bits.
    1262      * @param   cbWrite         Number of bytes to write/bytes actually written.
     1262     * @param   pcbWrite        Number of bytes to write/bytes actually written.
    12631263     * @thread  Any thread.
    12641264     */
    1265     DECLR3CALLBACKMEMBER(int, pfnWrite,(PPDMISTREAM pInterface, const void *pvBuf, size_t *cbWrite));
     1265    DECLR3CALLBACKMEMBER(int, pfnWrite,(PPDMISTREAM pInterface, const void *pvBuf, size_t *pcbWrite));
    12661266} PDMISTREAM;
    12671267/** PDMISTREAM interface ID. */

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

    r62925 r64276  
    160160*********************************************************************************************************************************/
    161161RT_C_DECLS_BEGIN
    162 PDMBOTHCBDECL(int) parallelIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb);
    163 PDMBOTHCBDECL(int) parallelIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb);
     162PDMBOTHCBDECL(int) parallelIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb);
     163PDMBOTHCBDECL(int) parallelIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb);
    164164#if 0
    165165PDMBOTHCBDECL(int) parallelIOPortReadECP(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb);
    … …  
    319319 * @callback_method_impl{FNIOMIOPORTOUT}
    320320 */
    321 PDMBOTHCBDECL(int) parallelIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
     321PDMBOTHCBDECL(int) parallelIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb)
    322322{
    323323    PARALLELPORT *pThis = PDMINS_2_DATA(pDevIns, PPARALLELPORT);
    … …  
    329329        uint8_t u8 = u32;
    330330
    331         Log2(("%s: port %#06x val %#04x\n", __FUNCTION__, Port, u32));
    332 
    333         Port &= 7;
    334         switch (Port)
     331        Log2(("%s: port %#06x val %#04x\n", __FUNCTION__, uPort, u32));
     332
     333        uPort &= 7;
     334        switch (uPort)
    335335        {
    336336            case 0:
    … …  
    417417    }
    418418    else
    419         AssertMsgFailed(("Port=%#x cb=%d u32=%#x\n", Port, cb, u32));
     419        AssertMsgFailed(("Port=%#x cb=%d u32=%#x\n", uPort, cb, u32));
    420420
    421421    return rc;
    … …  
    426426 * @callback_method_impl{FNIOMIOPORTIN}
    427427 */
    428 PDMBOTHCBDECL(int) parallelIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
     428PDMBOTHCBDECL(int) parallelIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb)
    429429{
    430430    PARALLELPORT *pThis = PDMINS_2_DATA(pDevIns, PARALLELPORT *);
    … …  
    434434    if (cb == 1)
    435435    {
    436         Port &= 7;
    437         switch (Port)
     436        uPort &= 7;
     437        switch (uPort)
    438438        {
    439439            case 0:

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

    r64010 r64276  
    4747#endif
    4848
    49 /** @def VBOX_WITH_WIN_PARPORT_SUP *
     49/** @def VBOX_WITH_WIN_PARPORT_SUP
    5050 * Indicates whether to use the generic direct hardware access or host specific
    5151 * code to access the parallel port.
    5252 */
     53#if defined(DOXYGEN_RUNNING)
     54# define VBOX_WITH_WIN_PARPORT_SUP
     55#endif
    5356#if defined(RT_OS_LINUX)
    5457# undef VBOX_WITH_WIN_PARPORT_SUP
    … …  
    270273
    271274/**
    272  * @interface_method_impl{FNPDMDRVREQHANDLERR0}
     275 * @callback_method_impl{FNPDMDRVREQHANDLERR0}
    273276 */
    274277PDMBOTHCBDECL(int) drvR0HostParallelReqHandler(PPDMDRVINS pDrvIns, uint32_t uOperation, uint64_t u64Arg)

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

    r63690 r64276  
    856856 * @callback_method_impl{FNIOMIOPORTOUT}
    857857 */
    858 PDMBOTHCBDECL(int) serialIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
     858PDMBOTHCBDECL(int) serialIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb)
    859859{
    860860    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
    … …  
    865865    if (cb == 1)
    866866    {
    867         Log2(("%s: port %#06x val %#04x\n", __FUNCTION__, Port, u32));
    868         rc = serial_ioport_write(pThis, Port, u32);
     867        Log2(("%s: port %#06x val %#04x\n", __FUNCTION__, uPort, u32));
     868        rc = serial_ioport_write(pThis, uPort, u32);
    869869    }
    870870    else
    871871    {
    872         AssertMsgFailed(("Port=%#x cb=%d u32=%#x\n", Port, cb, u32));
     872        AssertMsgFailed(("uPort=%#x cb=%d u32=%#x\n", uPort, cb, u32));
    873873        rc = VINF_SUCCESS;
    874874    }
    … …  
    881881 * @callback_method_impl{FNIOMIOPORTIN}
    882882 */
    883 PDMBOTHCBDECL(int) serialIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
     883PDMBOTHCBDECL(int) serialIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb)
    884884{
    885885    PDEVSERIAL pThis = PDMINS_2_DATA(pDevIns, PDEVSERIAL);
    … …  
    890890    if (cb == 1)
    891891    {
    892         *pu32 = serial_ioport_read(pThis, Port, &rc);
    893         Log2(("%s: port %#06x val %#04x\n", __FUNCTION__, Port, *pu32));
     892        *pu32 = serial_ioport_read(pThis, uPort, &rc);
     893        Log2(("%s: port %#06x val %#04x\n", __FUNCTION__, uPort, *pu32));
    894894    }
    895895    else

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

    r63591 r64276  
    450450 *
    451451 * @returns VINF_SUCCESS.
    452  * @param   ThreadSelf  Thread handle to this thread.
    453  * @param   pvUser      User argument.
     452 * @param   pDrvIns     PDM driver instance data.
     453 * @param   pThread     The PDM thread data.
    454454 */
    455455static DECLCALLBACK(int) drvHostSerialSendThread(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
    … …  
    566566 * @param     pThread     The send thread.
    567567 */
    568 static DECLCALLBACK(int) drvHostSerialWakeupSendThread(PPDMDRVINS pDrvIns, PPDMTHREAD /*pThread*/)
     568static DECLCALLBACK(int) drvHostSerialWakeupSendThread(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
    569569{
     570    RT_NOREF(pThread);
    570571    PDRVHOSTSERIAL pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTSERIAL);
    571572    int rc;
    … …  
    592593 *
    593594 * @returns VINF_SUCCESS.
    594  * @param   ThreadSelf  Thread handle to this thread.
    595  * @param   pvUser      User argument.
     595 * @param   pDrvIns     PDM driver instance data.
     596 * @param   pThread     The PDM thread data.
    596597 */
    597598static DECLCALLBACK(int) drvHostSerialRecvThread(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
    … …  
    855856
    856857/**
    857  * Unblock the send thread so it can respond to a state change.
     858 * Unblock the receive thread so it can respond to a state change.
    858859 *
    859860 * @returns a VBox status code.
    860861 * @param     pDrvIns     The driver instance.
    861  * @param     pThread     The send thread.
    862  */
    863 static DECLCALLBACK(int) drvHostSerialWakeupRecvThread(PPDMDRVINS pDrvIns, PPDMTHREAD /*pThread*/)
     862 * @param     pThread     The receive thread.
     863 */
     864static DECLCALLBACK(int) drvHostSerialWakeupRecvThread(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
    864865{
     866    RT_NOREF(pThread);
    865867    PDRVHOSTSERIAL pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTSERIAL);
    866868#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
    … …  
    887889 *
    888890 * @returns VINF_SUCCESS.
    889  * @param   ThreadSelf  Thread handle to this thread.
    890  * @param   pvUser      User argument.
     891 * @param   pDrvIns     PDM driver instance data.
     892 * @param   pThread     The PDM thread data.
    891893 */
    892894static DECLCALLBACK(int) drvHostSerialMonitorThread(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
    … …  
    11511153 * @copydoc FNPDMDRVCONSTRUCT
    11521154 */
    1153 static DECLCALLBACK(int) drvHostSerialConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t /*fFlags*/)
     1155static DECLCALLBACK(int) drvHostSerialConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    11541156{
     1157    RT_NOREF1(fFlags);
    11551158    PDRVHOSTSERIAL pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTSERIAL);
    11561159    LogFlow(("%s: iInstance=%d\n", __FUNCTION__, pDrvIns->iInstance));
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