- Timestamp:
- Jan 4, 2017 12:07:43 PM (8 years ago)
- Location:
- trunk/src/VBox/Devices
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Bus/DevPCI.cpp
r64706 r65101 271 271 * Set the IRQ for a PCI device on the host bus - shared by host bus and bridge. 272 272 * 273 * @param p DevInsDevice instance of the host PCI Bus.273 * @param pGlobals Device instance of the host PCI Bus. 274 274 * @param uDevFn The device number on the host bus which will raise the IRQ 275 275 * @param pPciDev The PCI device structure which raised the interrupt. -
trunk/src/VBox/Devices/Bus/DevPciIch9.cpp
r65058 r65101 155 155 * @param cb The value size in bytes. 156 156 */ 157 PDMBOTHCBDECL(int) ich9pciIOPortAddressWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)158 { 159 LogFlow(("ich9pciIOPortAddressWrite: Port=%#x u32=%#x cb=%d\n", Port, u32, cb));160 RT_NOREF2( Port, pvUser);157 PDMBOTHCBDECL(int) ich9pciIOPortAddressWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb) 158 { 159 LogFlow(("ich9pciIOPortAddressWrite: Port=%#x u32=%#x cb=%d\n", uPort, u32, cb)); 160 RT_NOREF2(uPort, pvUser); 161 161 if (cb == 4) 162 162 { … … 192 192 * @param cb Number of bytes read. 193 193 */ 194 PDMBOTHCBDECL(int) ich9pciIOPortAddressRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)195 { 196 RT_NOREF2( Port, pvUser);194 PDMBOTHCBDECL(int) ich9pciIOPortAddressRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb) 195 { 196 RT_NOREF2(uPort, pvUser); 197 197 if (cb == 4) 198 198 { … … 203 203 PCI_UNLOCK(pDevIns); 204 204 205 LogFlow(("ich9pciIOPortAddressRead: Port=%#x cb=%d -> %#x\n", Port, cb, *pu32));205 LogFlow(("ich9pciIOPortAddressRead: Port=%#x cb=%d -> %#x\n", uPort, cb, *pu32)); 206 206 return VINF_SUCCESS; 207 207 } 208 208 209 Log(("ich9pciIOPortAddressRead: Port=%#x cb=%d VERR_IOM_IOPORT_UNUSED\n", Port, cb));209 Log(("ich9pciIOPortAddressRead: Port=%#x cb=%d VERR_IOM_IOPORT_UNUSED\n", uPort, cb)); 210 210 return VERR_IOM_IOPORT_UNUSED; 211 211 } … … 301 301 * @param cb The value size in bytes. 302 302 */ 303 PDMBOTHCBDECL(int) ich9pciIOPortDataWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)304 { 305 LogFlow(("ich9pciIOPortDataWrite: Port=%#x u32=%#x cb=%d\n", Port, u32, cb));303 PDMBOTHCBDECL(int) ich9pciIOPortDataWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb) 304 { 305 LogFlow(("ich9pciIOPortDataWrite: Port=%#x u32=%#x cb=%d\n", uPort, u32, cb)); 306 306 NOREF(pvUser); 307 307 int rc = VINF_SUCCESS; 308 if (!( Port % cb))308 if (!(uPort % cb)) 309 309 { 310 310 PDEVPCIROOT pThis = PDMINS_2_DATA(pDevIns, PDEVPCIROOT); 311 311 312 312 PCI_LOCK(pDevIns, VINF_IOM_R3_IOPORT_WRITE); 313 rc = ich9pciDataWrite(pThis, Port, u32, cb);313 rc = ich9pciDataWrite(pThis, uPort, u32, cb); 314 314 PCI_UNLOCK(pDevIns); 315 315 } 316 316 else 317 AssertMsgFailed(("Unaligned write to port %#x u32=%#x cb=%d\n", Port, u32, cb));317 AssertMsgFailed(("Unaligned write to port %#x u32=%#x cb=%d\n", uPort, u32, cb)); 318 318 return rc; 319 319 } … … 422 422 * @param cb Number of bytes read. 423 423 */ 424 PDMBOTHCBDECL(int) ich9pciIOPortDataRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)424 PDMBOTHCBDECL(int) ich9pciIOPortDataRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb) 425 425 { 426 426 NOREF(pvUser); 427 if (!( Port % cb))427 if (!(uPort % cb)) 428 428 { 429 429 PDEVPCIROOT pThis = PDMINS_2_DATA(pDevIns, PDEVPCIROOT); 430 430 431 431 PCI_LOCK(pDevIns, VINF_IOM_R3_IOPORT_READ); 432 int rc = ich9pciDataRead(pThis, Port, cb, pu32);432 int rc = ich9pciDataRead(pThis, uPort, cb, pu32); 433 433 PCI_UNLOCK(pDevIns); 434 434 435 LogFlow(("ich9pciIOPortDataRead: Port=%#x cb=%#x -> %#x (%Rrc)\n", Port, cb, *pu32, rc));435 LogFlow(("ich9pciIOPortDataRead: Port=%#x cb=%#x -> %#x (%Rrc)\n", uPort, cb, *pu32, rc)); 436 436 return rc; 437 437 } 438 AssertMsgFailed(("Unaligned read from port %#x cb=%d\n", Port, cb));438 AssertMsgFailed(("Unaligned read from port %#x cb=%d\n", uPort, cb)); 439 439 return VERR_IOM_IOPORT_UNUSED; 440 440 } … … 1909 1909 * Worker for devpciR3IsConfigByteWritable that update BAR and ROM mappings. 1910 1910 * 1911 * @param p DevThe PCI device to update the mappings for.1911 * @param pPciDev The PCI device to update the mappings for. 1912 1912 * @param fP2PBridge Whether this is a PCI to PCI bridge or not. 1913 1913 */ -
trunk/src/VBox/Devices/GIMDev/GIMDev.cpp
r64373 r65101 73 73 74 74 /** 75 * @interface_method_impl{PDMIBASE, 75 * @interface_method_impl{PDMIBASE,pfnQueryInterface} 76 76 */ 77 77 static DECLCALLBACK(void *) gimdevR3QueryInterface(PPDMIBASE pInterface, const char *pszIID) -
trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp
r64482 r65101 535 535 * @interface_method_impl{PDMIDISPLAYPORT,pfnSetViewport} 536 536 */ 537 DECLCALLBACK(void) vmsvgaPortSetViewport(PPDMIDISPLAYPORT pInterface, uint32_t uScreenId, uint32_t x, uint32_t y, uint32_t cx, uint32_t cy)537 DECLCALLBACK(void) vmsvgaPortSetViewport(PPDMIDISPLAYPORT pInterface, uint32_t idScreen, uint32_t x, uint32_t y, uint32_t cx, uint32_t cy) 538 538 { 539 539 PVGASTATE pThis = RT_FROM_MEMBER(pInterface, VGASTATE, IPort); 540 540 541 Log(("vmsvgaPortSetViewPort: screen %d (%d,%d)(%d,%d)\n", uScreenId, x, y, cx, cy));541 Log(("vmsvgaPortSetViewPort: screen %d (%d,%d)(%d,%d)\n", idScreen, x, y, cx, cy)); 542 542 VMSVGAVIEWPORT const OldViewport = pThis->svga.viewport; 543 543 … … 574 574 */ 575 575 if (pThis->svga.f3DEnabled) 576 vmsvga3dUpdateHostScreenViewport(pThis, uScreenId, &OldViewport);576 vmsvga3dUpdateHostScreenViewport(pThis, idScreen, &OldViewport); 577 577 # else 578 RT_NOREF( uScreenId, OldViewport);578 RT_NOREF(idScreen, OldViewport); 579 579 # endif 580 580 } … … 1483 1483 * @param cb Number of bytes read. 1484 1484 */ 1485 PDMBOTHCBDECL(int) vmsvgaIORead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)1485 PDMBOTHCBDECL(int) vmsvgaIORead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb) 1486 1486 { 1487 1487 PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE); … … 1491 1491 if (cb != 4) 1492 1492 { 1493 Log(("Ignoring non-dword read at %x cb=%d\n", Port, cb));1493 Log(("Ignoring non-dword read at %x cb=%d\n", uPort, cb)); 1494 1494 *pu32 = UINT32_MAX; 1495 1495 return VINF_SUCCESS; 1496 1496 } 1497 1497 1498 switch ( Port - pThis->svga.BasePort)1498 switch (uPort - pThis->svga.BasePort) 1499 1499 { 1500 1500 case SVGA_INDEX_PORT: … … 1530 1530 * @param cb The value size in bytes. 1531 1531 */ 1532 PDMBOTHCBDECL(int) vmsvgaIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)1532 PDMBOTHCBDECL(int) vmsvgaIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb) 1533 1533 { 1534 1534 PVGASTATE pThis = PDMINS_2_DATA(pDevIns, PVGASTATE); … … 1538 1538 if (cb != 4) 1539 1539 { 1540 Log(("Ignoring non-dword write at %x val=%x cb=%d\n", Port, u32, cb));1540 Log(("Ignoring non-dword write at %x val=%x cb=%d\n", uPort, u32, cb)); 1541 1541 return VINF_SUCCESS; 1542 1542 } 1543 1543 1544 switch ( Port - pThis->svga.BasePort)1544 switch (uPort - pThis->svga.BasePort) 1545 1545 { 1546 1546 case SVGA_INDEX_PORT: -
trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp
r64483 r65101 173 173 * @returns true if supported, false if not. 174 174 * @param pState The VMSVGA3d state. 175 * @param fActualGLVersion The actual OpenGL version we're working against.176 175 * @param rsMinGLVersion The OpenGL version that introduced this feature 177 176 * into the core. -
trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d.cpp
r64483 r65101 342 342 * @returns VBox status code (currently ignored). 343 343 * @param pThis The VGA device instance data. 344 * @param sid The ID of the surface to destroy. 344 * @param pDstSfcImg 345 * @param pDstBox 346 * @param pSrcSfcImg 347 * @param pSrcBox 348 * @param enmMode 345 349 */ 346 350 int vmsvga3dSurfaceStretchBlt(PVGASTATE pThis, SVGA3dSurfaceImageId const *pDstSfcImg, SVGA3dBox const *pDstBox, -
trunk/src/VBox/Devices/Graphics/DevVGA.cpp
r64960 r65101 2091 2091 * @param cx The width. 2092 2092 * @param cy The height. 2093 * @param pDrv The display connector. 2093 2094 */ 2094 2095 static int vga_resize_graphic(PVGASTATE pThis, int cx, int cy, 2095 PDMIDISPLAYCONNECTOR *pDrv)2096 PDMIDISPLAYCONNECTOR *pDrv) 2096 2097 { 2097 2098 const unsigned cBits = pThis->get_bpp(pThis); … … 3866 3867 * @returns VBox status code. 3867 3868 * 3868 * @param c bDepthLogo depth.3869 * @param cBits Logo depth. 3869 3870 * @param xLogo Logo X position. 3870 3871 * @param yLogo Logo Y position. … … 4611 4612 * 4612 4613 * @param pInterface Pointer to this interface. 4614 * @param bpp Bits per pixel. 4615 * @param pvVRAM VRAM. 4616 * @param cbLine Number of bytes per line. 4613 4617 * @param cx New display width. 4614 4618 * @param cy New display height … … 4768 4772 * 4769 4773 * @param pInterface Pointer to this interface. 4774 * @param fFailOnResize Fail on resize. 4770 4775 * @see PDMIKEYBOARDPORT::pfnUpdateDisplayAll() for details. 4771 4776 */ … … 5585 5590 5586 5591 /** 5587 * @copydoc FNSSMDEV SAVEEXEC5592 * @copydoc FNSSMDEVLOADEXEC 5588 5593 */ 5589 5594 static DECLCALLBACK(int) vgaR3LoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass) -
trunk/src/VBox/Devices/PC/DevACPI.cpp
r64393 r65101 3266 3266 * @callback_method_impl{FNPCICONFIGREAD} 3267 3267 */ 3268 static DECLCALLBACK(uint32_t) acpiR3PciConfigRead(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t Address, unsigned cb)3268 static DECLCALLBACK(uint32_t) acpiR3PciConfigRead(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t uAddress, unsigned cb) 3269 3269 { 3270 3270 ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *); 3271 3271 3272 Log2(("acpi: PCI config read: 0x%x (%d)\n", Address, cb));3273 return pThis->pfnAcpiPciConfigRead(pDevIns, pPciDev, Address, cb);3272 Log2(("acpi: PCI config read: 0x%x (%d)\n", uAddress, cb)); 3273 return pThis->pfnAcpiPciConfigRead(pDevIns, pPciDev, uAddress, cb); 3274 3274 } 3275 3275 … … 3277 3277 * @callback_method_impl{FNPCICONFIGWRITE} 3278 3278 */ 3279 static DECLCALLBACK(void) acpiR3PciConfigWrite(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t Address,3279 static DECLCALLBACK(void) acpiR3PciConfigWrite(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t uAddress, 3280 3280 uint32_t u32Value, unsigned cb) 3281 3281 { 3282 3282 ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *); 3283 3283 3284 Log2(("acpi: PCI config write: 0x%x -> 0x%x (%d)\n", u32Value, Address, cb));3284 Log2(("acpi: PCI config write: 0x%x -> 0x%x (%d)\n", u32Value, uAddress, cb)); 3285 3285 DEVACPI_LOCK_R3(pThis); 3286 3286 3287 if ( Address == VBOX_PCI_INTERRUPT_LINE)3287 if (uAddress == VBOX_PCI_INTERRUPT_LINE) 3288 3288 { 3289 3289 Log(("acpi: ignore interrupt line settings: %d, we'll use hardcoded value %d\n", u32Value, SCI_INT)); … … 3291 3291 } 3292 3292 3293 pThis->pfnAcpiPciConfigWrite(pDevIns, pPciDev, Address, u32Value, cb);3293 pThis->pfnAcpiPciConfigWrite(pDevIns, pPciDev, uAddress, u32Value, cb); 3294 3294 3295 3295 /* Assume that the base address is only changed when the corresponding … … 3297 3297 * functionality is enabled by the guest. */ 3298 3298 3299 if ( Address == PMREGMISC)3299 if (uAddress == PMREGMISC) 3300 3300 { 3301 3301 RTIOPORT NewIoPortBase = 0; … … 3311 3311 } 3312 3312 3313 if ( Address == SMBHSTCFG)3313 if (uAddress == SMBHSTCFG) 3314 3314 { 3315 3315 RTIOPORT NewIoPortBase = 0; -
trunk/src/VBox/Devices/Storage/IOBufMgmt.cpp
r64789 r65101 114 114 * @param cbMem Size of the memory buffer. 115 115 * @param cBins Number of bins available. 116 * @param cb BinMin Minimum object size.116 * @param cbMinBin Minimum object size. 117 117 */ 118 118 DECLINLINE(uint32_t) iobufMgrGetObjCount(size_t cbMem, unsigned cBins, size_t cbMinBin) -
trunk/src/VBox/Devices/Storage/UsbMsd.cpp
r64274 r65101 1207 1207 1208 1208 /** 1209 * @interface_method_impl{PDMI SCSIPORT,pfnQueryDeviceLocation}1209 * @interface_method_impl{PDMIMEDIAPORT,pfnQueryDeviceLocation} 1210 1210 */ 1211 1211 static DECLCALLBACK(int) usbMsdLun0QueryDeviceLocation(PPDMIMEDIAPORT pInterface, const char **ppcszController,
Note:
See TracChangeset
for help on using the changeset viewer.