Changeset 35358 in vbox for trunk/include/VBox/vmm

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/include/VBox/vmm

Files:

• pdmdev.h (modified) (4 diffs)
• pdmdrv.h (modified) (1 diff)

trunk/include/VBox/vmm/pdmdev.h

@@ -1735 +1735 @@
 #define PDM_HPETHLPRC_VERSION                   PDM_VERSION_MAKE(0xffee, 2, 0)
 
+
 /**
  * HPET R0 helpers.
@@ -1821 +1822 @@
 #define PDM_HPETHLPR3_VERSION                   PDM_VERSION_MAKE(0xffec, 2, 0)
 
-typedef struct PDMPCIRAWREG
-{
-     /** Struct version+magic number (PDM_PCIRAWREG_VERSION). */
-     uint32_t            u32Version;
-} PDMPCIRAWREG;
-/** Pointer to a raw PCI registration structure. */
-typedef PDMPCIRAWREG *PPDMPCIRAWREG;
-
-/** Current PDMPCIRAWREG version number. */
-#define PDM_PCIRAWREG_VERSION                     PDM_VERSION_MAKE(0xffe3, 1, 0)
-
-struct PDMPCIRAWHLPRC
-{
-    uint32_t u32Version;
-    /** Just a safety precaution. */
-    uint32_t u32TheEnd;
-};
-typedef RCPTRTYPE(PDMPCIRAWHLPRC *) PPDMPCIRAWHLPRC;
-typedef RCPTRTYPE(const PDMPCIRAWHLPRC *) PCPDMPCIRAWHLPRC;
-
-struct PDMPCIRAWHLPR0
-{
-    uint32_t u32Version;
-    /** Just a safety precaution. */
-    uint32_t u32TheEnd;
-};
-typedef R0PTRTYPE(PDMPCIRAWHLPR0 *) PPDMPCIRAWHLPR0;
-typedef R0PTRTYPE(const PDMPCIRAWHLPR0 *) PCPDMPCIRAWHLPR0;
-
-typedef struct PDMPCIRAWHLPR3
-{
-    uint32_t u32Version;
-    /**
-     * Gets the address of the RC PCI raw helpers.
-     *
-     * This should be called at both construction and relocation time
-     * to obtain the correct address of the RC helpers.
-     *
-     * @returns RC pointer to the PCI raw helpers.
-     * @param   pDevIns         Device instance of the raw PCI device.
-     */
-    DECLR3CALLBACKMEMBER(PCPDMPCIRAWHLPRC, pfnGetRCHelpers,(PPDMDEVINS pDevIns));
-
-    /**
-     * Gets the address of the R0 PCI raw helpers.
-     *
-     * This should be called at both construction and relocation time
-     * to obtain the correct address of the R0 helpers.
-     *
-     * @returns R0 pointer to the PCI raw helpers.
-     * @param   pDevIns         Device instance of the raw PCI device.
-     */
-    DECLR3CALLBACKMEMBER(PCPDMPCIRAWHLPR0, pfnGetR0Helpers,(PPDMDEVINS pDevIns));
-
-    /** Just a safety precaution. */
-    uint32_t                u32TheEnd;
-} PDMPCIRAWHLPR3;
-/** Pointer to raw PCI R3 helpers. */
-typedef R3PTRTYPE(PDMPCIRAWHLPR3 *) PPDMPCIRAWHLPR3;
-/** Pointer to const raw PCI R3 helpers. */
-typedef R3PTRTYPE(const PDMPCIRAWHLPR3 *) PCPDMPCIRAWHLPR3;
-
-/** Current PDMPCIRAWHLPRC version number. */
-#define PDM_PCIRAWHLPRC_VERSION                   PDM_VERSION_MAKE(0xfff0, 1, 0)
-/** Current PDMPCIRAWHLPR0 version number. */
-#define PDM_PCIRAWHLPR0_VERSION                   PDM_VERSION_MAKE(0xfff1, 1, 0)
-/** Current PDMPCIRAWHLPR3 version number. */
-#define PDM_PCIRAWHLPR3_VERSION                   PDM_VERSION_MAKE(0xfff2, 1, 0)
+
 
 #ifdef IN_RING3
@@ -2989 +2923 @@
 
     /**
-     * Register the raw PCI device.
-     *
-     * @returns VBox status code.
-     * @param   pDevIns             The device instance.
-     * @param   pHpetReg            Pointer to a raw PCI registration structure.
-     * @param   ppHpetHlpR3         Where to store the pointer to the raw PCI
-     *                              helpers.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnPciRawRegister,(PPDMDEVINS pDevIns, PPDMPCIRAWREG pPciRawReg, PCPDMPCIRAWHLPR3 *ppPciRawHlpR3));
-
-    /**
-
      * Register the DMA device.
      *
@@ -4534 +4456 @@
 
 /**
- * @copydoc PDMDEVHLPR3::pfnPciRawRegister
- */
-DECLINLINE(int) PDMDevHlpPciRawRegister(PPDMDEVINS pDevIns, PPDMPCIRAWREG pPciRawReg, PCPDMPCIRAWHLPR3 *ppPciRawHlpR3)
-{
-    return pDevIns->pHlpR3->pfnPciRawRegister(pDevIns, pPciRawReg, ppPciRawHlpR3);
-}
-
-/**
  * @copydoc PDMDEVHLPR3::pfnDMACRegister
  */

trunk/include/VBox/vmm/pdmdrv.h

@@ -338 +338 @@
 /** SCSI driver. */
 #define PDM_DRVREG_CLASS_SCSI           RT_BIT(15)
-/** Generic raw PCI device driver. */
-#define PDM_DRVREG_CLASS_PCIRAW         RT_BIT(16)
 /** @} */