Changeset 7752 in vbox
- Timestamp:
- Apr 4, 2008 5:35:14 PM (17 years ago)
- svn:sync-xref-src-repo-rev:
- 29296
- Location:
- trunk
- Files:
-
- 6 edited
-
include/VBox/iom.h (modified) (1 diff)
-
include/VBox/pdmdev.h (modified) (4 diffs)
-
src/VBox/Devices/Graphics/DevVGA.cpp (modified) (2 diffs)
-
src/VBox/Devices/PC/DevAPIC.cpp (modified) (4 diffs)
-
src/VBox/VMM/IOM.cpp (modified) (4 diffs)
-
src/VBox/VMM/PDMDevice.cpp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/iom.h
r7726 r7752 246 246 247 247 IOMR3DECL(int) IOMR3MMIORegisterR3(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser, 248 R3PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, R3PTRTYPE(PFNIOMMMIOREAD) pfnReadCallback, 249 R3PTRTYPE(PFNIOMMMIOFILL) pfnFillCallback, const char *pszDesc); 248 R3PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, 249 R3PTRTYPE(PFNIOMMMIOREAD) pfnReadCallback, 250 R3PTRTYPE(PFNIOMMMIOFILL) pfnFillCallback, const char *pszDesc); 250 251 IOMR3DECL(int) IOMR3MMIORegisterR0(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser, 251 R0PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, R0PTRTYPE(PFNIOMMMIOREAD) pfnReadCallback, 252 R0PTRTYPE(PFNIOMMMIOFILL) pfnFillCallback, const char *pszDesc); 252 R0PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, 253 R0PTRTYPE(PFNIOMMMIOREAD) pfnReadCallback, 254 R0PTRTYPE(PFNIOMMMIOFILL) pfnFillCallback); 253 255 IOMR3DECL(int) IOMR3MMIORegisterGC(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser, 254 GCPTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, GCPTRTYPE(PFNIOMMMIOREAD) pfnReadCallback, 255 GCPTRTYPE(PFNIOMMMIOFILL) pfnFillCallback, const char *pszDesc); 256 GCPTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, 257 GCPTRTYPE(PFNIOMMMIOREAD) pfnReadCallback, 258 GCPTRTYPE(PFNIOMMMIOFILL) pfnFillCallback); 256 259 IOMR3DECL(int) IOMR3MMIODeregister(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange); 257 260 /** @} */ -
trunk/include/VBox/pdmdev.h
r7635 r7752 1756 1756 * @param pszRead Name of the GC function which is gonna handle Read operations. 1757 1757 * @param pszFill Name of the GC function which is gonna handle Fill/memset operations. (optional) 1758 * @param pszDesc Pointer to description string. This must not be freed. 1758 * @param pszDesc Obsolete. NULL is fine. 1759 * @todo Remove pszDesc in the next major revision of PDMDEVHLP. 1759 1760 */ 1760 1761 DECLR3CALLBACKMEMBER(int, pfnMMIORegisterGC,(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser, … … 1776 1777 * @param pszRead Name of the GC function which is gonna handle Read operations. 1777 1778 * @param pszFill Name of the GC function which is gonna handle Fill/memset operations. (optional) 1778 * @param pszDesc Pointer to description string. This must not be freed. 1779 * @param pszDesc Obsolete. NULL is fine. 1780 * @todo Remove pszDesc in the next major revision of PDMDEVHLP. 1779 1781 */ 1780 1782 DECLR3CALLBACKMEMBER(int, pfnMMIORegisterR0,(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser, … … 3110 3112 */ 3111 3113 DECLINLINE(int) PDMDevHlpMMIORegisterGC(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser, 3112 const char *pszWrite, const char *pszRead, const char *pszFill , const char *pszDesc)3113 { 3114 return pDevIns->pDevHlp->pfnMMIORegisterGC(pDevIns, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, pszDesc);3114 const char *pszWrite, const char *pszRead, const char *pszFill) 3115 { 3116 return pDevIns->pDevHlp->pfnMMIORegisterGC(pDevIns, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL); 3115 3117 } 3116 3118 … … 3119 3121 */ 3120 3122 DECLINLINE(int) PDMDevHlpMMIORegisterR0(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser, 3121 const char *pszWrite, const char *pszRead, const char *pszFill , const char *pszDesc)3122 { 3123 return pDevIns->pDevHlp->pfnMMIORegisterR0(pDevIns, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, pszDesc);3123 const char *pszWrite, const char *pszRead, const char *pszFill) 3124 { 3125 return pDevIns->pDevHlp->pfnMMIORegisterR0(pDevIns, GCPhysStart, cbRange, pvUser, pszWrite, pszRead, pszFill, NULL); 3124 3126 } 3125 3127 -
trunk/src/VBox/Devices/Graphics/DevVGA.cpp
r7685 r7752 4727 4727 if (pData->fGCEnabled) 4728 4728 { 4729 rc = PDMDevHlpMMIORegisterGC(pDevIns, 0x000a0000, 0x00020000, 0, "vgaMMIOWrite", "vgaMMIORead", "vgaMMIOFill" , "VGA - VGA Video Buffer");4729 rc = PDMDevHlpMMIORegisterGC(pDevIns, 0x000a0000, 0x00020000, 0, "vgaMMIOWrite", "vgaMMIORead", "vgaMMIOFill"); 4730 4730 if (VBOX_FAILURE(rc)) 4731 4731 return rc; … … 4733 4733 if (pData->fR0Enabled) 4734 4734 { 4735 rc = PDMDevHlpMMIORegisterR0(pDevIns, 0x000a0000, 0x00020000, 0, "vgaMMIOWrite", "vgaMMIORead", "vgaMMIOFill" , "VGA - VGA Video Buffer");4735 rc = PDMDevHlpMMIORegisterR0(pDevIns, 0x000a0000, 0x00020000, 0, "vgaMMIOWrite", "vgaMMIORead", "vgaMMIOFill"); 4736 4736 if (VBOX_FAILURE(rc)) 4737 4737 return rc; -
trunk/src/VBox/Devices/PC/DevAPIC.cpp
r6300 r7752 1759 1759 if (fGCEnabled) { 1760 1760 rc = PDMDevHlpMMIORegisterGC(pDevIns, pData->apicbase & ~0xfff, 0x1000, 0, 1761 "apicMMIOWrite", "apicMMIORead", NULL , "APIC Memory");1761 "apicMMIOWrite", "apicMMIORead", NULL); 1762 1762 if (VBOX_FAILURE(rc)) 1763 1763 return rc; … … 1768 1768 1769 1769 rc = PDMDevHlpMMIORegisterR0(pDevIns, pData->apicbase & ~0xfff, 0x1000, 0, 1770 "apicMMIOWrite", "apicMMIORead", NULL , "APIC Memory");1770 "apicMMIOWrite", "apicMMIORead", NULL); 1771 1771 if (VBOX_FAILURE(rc)) 1772 1772 return rc; … … 2037 2037 if (fGCEnabled) { 2038 2038 rc = PDMDevHlpMMIORegisterGC(pDevIns, 0xfec00000, 0x1000, 0, 2039 "ioapicMMIOWrite", "ioapicMMIORead", NULL , "I/O APIC Memory");2039 "ioapicMMIOWrite", "ioapicMMIORead", NULL); 2040 2040 if (VBOX_FAILURE(rc)) 2041 2041 return rc; … … 2046 2046 2047 2047 rc = PDMDevHlpMMIORegisterR0(pDevIns, 0xfec00000, 0x1000, 0, 2048 "ioapicMMIOWrite", "ioapicMMIORead", NULL , "I/O APIC Memory");2048 "ioapicMMIOWrite", "ioapicMMIORead", NULL); 2049 2049 if (VBOX_FAILURE(rc)) 2050 2050 return rc; -
trunk/src/VBox/VMM/IOM.cpp
r7751 r7752 1487 1487 * @param pfnReadCallback Pointer to function which is gonna handle Read operations. 1488 1488 * @param pfnFillCallback Pointer to function which is gonna handle Fill/memset operations. 1489 * @param pszDesc Pointer to description string. This must not be freed.1490 1489 */ 1491 1490 IOMR3DECL(int) IOMR3MMIORegisterGC(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTGCPTR pvUser, 1492 1491 GCPTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, GCPTRTYPE(PFNIOMMMIOREAD) pfnReadCallback, 1493 GCPTRTYPE(PFNIOMMMIOFILL) pfnFillCallback , const char *pszDesc)1494 { 1495 LogFlow(("IOMR3MMIORegisterGC: pDevIns=%p GCPhysStart=%VGp cbRange=%#x pvUser=%VGv pfnWriteCallback=%#x pfnReadCallback=%#x pfnFillCallback=%#x pszDesc=%s\n",1496 pDevIns, GCPhysStart, cbRange, pvUser, pfnWriteCallback, pfnReadCallback, pfnFillCallback , pszDesc));1492 GCPTRTYPE(PFNIOMMMIOFILL) pfnFillCallback) 1493 { 1494 LogFlow(("IOMR3MMIORegisterGC: pDevIns=%p GCPhysStart=%VGp cbRange=%#x pvUser=%VGv pfnWriteCallback=%#x pfnReadCallback=%#x pfnFillCallback=%#x\n", 1495 pDevIns, GCPhysStart, cbRange, pvUser, pfnWriteCallback, pfnReadCallback, pfnFillCallback)); 1497 1496 1498 1497 /* … … 1501 1500 if (!pfnWriteCallback && !pfnReadCallback) 1502 1501 { 1503 AssertMsgFailed(("No callbacks! %VGp LB%#x %s\n", GCPhysStart, cbRange , pszDesc));1502 AssertMsgFailed(("No callbacks! %VGp LB%#x %s\n", GCPhysStart, cbRange)); 1504 1503 return VERR_INVALID_PARAMETER; 1505 1504 } … … 1541 1540 * @param pfnReadCallback Pointer to function which is gonna handle Read operations. 1542 1541 * @param pfnFillCallback Pointer to function which is gonna handle Fill/memset operations. 1543 * @param pszDesc Pointer to description string. This must not be freed.1544 1542 */ 1545 1543 IOMR3DECL(int) IOMR3MMIORegisterR0(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser, 1546 R0PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, R0PTRTYPE(PFNIOMMMIOREAD) pfnReadCallback, 1547 R0PTRTYPE(PFNIOMMMIOFILL) pfnFillCallback, const char *pszDesc) 1548 { 1549 LogFlow(("IOMR3MMIORegisterR0: pDevIns=%p GCPhysStart=%VGp cbRange=%#x pvUser=%VHv pfnWriteCallback=%#x pfnReadCallback=%#x pfnFillCallback=%#x pszDesc=%s\n", 1550 pDevIns, GCPhysStart, cbRange, pvUser, pfnWriteCallback, pfnReadCallback, pfnFillCallback, pszDesc)); 1544 R0PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, 1545 R0PTRTYPE(PFNIOMMMIOREAD) pfnReadCallback, 1546 R0PTRTYPE(PFNIOMMMIOFILL) pfnFillCallback) 1547 { 1548 LogFlow(("IOMR3MMIORegisterR0: pDevIns=%p GCPhysStart=%VGp cbRange=%#x pvUser=%VHv pfnWriteCallback=%#x pfnReadCallback=%#x pfnFillCallback=%#x\n", 1549 pDevIns, GCPhysStart, cbRange, pvUser, pfnWriteCallback, pfnReadCallback, pfnFillCallback)); 1551 1550 1552 1551 /* … … 1555 1554 if (!pfnWriteCallback && !pfnReadCallback) 1556 1555 { 1557 AssertMsgFailed(("No callbacks! %VGp LB%#x %s\n", GCPhysStart, cbRange , pszDesc));1556 AssertMsgFailed(("No callbacks! %VGp LB%#x %s\n", GCPhysStart, cbRange)); 1558 1557 return VERR_INVALID_PARAMETER; 1559 1558 } -
trunk/src/VBox/VMM/PDMDevice.cpp
r7726 r7752 1385 1385 PDMDEV_ASSERT_DEVINS(pDevIns); 1386 1386 VM_ASSERT_EMT(pDevIns->Internal.s.pVMHC); 1387 LogFlow(("pdmR3DevHlp_MMIORegisterGC: caller='%s'/%d: GCPhysStart=%VGp cbRange=%#x pvUser=%p pszWrite=%p:{%s} pszRead=%p:{%s} pszFill=%p:{%s} pszDesc=%p:{%s}\n",1388 pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, GCPhysStart, cbRange, pvUser, pszWrite, pszWrite, pszRead, pszRead, pszFill, pszFill , pszDesc, pszDesc));1387 LogFlow(("pdmR3DevHlp_MMIORegisterGC: caller='%s'/%d: GCPhysStart=%VGp cbRange=%#x pvUser=%p pszWrite=%p:{%s} pszRead=%p:{%s} pszFill=%p:{%s}\n", 1388 pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, GCPhysStart, cbRange, pvUser, pszWrite, pszWrite, pszRead, pszRead, pszFill, pszFill)); 1389 1389 1390 1390 /* … … 1408 1408 rc3 = PDMR3GetSymbolGCLazy(pDevIns->Internal.s.pVMHC, pDevIns->pDevReg->szGCMod, pszFill, &GCPtrFill); 1409 1409 if (VBOX_SUCCESS(rc) && VBOX_SUCCESS(rc2) && VBOX_SUCCESS(rc3)) 1410 rc = IOMR3MMIORegisterGC(pDevIns->Internal.s.pVMHC, pDevIns, GCPhysStart, cbRange, pvUser, GCPtrWrite, GCPtrRead, GCPtrFill , pszDesc);1410 rc = IOMR3MMIORegisterGC(pDevIns->Internal.s.pVMHC, pDevIns, GCPhysStart, cbRange, pvUser, GCPtrWrite, GCPtrRead, GCPtrFill); 1411 1411 else 1412 1412 { … … 1437 1437 PDMDEV_ASSERT_DEVINS(pDevIns); 1438 1438 VM_ASSERT_EMT(pDevIns->Internal.s.pVMHC); 1439 LogFlow(("pdmR3DevHlp_MMIORegisterHC: caller='%s'/%d: GCPhysStart=%VGp cbRange=%#x pvUser=%p pszWrite=%p:{%s} pszRead=%p:{%s} pszFill=%p:{%s} pszDesc=%p:{%s}\n",1440 pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, GCPhysStart, cbRange, pvUser, pszWrite, pszWrite, pszRead, pszRead, pszFill, pszFill , pszDesc, pszDesc));1439 LogFlow(("pdmR3DevHlp_MMIORegisterHC: caller='%s'/%d: GCPhysStart=%VGp cbRange=%#x pvUser=%p pszWrite=%p:{%s} pszRead=%p:{%s} pszFill=%p:{%s}\n", 1440 pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, GCPhysStart, cbRange, pvUser, pszWrite, pszWrite, pszRead, pszRead, pszFill, pszFill)); 1441 1441 1442 1442 /* … … 1460 1460 rc3 = PDMR3GetSymbolR0Lazy(pDevIns->Internal.s.pVMHC, pDevIns->pDevReg->szR0Mod, pszFill, &pfnR0PtrFill); 1461 1461 if (VBOX_SUCCESS(rc) && VBOX_SUCCESS(rc2) && VBOX_SUCCESS(rc3)) 1462 rc = IOMR3MMIORegisterR0(pDevIns->Internal.s.pVMHC, pDevIns, GCPhysStart, cbRange, pvUser, pfnR0PtrWrite, pfnR0PtrRead, pfnR0PtrFill , pszDesc);1462 rc = IOMR3MMIORegisterR0(pDevIns->Internal.s.pVMHC, pDevIns, GCPhysStart, cbRange, pvUser, pfnR0PtrWrite, pfnR0PtrRead, pfnR0PtrFill); 1463 1463 else 1464 1464 {
Note:
See TracChangeset
for help on using the changeset viewer.
