Changeset 35358 in vbox for trunk/src/VBox/VMM/VMMR3
- Timestamp:
- Dec 28, 2010 7:58:40 AM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 69218
- Location:
- trunk/src/VBox/VMM/VMMR3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp
r35357 r35358 2809 2809 *ppHpetHlpR3 = &g_pdmR3DevHpetHlp; 2810 2810 LogFlow(("pdmR3DevHlp_HPETRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS)); 2811 return VINF_SUCCESS;2812 }2813 2814 /** @interface_method_impl{PDMDEVHLPR3,pfnPciRawRegister} */2815 static DECLCALLBACK(int) pdmR3DevHlp_PciRawRegister(PPDMDEVINS pDevIns, PPDMPCIRAWREG pPciRawReg, PCPDMPCIRAWHLPR3 *ppPciRawHlpR3)2816 {2817 PDMDEV_ASSERT_DEVINS(pDevIns);2818 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);2819 LogFlow(("pdmR3DevHlp_PciRawRegister: caller='%s'/%d:\n"));2820 2821 /*2822 * Validate input.2823 */2824 if (pPciRawReg->u32Version != PDM_PCIRAWREG_VERSION)2825 {2826 AssertMsgFailed(("u32Version=%#x expected %#x\n", pPciRawReg->u32Version, PDM_PCIRAWREG_VERSION));2827 LogFlow(("pdmR3DevHlp_PciRawRegister: caller='%s'/%d: returns %Rrc (version)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2828 return VERR_INVALID_PARAMETER;2829 }2830 2831 if (!ppPciRawHlpR3)2832 {2833 Assert(ppPciRawHlpR3);2834 LogFlow(("pdmR3DevHlp_PciRawRegister: caller='%s'/%d: returns %Rrc (ppApicHlpR3)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER));2835 return VERR_INVALID_PARAMETER;2836 }2837 2838 /* set the helper pointer and return. */2839 *ppPciRawHlpR3 = &g_pdmR3DevPciRawHlp;2840 LogFlow(("pdmR3DevHlp_PciRawRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS));2841 2811 return VINF_SUCCESS; 2842 2812 } … … 3212 3182 pdmR3DevHlp_IOAPICRegister, 3213 3183 pdmR3DevHlp_HPETRegister, 3214 pdmR3DevHlp_PciRawRegister,3215 3184 pdmR3DevHlp_DMACRegister, 3216 3185 pdmR3DevHlp_DMARegister, … … 3423 3392 pdmR3DevHlp_IOAPICRegister, 3424 3393 pdmR3DevHlp_HPETRegister, 3425 pdmR3DevHlp_PciRawRegister,3426 3394 pdmR3DevHlp_DMACRegister, 3427 3395 pdmR3DevHlp_DMARegister, … … 3501 3469 3502 3470 /** @} */ 3471 -
trunk/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp
r35357 r35358 652 652 653 653 654 /** @interface_method_impl{PDMPCIRAWHLPR3,pfnGetRCHelpers} */655 static DECLCALLBACK(PCPDMPCIRAWHLPRC) pdmR3PciRawHlp_GetRCHelpers(PPDMDEVINS pDevIns)656 {657 PDMDEV_ASSERT_DEVINS(pDevIns);658 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);659 RTRCPTR pRCHelpers = 0;660 int rc = PDMR3LdrGetSymbolRC(pDevIns->Internal.s.pVMR3, NULL, "g_pdmRCPciRawHlp", &pRCHelpers);661 AssertReleaseRC(rc);662 AssertRelease(pRCHelpers);663 LogFlow(("pdmR3PciRawHlp_GetGCHelpers: caller='%s'/%d: returns %RRv\n",664 pDevIns->pReg->szName, pDevIns->iInstance, pRCHelpers));665 return pRCHelpers;666 }667 668 669 /** @interface_method_impl{PDMPCIRAWHLPR3,pfnGetR0Helpers} */670 static DECLCALLBACK(PCPDMPCIRAWHLPR0) pdmR3PciRawHlp_GetR0Helpers(PPDMDEVINS pDevIns)671 {672 PDMDEV_ASSERT_DEVINS(pDevIns);673 VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);674 PCPDMHPETHLPR0 pR0Helpers = 0;675 int rc = PDMR3LdrGetSymbolR0(pDevIns->Internal.s.pVMR3, NULL, "g_pdmR0PciRawHlp", &pR0Helpers);676 AssertReleaseRC(rc);677 AssertRelease(pR0Helpers);678 LogFlow(("pdmR3PciRawHlp_GetR0Helpers: caller='%s'/%d: returns %RHv\n",679 pDevIns->pReg->szName, pDevIns->iInstance, pR0Helpers));680 return pR0Helpers;681 }682 683 /**684 * Raw PCI Device Helpers.685 */686 const PDMPCIRAWHLPR3 g_pdmR3DevPciRawHlp =687 {688 PDM_PCIRAWHLPR3_VERSION,689 pdmR3PciRawHlp_GetRCHelpers,690 pdmR3PciRawHlp_GetR0Helpers,691 PDM_PCIRAWHLPR3_VERSION, /* the end */692 };693 654 694 655 /* none yet */
Note:
See TracChangeset
for help on using the changeset viewer.