Changeset 41847 in vbox for trunk/include/VBox

Timestamp:

Jun 20, 2012 1:43:46 PM (13 years ago)

Author:

vboxsync

Message:

PDM/PCI: Added pdm*DevHlp_PCIPhysRead/Write callbacks, renamed VINF_PGM_PCI_PHYS_*_BM_DISABLED to VINF_PDM_PCI_PHYS_*_BM_DISABLED.

Location:

trunk/include/VBox

Files:

• err.h (modified) (2 diffs)
• vmm/pdmdev.h (modified) (10 diffs)

trunk/include/VBox/err.h

@@ -569 +569 @@
 /** PCI passthru is not supported by this build. */
 #define VERR_PGM_PCI_PASSTHRU_MISCONFIG         (-1682)
-/** PCI physical read with bus mastering disabled. */
-#define VINF_PGM_PCI_PHYS_READ_BM_DISABLED      (1683)
-/** PCI physical write with bus mastering disabled. */
-#define VINF_PGM_PCI_PHYS_WRITE_BM_DISABLED     (1684)
 /** @} */
 
@@ -1215 +1211 @@
  * misconfiguration or in rare cases a buggy pci device. */
 #define VERR_PDM_NO_PCI_BUS                         (-2833)
+/** PCI physical read with bus mastering disabled. */
+#define VINF_PDM_PCI_PHYS_READ_BM_DISABLED          (2833)
 /** The device is not a registered PCI device and thus cannot
  * perform any PCI operations. The device forgot to register it self. */
 #define VERR_PDM_NOT_PCI_DEVICE                     (-2834)
+/** PCI physical write with bus mastering disabled. */
+#define VINF_PDM_PCI_PHYS_WRITE_BM_DISABLED         (2834)
 
 /** The version of the device registration structure is unknown

trunk/include/VBox/vmm/pdmdev.h

@@ -2189 +2189 @@
 typedef struct PDMDEVHLPR3
 {
-    /** Structure version. PDM_DEVHLP_VERSION defines the current version. */
+    /** Structure version. PDM_DEVHLPR3_VERSION defines the current version. */
     uint32_t                        u32Version;
 
@@ -2857 +2857 @@
     DECLR3CALLBACKMEMBER(void, pfnSTAMRegisterV,(PPDMDEVINS pDevIns, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility,
                                                  STAMUNIT enmUnit, const char *pszDesc, const char *pszName, va_list args));
+
+    /**
+     * Reads data via bus mastering, if enabled. If no bus mastering is available,
+     * this function does nothing and returns VINF_PGM_PCI_PHYS_READ_BM_DISABLED.
+     *
+     * @return  IPRT status code.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnPCIPhysRead,(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead));
+
+    /**
+     * Writes data via bus mastering, if enabled. If no bus mastering is available,
+     * this function does nothing and returns VINF_PGM_PCI_PHYS_WRITE_BM_DISABLED.
+     *
+     * @return  IPRT status code.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnPCIPhysWrite,(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite));
 
     /**
@@ -3511 +3527 @@
     /** @} */
 
-    /** Just a safety precaution. (PDM_DEVHLP_VERSION) */
+    /** Just a safety precaution. (PDM_DEVHLPR3_VERSION) */
     uint32_t                        u32TheEnd;
 } PDMDEVHLPR3;
@@ -3521 +3537 @@
 
 /** Current PDMDEVHLPR3 version number. */
-#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE(0xffe7, 8, 0)
+#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE(0xffe7, 9, 0)
 
 
@@ -3531 +3547 @@
     /** Structure version. PDM_DEVHLPRC_VERSION defines the current version. */
     uint32_t                    u32Version;
+
+    /**
+     * Reads data via bus mastering, if enabled. If no bus mastering is available,
+     * this function does nothing and returns VINF_PGM_PCI_PHYS_READ_BM_DISABLED.
+     *
+     * @return  IPRT status code.
+     */
+    DECLRCCALLBACKMEMBER(int, pfnPCIDevPhysRead,(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead));
+
+    /**
+     * Writes data via bus mastering, if enabled. If no bus mastering is available,
+     * this function does nothing and returns VINF_PGM_PCI_PHYS_WRITE_BM_DISABLED.
+     *
+     * @return  IPRT status code.
+     */
+    DECLRCCALLBACKMEMBER(int, pfnPCIDevPhysWrite,(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite));
 
     /**
@@ -3712 +3744 @@
 
 /** Current PDMDEVHLP version number. */
-#define PDM_DEVHLPRC_VERSION                    PDM_VERSION_MAKE(0xffe6, 2, 0)
+#define PDM_DEVHLPRC_VERSION                    PDM_VERSION_MAKE(0xffe6, 3, 0)
 
 
@@ -3722 +3754 @@
     /** Structure version. PDM_DEVHLPR0_VERSION defines the current version. */
     uint32_t                    u32Version;
+
+    /**
+     * Reads data via bus mastering, if enabled. If no bus mastering is available,
+     * this function does nothing and returns VINF_PGM_PCI_PHYS_READ_BM_DISABLED.
+     *
+     * @return  IPRT status code.
+     */
+    DECLR0CALLBACKMEMBER(int, pfnPCIPhysRead,(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, void *pvBuf, size_t cbRead));
+
+    /**
+     * Writes data via bus mastering, if enabled. If no bus mastering is available,
+     * this function does nothing and returns VINF_PGM_PCI_PHYS_WRITE_BM_DISABLED.
+     *
+     * @return  IPRT status code.
+     */
+    DECLR0CALLBACKMEMBER(int, pfnPCIPhysWrite,(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, const void *pvBuf, size_t cbWrite));
 
     /**
@@ -3911 +3959 @@
 
 /** Current PDMDEVHLP version number. */
-#define PDM_DEVHLPR0_VERSION                    PDM_VERSION_MAKE(0xffe5, 2, 0)
+#define PDM_DEVHLPR0_VERSION                    PDM_VERSION_MAKE(0xffe5, 3, 0)
 
 
@@ -4641 +4689 @@
               PCIDevGetVendorId(pPciDev), PCIDevGetDeviceId(pPciDev), pvBuf, cbRead));
 #endif
-        return VINF_PGM_PCI_PHYS_READ_BM_DISABLED;
+        return VINF_PDM_PCI_PHYS_READ_BM_DISABLED;
     }
 
@@ -4665 +4713 @@
               PCIDevGetVendorId(pPciDev), PCIDevGetDeviceId(pPciDev), pvBuf, cbWrite));
 #endif
-        return VINF_PGM_PCI_PHYS_WRITE_BM_DISABLED;
+        return VINF_PDM_PCI_PHYS_WRITE_BM_DISABLED;
     }