Changeset 35358 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Dec 28, 2010 7:58:40 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

69218

Message:

backed out 69217

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PDMDevHlp.cpp (modified) (4 diffs)
• PDMDevMiscHlp.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -2809 +2809 @@
     *ppHpetHlpR3 = &g_pdmR3DevHpetHlp;
     LogFlow(("pdmR3DevHlp_HPETRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS));
-    return VINF_SUCCESS;
-}
-
-/** @interface_method_impl{PDMDEVHLPR3,pfnPciRawRegister} */
-static DECLCALLBACK(int) pdmR3DevHlp_PciRawRegister(PPDMDEVINS pDevIns, PPDMPCIRAWREG pPciRawReg, PCPDMPCIRAWHLPR3 *ppPciRawHlpR3)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
-    LogFlow(("pdmR3DevHlp_PciRawRegister: caller='%s'/%d:\n"));
-
-    /*
-     * Validate input.
-     */
-    if (pPciRawReg->u32Version != PDM_PCIRAWREG_VERSION)
-    {
-        AssertMsgFailed(("u32Version=%#x expected %#x\n", pPciRawReg->u32Version, PDM_PCIRAWREG_VERSION));
-        LogFlow(("pdmR3DevHlp_PciRawRegister: caller='%s'/%d: returns %Rrc (version)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    if (!ppPciRawHlpR3)
-    {
-        Assert(ppPciRawHlpR3);
-        LogFlow(("pdmR3DevHlp_PciRawRegister: caller='%s'/%d: returns %Rrc (ppApicHlpR3)\n", pDevIns->pReg->szName, pDevIns->iInstance, VERR_INVALID_PARAMETER));
-        return VERR_INVALID_PARAMETER;
-    }
-
-    /* set the helper pointer and return. */
-    *ppPciRawHlpR3 = &g_pdmR3DevPciRawHlp;
-    LogFlow(("pdmR3DevHlp_PciRawRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, VINF_SUCCESS));
     return VINF_SUCCESS;
 }
@@ -3212 +3182 @@
     pdmR3DevHlp_IOAPICRegister,
     pdmR3DevHlp_HPETRegister,
-    pdmR3DevHlp_PciRawRegister,
     pdmR3DevHlp_DMACRegister,
     pdmR3DevHlp_DMARegister,
@@ -3423 +3392 @@
     pdmR3DevHlp_IOAPICRegister,
     pdmR3DevHlp_HPETRegister,
-    pdmR3DevHlp_PciRawRegister,
     pdmR3DevHlp_DMACRegister,
     pdmR3DevHlp_DMARegister,
@@ -3501 +3469 @@
 
 /** @} */
+

trunk/src/VBox/VMM/VMMR3/PDMDevMiscHlp.cpp

@@ -652 +652 @@
 
 
-/** @interface_method_impl{PDMPCIRAWHLPR3,pfnGetRCHelpers} */
-static DECLCALLBACK(PCPDMPCIRAWHLPRC) pdmR3PciRawHlp_GetRCHelpers(PPDMDEVINS pDevIns)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
-    RTRCPTR pRCHelpers = 0;
-    int rc = PDMR3LdrGetSymbolRC(pDevIns->Internal.s.pVMR3, NULL, "g_pdmRCPciRawHlp", &pRCHelpers);
-    AssertReleaseRC(rc);
-    AssertRelease(pRCHelpers);
-    LogFlow(("pdmR3PciRawHlp_GetGCHelpers: caller='%s'/%d: returns %RRv\n",
-             pDevIns->pReg->szName, pDevIns->iInstance, pRCHelpers));
-    return pRCHelpers;
-}
-
-
-/** @interface_method_impl{PDMPCIRAWHLPR3,pfnGetR0Helpers} */
-static DECLCALLBACK(PCPDMPCIRAWHLPR0) pdmR3PciRawHlp_GetR0Helpers(PPDMDEVINS pDevIns)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
-    PCPDMHPETHLPR0 pR0Helpers = 0;
-    int rc = PDMR3LdrGetSymbolR0(pDevIns->Internal.s.pVMR3, NULL, "g_pdmR0PciRawHlp", &pR0Helpers);
-    AssertReleaseRC(rc);
-    AssertRelease(pR0Helpers);
-    LogFlow(("pdmR3PciRawHlp_GetR0Helpers: caller='%s'/%d: returns %RHv\n",
-             pDevIns->pReg->szName, pDevIns->iInstance, pR0Helpers));
-    return pR0Helpers;
-}
-
-/**
- * Raw PCI Device Helpers.
- */
-const PDMPCIRAWHLPR3 g_pdmR3DevPciRawHlp =
-{
-    PDM_PCIRAWHLPR3_VERSION,
-    pdmR3PciRawHlp_GetRCHelpers,
-    pdmR3PciRawHlp_GetR0Helpers,
-    PDM_PCIRAWHLPR3_VERSION, /* the end */
-};
 
 /* none yet */