Index: /trunk/include/VBox/vmm/pdmdev.h =================================================================== --- /trunk/include/VBox/vmm/pdmdev.h (revision 65100) +++ /trunk/include/VBox/vmm/pdmdev.h (revision 65101) @@ -569,5 +569,5 @@ * @param iRegion The region number. * @param cbRegion Size of the region. - * @param iType PCI_ADDRESS_SPACE_MEM, PCI_ADDRESS_SPACE_IO or PCI_ADDRESS_SPACE_MEM_PREFETCH. + * @param enmType PCI_ADDRESS_SPACE_MEM, PCI_ADDRESS_SPACE_IO or PCI_ADDRESS_SPACE_MEM_PREFETCH. * @param pfnCallback Callback for doing the mapping. * @remarks Caller enters the PDM critical section. @@ -586,5 +586,5 @@ * to call default PCI config read function. Can be NULL. * @param pfnWrite Pointer to the user defined PCI config write function. - * @param pfnWriteOld Pointer to function pointer which will receive the old (default) + * @param ppfnWriteOld Pointer to function pointer which will receive the old (default) * PCI config write function. This way, user can decide when (and if) * to call default PCI config write function. Can be NULL. Index: /trunk/include/VBox/vmm/pdmpci.h =================================================================== --- /trunk/include/VBox/vmm/pdmpci.h (revision 65100) +++ /trunk/include/VBox/vmm/pdmpci.h (revision 65101) @@ -71,5 +71,5 @@ * @param pcbRegion Where to store region size. * - * @param fMmio If region is MMIO or IO. + * @param pfFlags If region is MMIO or IO. * @thread Any thread. */ @@ -167,4 +167,6 @@ * @param pInterface Pointer to this interface structure. * @param Address Guest physical address. + * @todo Why is this documented as guest physical + * address and given a host ring-0 address type? * @param pvValue Address of value to write. * @param cb Access width. @@ -173,5 +175,5 @@ */ DECLR3CALLBACKMEMBER(int, pfnMmioWrite, (PPDMIPCIRAWUP pInterface, - RTR0PTR Address, /**< Why is this documented as guest physical address and given a host ring-0 address type??? */ + RTR0PTR Address, void const *pvValue, unsigned cb)); @@ -183,4 +185,6 @@ * @param pInterface Pointer to this interface structure. * @param Address Guest physical address. + * @todo Why is this documented as guest physical + * address and given a host ring-0 address type? * @param pvValue Place to store read value. * @param cb Access width. @@ -190,5 +194,5 @@ DECLR3CALLBACKMEMBER(int, pfnMmioRead, (PPDMIPCIRAWUP pInterface, - RTR0PTR Address, /**< Why is this documented as guest physical address and given a host ring-0 address type??? */ + RTR0PTR Address, void *pvValue, unsigned cb)); @@ -243,5 +247,4 @@ * @returns status code * @param pInterface Pointer to this interface structure. - * @param pListener Pointer to the listener object. * @param uGuestIrq Guest IRQ to be passed to pfnInterruptRequest(). * @@ -303,4 +306,5 @@ * * @param pInterface Pointer to this interface structure. + * @param fFlags Flags. * * @thread Any thread. @@ -326,6 +330,6 @@ * @param pInterface Pointer to this interface structure. * @param fFatal If error is fatal. - * @param szErrorId Error ID. - * @param szMessage Error message. + * @param pszErrorId Error ID. + * @param pszMessage Error message. * * @thread Any thread. Index: /trunk/include/VBox/vmm/pdmpcidevint.h =================================================================== --- /trunk/include/VBox/vmm/pdmpcidevint.h (revision 65100) +++ /trunk/include/VBox/vmm/pdmpcidevint.h (revision 65101) @@ -55,5 +55,5 @@ * @param iBus The bus number this device is on. * @param iDevice The number of the device on the bus. - * @param Address The configuration space register address. [0..255] + * @param u32Address The configuration space register address. [0..255] * @param cb The register size. [1,2,4] */ @@ -70,5 +70,5 @@ * @param iBus The bus number this device is on. * @param iDevice The number of the device on the bus. - * @param Address The configuration space register address. [0..255] + * @param u32Address The configuration space register address. [0..255] * @param u32Value The value that's being written. The number of bits actually used from * this value is determined by the cb parameter. Index: /trunk/src/VBox/Devices/Bus/DevPCI.cpp =================================================================== --- /trunk/src/VBox/Devices/Bus/DevPCI.cpp (revision 65100) +++ /trunk/src/VBox/Devices/Bus/DevPCI.cpp (revision 65101) @@ -271,5 +271,5 @@ * Set the IRQ for a PCI device on the host bus - shared by host bus and bridge. * - * @param pDevIns Device instance of the host PCI Bus. + * @param pGlobals Device instance of the host PCI Bus. * @param uDevFn The device number on the host bus which will raise the IRQ * @param pPciDev The PCI device structure which raised the interrupt. Index: /trunk/src/VBox/Devices/Bus/DevPciIch9.cpp =================================================================== --- /trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (revision 65100) +++ /trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (revision 65101) @@ -155,8 +155,8 @@ * @param cb The value size in bytes. */ -PDMBOTHCBDECL(int) ich9pciIOPortAddressWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb) -{ - LogFlow(("ich9pciIOPortAddressWrite: Port=%#x u32=%#x cb=%d\n", Port, u32, cb)); - RT_NOREF2(Port, pvUser); +PDMBOTHCBDECL(int) ich9pciIOPortAddressWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb) +{ + LogFlow(("ich9pciIOPortAddressWrite: Port=%#x u32=%#x cb=%d\n", uPort, u32, cb)); + RT_NOREF2(uPort, pvUser); if (cb == 4) { @@ -192,7 +192,7 @@ * @param cb Number of bytes read. */ -PDMBOTHCBDECL(int) ich9pciIOPortAddressRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb) -{ - RT_NOREF2(Port, pvUser); +PDMBOTHCBDECL(int) ich9pciIOPortAddressRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb) +{ + RT_NOREF2(uPort, pvUser); if (cb == 4) { @@ -203,9 +203,9 @@ PCI_UNLOCK(pDevIns); - LogFlow(("ich9pciIOPortAddressRead: Port=%#x cb=%d -> %#x\n", Port, cb, *pu32)); + LogFlow(("ich9pciIOPortAddressRead: Port=%#x cb=%d -> %#x\n", uPort, cb, *pu32)); return VINF_SUCCESS; } - Log(("ich9pciIOPortAddressRead: Port=%#x cb=%d VERR_IOM_IOPORT_UNUSED\n", Port, cb)); + Log(("ich9pciIOPortAddressRead: Port=%#x cb=%d VERR_IOM_IOPORT_UNUSED\n", uPort, cb)); return VERR_IOM_IOPORT_UNUSED; } @@ -301,19 +301,19 @@ * @param cb The value size in bytes. */ -PDMBOTHCBDECL(int) ich9pciIOPortDataWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb) -{ - LogFlow(("ich9pciIOPortDataWrite: Port=%#x u32=%#x cb=%d\n", Port, u32, cb)); +PDMBOTHCBDECL(int) ich9pciIOPortDataWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb) +{ + LogFlow(("ich9pciIOPortDataWrite: Port=%#x u32=%#x cb=%d\n", uPort, u32, cb)); NOREF(pvUser); int rc = VINF_SUCCESS; - if (!(Port % cb)) + if (!(uPort % cb)) { PDEVPCIROOT pThis = PDMINS_2_DATA(pDevIns, PDEVPCIROOT); PCI_LOCK(pDevIns, VINF_IOM_R3_IOPORT_WRITE); - rc = ich9pciDataWrite(pThis, Port, u32, cb); + rc = ich9pciDataWrite(pThis, uPort, u32, cb); PCI_UNLOCK(pDevIns); } else - AssertMsgFailed(("Unaligned write to port %#x u32=%#x cb=%d\n", Port, u32, cb)); + AssertMsgFailed(("Unaligned write to port %#x u32=%#x cb=%d\n", uPort, u32, cb)); return rc; } @@ -422,19 +422,19 @@ * @param cb Number of bytes read. */ -PDMBOTHCBDECL(int) ich9pciIOPortDataRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb) +PDMBOTHCBDECL(int) ich9pciIOPortDataRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb) { NOREF(pvUser); - if (!(Port % cb)) + if (!(uPort % cb)) { PDEVPCIROOT pThis = PDMINS_2_DATA(pDevIns, PDEVPCIROOT); PCI_LOCK(pDevIns, VINF_IOM_R3_IOPORT_READ); - int rc = ich9pciDataRead(pThis, Port, cb, pu32); + int rc = ich9pciDataRead(pThis, uPort, cb, pu32); PCI_UNLOCK(pDevIns); - LogFlow(("ich9pciIOPortDataRead: Port=%#x cb=%#x -> %#x (%Rrc)\n", Port, cb, *pu32, rc)); + LogFlow(("ich9pciIOPortDataRead: Port=%#x cb=%#x -> %#x (%Rrc)\n", uPort, cb, *pu32, rc)); return rc; } - AssertMsgFailed(("Unaligned read from port %#x cb=%d\n", Port, cb)); + AssertMsgFailed(("Unaligned read from port %#x cb=%d\n", uPort, cb)); return VERR_IOM_IOPORT_UNUSED; } @@ -1909,5 +1909,5 @@ * Worker for devpciR3IsConfigByteWritable that update BAR and ROM mappings. * - * @param pDev The PCI device to update the mappings for. + * @param pPciDev The PCI device to update the mappings for. * @param fP2PBridge Whether this is a PCI to PCI bridge or not. */ Index: /trunk/src/VBox/Devices/GIMDev/GIMDev.cpp =================================================================== --- /trunk/src/VBox/Devices/GIMDev/GIMDev.cpp (revision 65100) +++ /trunk/src/VBox/Devices/GIMDev/GIMDev.cpp (revision 65101) @@ -73,5 +73,5 @@ /** - * @interface_method_impl{PDMIBASE, pfnQueryInterface} + * @interface_method_impl{PDMIBASE,pfnQueryInterface} */ static DECLCALLBACK(void *) gimdevR3QueryInterface(PPDMIBASE pInterface, const char *pszIID) Index: /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp =================================================================== --- /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (revision 65100) +++ /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (revision 65101) @@ -535,9 +535,9 @@ * @interface_method_impl{PDMIDISPLAYPORT,pfnSetViewport} */ -DECLCALLBACK(void) vmsvgaPortSetViewport(PPDMIDISPLAYPORT pInterface, uint32_t uScreenId, uint32_t x, uint32_t y, uint32_t cx, uint32_t cy) +DECLCALLBACK(void) vmsvgaPortSetViewport(PPDMIDISPLAYPORT pInterface, uint32_t idScreen, uint32_t x, uint32_t y, uint32_t cx, uint32_t cy) { PVGASTATE pThis = RT_FROM_MEMBER(pInterface, VGASTATE, IPort); - Log(("vmsvgaPortSetViewPort: screen %d (%d,%d)(%d,%d)\n", uScreenId, x, y, cx, cy)); + Log(("vmsvgaPortSetViewPort: screen %d (%d,%d)(%d,%d)\n", idScreen, x, y, cx, cy)); VMSVGAVIEWPORT const OldViewport = pThis->svga.viewport; @@ -574,7 +574,7 @@ */ if (pThis->svga.f3DEnabled) - vmsvga3dUpdateHostScreenViewport(pThis, uScreenId, &OldViewport); + vmsvga3dUpdateHostScreenViewport(pThis, idScreen, &OldViewport); # else - RT_NOREF(uScreenId, OldViewport); + RT_NOREF(idScreen, OldViewport); # endif } @@ -1483,5 +1483,5 @@ * @param cb Number of bytes read. */ -PDMBOTHCBDECL(int) vmsvgaIORead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb) +PDMBOTHCBDECL(int) vmsvgaIORead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb) { PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE); @@ -1491,10 +1491,10 @@ if (cb != 4) { - Log(("Ignoring non-dword read at %x cb=%d\n", Port, cb)); + Log(("Ignoring non-dword read at %x cb=%d\n", uPort, cb)); *pu32 = UINT32_MAX; return VINF_SUCCESS; } - switch (Port - pThis->svga.BasePort) + switch (uPort - pThis->svga.BasePort) { case SVGA_INDEX_PORT: @@ -1530,5 +1530,5 @@ * @param cb The value size in bytes. */ -PDMBOTHCBDECL(int) vmsvgaIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb) +PDMBOTHCBDECL(int) vmsvgaIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb) { PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE); @@ -1538,9 +1538,9 @@ if (cb != 4) { - Log(("Ignoring non-dword write at %x val=%x cb=%d\n", Port, u32, cb)); + Log(("Ignoring non-dword write at %x val=%x cb=%d\n", uPort, u32, cb)); return VINF_SUCCESS; } - switch (Port - pThis->svga.BasePort) + switch (uPort - pThis->svga.BasePort) { case SVGA_INDEX_PORT: Index: /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp =================================================================== --- /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp (revision 65100) +++ /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp (revision 65101) @@ -173,5 +173,4 @@ * @returns true if supported, false if not. * @param pState The VMSVGA3d state. - * @param fActualGLVersion The actual OpenGL version we're working against. * @param rsMinGLVersion The OpenGL version that introduced this feature * into the core. Index: /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.cpp =================================================================== --- /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.cpp (revision 65100) +++ /trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.cpp (revision 65101) @@ -342,5 +342,9 @@ * @returns VBox status code (currently ignored). * @param pThis The VGA device instance data. - * @param sid The ID of the surface to destroy. + * @param pDstSfcImg + * @param pDstBox + * @param pSrcSfcImg + * @param pSrcBox + * @param enmMode */ int vmsvga3dSurfaceStretchBlt(PVGASTATE pThis, SVGA3dSurfaceImageId const *pDstSfcImg, SVGA3dBox const *pDstBox, Index: /trunk/src/VBox/Devices/Graphics/DevVGA.cpp =================================================================== --- /trunk/src/VBox/Devices/Graphics/DevVGA.cpp (revision 65100) +++ /trunk/src/VBox/Devices/Graphics/DevVGA.cpp (revision 65101) @@ -2091,7 +2091,8 @@ * @param cx The width. * @param cy The height. + * @param pDrv The display connector. */ static int vga_resize_graphic(PVGASTATE pThis, int cx, int cy, - PDMIDISPLAYCONNECTOR *pDrv) + PDMIDISPLAYCONNECTOR *pDrv) { const unsigned cBits = pThis->get_bpp(pThis); @@ -3866,5 +3867,5 @@ * @returns VBox status code. * - * @param cbDepth Logo depth. + * @param cBits Logo depth. * @param xLogo Logo X position. * @param yLogo Logo Y position. @@ -4611,4 +4612,7 @@ * * @param pInterface Pointer to this interface. + * @param bpp Bits per pixel. + * @param pvVRAM VRAM. + * @param cbLine Number of bytes per line. * @param cx New display width. * @param cy New display height @@ -4768,4 +4772,5 @@ * * @param pInterface Pointer to this interface. + * @param fFailOnResize Fail on resize. * @see PDMIKEYBOARDPORT::pfnUpdateDisplayAll() for details. */ @@ -5585,5 +5590,5 @@ /** - * @copydoc FNSSMDEVSAVEEXEC + * @copydoc FNSSMDEVLOADEXEC */ static DECLCALLBACK(int) vgaR3LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass) Index: /trunk/src/VBox/Devices/PC/DevACPI.cpp =================================================================== --- /trunk/src/VBox/Devices/PC/DevACPI.cpp (revision 65100) +++ /trunk/src/VBox/Devices/PC/DevACPI.cpp (revision 65101) @@ -3266,10 +3266,10 @@ * @callback_method_impl{FNPCICONFIGREAD} */ -static DECLCALLBACK(uint32_t) acpiR3PciConfigRead(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t Address, unsigned cb) +static DECLCALLBACK(uint32_t) acpiR3PciConfigRead(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t uAddress, unsigned cb) { ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *); - Log2(("acpi: PCI config read: 0x%x (%d)\n", Address, cb)); - return pThis->pfnAcpiPciConfigRead(pDevIns, pPciDev, Address, cb); + Log2(("acpi: PCI config read: 0x%x (%d)\n", uAddress, cb)); + return pThis->pfnAcpiPciConfigRead(pDevIns, pPciDev, uAddress, cb); } @@ -3277,13 +3277,13 @@ * @callback_method_impl{FNPCICONFIGWRITE} */ -static DECLCALLBACK(void) acpiR3PciConfigWrite(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t Address, +static DECLCALLBACK(void) acpiR3PciConfigWrite(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t uAddress, uint32_t u32Value, unsigned cb) { ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *); - Log2(("acpi: PCI config write: 0x%x -> 0x%x (%d)\n", u32Value, Address, cb)); + Log2(("acpi: PCI config write: 0x%x -> 0x%x (%d)\n", u32Value, uAddress, cb)); DEVACPI_LOCK_R3(pThis); - if (Address == VBOX_PCI_INTERRUPT_LINE) + if (uAddress == VBOX_PCI_INTERRUPT_LINE) { Log(("acpi: ignore interrupt line settings: %d, we'll use hardcoded value %d\n", u32Value, SCI_INT)); @@ -3291,5 +3291,5 @@ } - pThis->pfnAcpiPciConfigWrite(pDevIns, pPciDev, Address, u32Value, cb); + pThis->pfnAcpiPciConfigWrite(pDevIns, pPciDev, uAddress, u32Value, cb); /* Assume that the base address is only changed when the corresponding @@ -3297,5 +3297,5 @@ * functionality is enabled by the guest. */ - if (Address == PMREGMISC) + if (uAddress == PMREGMISC) { RTIOPORT NewIoPortBase = 0; @@ -3311,5 +3311,5 @@ } - if (Address == SMBHSTCFG) + if (uAddress == SMBHSTCFG) { RTIOPORT NewIoPortBase = 0; Index: /trunk/src/VBox/Devices/Storage/IOBufMgmt.cpp =================================================================== --- /trunk/src/VBox/Devices/Storage/IOBufMgmt.cpp (revision 65100) +++ /trunk/src/VBox/Devices/Storage/IOBufMgmt.cpp (revision 65101) @@ -114,5 +114,5 @@ * @param cbMem Size of the memory buffer. * @param cBins Number of bins available. - * @param cbBinMin Minimum object size. + * @param cbMinBin Minimum object size. */ DECLINLINE(uint32_t) iobufMgrGetObjCount(size_t cbMem, unsigned cBins, size_t cbMinBin) Index: /trunk/src/VBox/Devices/Storage/UsbMsd.cpp =================================================================== --- /trunk/src/VBox/Devices/Storage/UsbMsd.cpp (revision 65100) +++ /trunk/src/VBox/Devices/Storage/UsbMsd.cpp (revision 65101) @@ -1207,5 +1207,5 @@ /** - * @interface_method_impl{PDMISCSIPORT,pfnQueryDeviceLocation} + * @interface_method_impl{PDMIMEDIAPORT,pfnQueryDeviceLocation} */ static DECLCALLBACK(int) usbMsdLun0QueryDeviceLocation(PPDMIMEDIAPORT pInterface, const char **ppcszController,