Changeset 13368

Timestamp:

10/17/08 13:35:13 (3 months ago)

Author:

vboxsync

Message:

Started with IOMR3MMIORegisterR3 extension for MMIO ranges backed by RAM, so it will be possible to turn off protection temporarily.

Files:

• trunk/include/VBox/iom.h (modified) (2 diffs)
• trunk/include/VBox/pdmdev.h (modified) (3 diffs)
• trunk/src/VBox/VMM/IOM.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/PDMDevHlp.cpp (modified) (2 diffs)

trunk/include/VBox/iom.h

@@ -85 +85 @@
-                            )
-
+/**
+ * MMIO type
+ */
+typedef enum IOMMMIOTYPE
+{
+    /** 'Normal' MMIO. Reads and writes always fault. */
+    IOMMMIOTYPE_MMIO = 1,
+    /** MMIO region backed by memory; protection can be turned off temporarily. */
+    IOMMMIOTYPE_MMIO_WITH_RAM_BACKING,
+    /** The usual 32-bit type size hack. */
+    IOMMMIOTYPE_32BIT_HACK = 0x7fffffff
+} IOMMMIOTYPE;
-
-/**
@@ -250 +262 @@
-VMMR3DECL(int)  IOMR3IOPortDeregister(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts);
-
-
+IOMMMIOTYPE enmMMIOType, 
-                                    R3PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback,
-                                    R3PTRTYPE(PFNIOMMMIOREAD)  pfnReadCallback,

trunk/include/VBox/pdmdev.h

@@ -2776 +2776 @@
-     * @returns VBox status.
-     * @param   pDevIns             The device instance to register the MMIO with.
+     * @param   enmMMIOType         MMIO Type
-     * @param   GCPhysStart         First physical address in the range.
-     * @param   cbRange             The size of the range (in bytes).
@@ -2784 +2785 @@
-     * @param   pszDesc             Pointer to description string. This must not be freed.
-     */
-
+IOMMMIOTYPE enmMMIOType, 
-                                                 PFNIOMMMIOWRITE pfnWrite, PFNIOMMMIOREAD pfnRead, PFNIOMMMIOFILL pfnFill,
-                                                 const char *pszDesc));
@@ -3267 +3268 @@
- * @copydoc PDMDEVHLPR3::pfnMMIORegisterEx
- */
-
+IOMMMIOTYPE enmMMIOType, 
-                                        PFNIOMMMIOWRITE pfnWrite, PFNIOMMMIOREAD pfnRead, PFNIOMMMIOFILL pfnFill,
-                                        const char *pszDesc)
-{
-
+enmMMIOType, 
-}
-

trunk/src/VBox/VMM/IOM.cpp

@@ -1351 +1351 @@
- * @param   pVM                 VM handle.
- * @param   pDevIns             PDM device instance owning the MMIO range.
+ * @param   enmMMIOType         MMIO Type
- * @param   GCPhysStart         First physical address in the range.
- * @param   cbRange             The size of the range (in bytes).
@@ -1359 +1360 @@
- * @param   pszDesc             Pointer to description string. This must not be freed.
- */
-
+IOMMMIOTYPE enmMMIOType, 
-                                    R3PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, R3PTRTYPE(PFNIOMMMIOREAD) pfnReadCallback,
-                                    R3PTRTYPE(PFNIOMMMIOFILL) pfnFillCallback, const char *pszDesc)

trunk/src/VBox/VMM/PDMDevHlp.cpp

@@ -211 +211 @@
-             pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, GCPhysStart, cbRange, pvUser, pfnWrite, pfnRead, pfnFill, pszDesc, pszDesc));
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    LogFlow(("pdmR3DevHlp_MMIORegister: caller='%s'/%d: returns %Vrc\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc));
@@ -2602 +2620 @@
-    int rc = PDMR3UnregisterVMMDevHeap(pDevIns->Internal.s.pVMR3, GCPhys);
-    return rc;
-}
-
-/**
- * @copydoc PDMDEVHLPR3::pfnMMIORegisterEx
- */
-static DECLCALLBACK(int) pdmR3DevHlp_MMIORegisterEx(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
-                                                    PFNIOMMMIOWRITE pfnWrite, PFNIOMMMIOREAD pfnRead, PFNIOMMMIOFILL pfnFill,
-                                                    const char *pszDesc)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
-
-    /** @todo */
-    return VERR_NOT_SUPPORTED;
-}
-