Changeset 13373

Timestamp:

10/17/08 14:36:57 (3 months ago)

Author:

vboxsync

Message:

Removed the new MMIO functionality. Will do it in a different way.

Files:

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

trunk/include/VBox/iom.h

@@ -84 +84 @@
-                                ) \
-                            )
-
-/**
- * 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;
-
-/**
@@ -262 +249 @@
-VMMR3DECL(int)  IOMR3IOPortDeregister(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts);
-
-IOMMMIOTYPE enmMMIOType, 
+
-                                    R3PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback,
-                                    R3PTRTYPE(PFNIOMMMIOREAD)  pfnReadCallback,

trunk/include/VBox/pdmdev.h

@@ -2767 +2767 @@
-    DECLR3CALLBACKMEMBER(int, pfnUnregisterVMMDevHeap,(PPDMDEVINS pDevIns, RTGCPHYS GCPhys));
-
-    /**
-     * Register a Memory Mapped I/O (MMIO) region with backing memory (or use existing memory if part of guest ram)
-     *
-     * These callbacks are of course for the host context (HC).
-     * Register HC handlers before guest context (GC) handlers! There must be a
-     * HC handler for every GC handler!
-     *
-     * @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).
-     * @param   pvUser              User argument.
-     * @param   pfnWrite            Pointer to function which is gonna handle Write operations.
-     * @param   pfnRead             Pointer to function which is gonna handle Read operations.
-     * @param   pfnFill             Pointer to function which is gonna handle Fill/memset operations. (optional)
-     * @param   pszDesc             Pointer to description string. This must not be freed.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnMMIORegisterEx,(PPDMDEVINS pDevIns, IOMMMIOTYPE enmMMIOType, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
-                                                 PFNIOMMMIOWRITE pfnWrite, PFNIOMMMIOREAD pfnRead, PFNIOMMMIOFILL pfnFill,
-                                                 const char *pszDesc));
-
-    /** @} */
-
@@ -3266 +3244 @@
-
-/**
- * @copydoc PDMDEVHLPR3::pfnMMIORegisterEx
- */
-DECLINLINE(int) PDMDevHlpMMIORegisterEx(PPDMDEVINS pDevIns, IOMMMIOTYPE enmMMIOType, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
-                                        PFNIOMMMIOWRITE pfnWrite, PFNIOMMMIOREAD pfnRead, PFNIOMMMIOFILL pfnFill,
-                                        const char *pszDesc)
-{
-    return pDevIns->pDevHlpR3->pfnMMIORegisterEx(pDevIns, enmMMIOType, GCPhysStart, cbRange, pvUser, pfnWrite, pfnRead, pfnFill, pszDesc);
-}
-
-/**
- * @copydoc PDMDEVHLPR3::pfnMMIORegisterGC
- */

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).
@@ -1360 +1359 @@
- * @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)
@@ -1399 +1398 @@
-        pRange->GCPhys              = GCPhysStart;
-        pRange->cb                  = cbRange;
-        pRange->enmType             = enmMMIOType;
-        pRange->pszDesc             = pszDesc;
-
@@ -1423 +1421 @@
-         * Try register it with PGM and then insert it into the tree.
-         */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-        if (RT_SUCCESS(rc))
@@ -1624 +1611 @@
-
-        /* remove it from PGM */
-
-
-
-
+
-
-        /* advance and free. */

trunk/src/VBox/VMM/IOMInternal.h

@@ -50 +50 @@
-    /** Size of the range. */
-    uint32_t                    cb;
-
-
+
-
-    /** Pointer to user argument - R3. */

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));
@@ -2715 +2697 @@
-    pdmR3DevHlp_RegisterVMMDevHeap,
-    pdmR3DevHlp_UnregisterVMMDevHeap,
-    pdmR3DevHlp_MMIORegisterEx,
-    PDM_DEVHLP_VERSION /* the end */
-};
@@ -3186 +3167 @@
-    pdmR3DevHlp_Untrusted_RegisterVMMDevHeap,
-    pdmR3DevHlp_Untrusted_UnregisterVMMDevHeap,
-    pdmR3DevHlp_MMIORegisterEx,
-    PDM_DEVHLP_VERSION /* the end */
-};