Changeset 17251 in vbox for trunk/include

Timestamp:

Mar 2, 2009 1:55:31 PM (16 years ago)

Author:

vboxsync

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

43584

Message:

VMM,REM,DevPcArch: VBOX_WITH_NEW_PHYS_CODE changes.

Location:

trunk/include/VBox

Files:

• mm.h (modified) (6 diffs)
• pdmdev.h (modified) (5 diffs)
• pgm.h (modified) (1 diff)
• rem.h (modified) (1 diff)
• types.h (modified) (1 diff)

trunk/include/VBox/mm.h

@@ -44 +44 @@
  */
 
+#ifndef VBOX_WITH_NEW_PHYS_CODE
 /** @name RAM Page Flags
  * Since internal ranges have a byte granularity it's possible for a
@@ -53 +54 @@
  * @{
  */
-#if 1
 /** Reserved - Not RAM, ROM nor MMIO2.
  * If this bit is cleared the memory is assumed to be some kind of RAM.
@@ -82 +82 @@
  */
 #define MM_RAM_FLAGS_MMIO2              RT_BIT(3)
-#endif
-
-#ifndef VBOX_WITH_NEW_PHYS_CODE
+
 /** Physical backing memory is allocated dynamically. Not set implies a one time static allocation. */
 #define MM_RAM_FLAGS_DYNAMIC_ALLOC      RT_BIT(11)
-#endif /* !VBOX_WITH_NEW_PHYS_CODE */
 
 /** The shift used to get the reference count. */
@@ -107 +104 @@
 /** @} */
 
-#ifndef VBOX_WITH_NEW_PHYS_CODE
 /** @name MMR3PhysRegisterEx registration type
  * @{
@@ -121 +117 @@
 } MMPHYSREG;
 /** @} */
-#endif
+#endif /* !VBOX_WITH_NEW_PHYS_CODE */
 
 /**
@@ -353 +349 @@
  * @ingroup grp_mm_r3
  * @{ */
+#ifndef VBOX_WITH_NEW_PHYS_CODE
 VMMR3DECL(int)      MMR3PhysRegister(PVM pVM, void *pvRam, RTGCPHYS GCPhys, unsigned cb, unsigned fFlags, const char *pszDesc);
-#ifndef VBOX_WITH_NEW_PHYS_CODE
 VMMR3DECL(int)      MMR3PhysRegisterEx(PVM pVM, void *pvRam, RTGCPHYS GCPhys, unsigned cb, unsigned fFlags, MMPHYSREG enmType, const char *pszDesc);
-#endif
 VMMR3DECL(int)      MMR3PhysRomRegister(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhys, RTUINT cbRange, const void *pvBinary, bool fShadow, const char *pszDesc);
 VMMR3DECL(int)      MMR3PhysRomProtect(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange);
 VMMR3DECL(int)      MMR3PhysReserve(PVM pVM, RTGCPHYS GCPhys, RTUINT cbRange, const char *pszDesc);
+#endif
 VMMR3DECL(uint64_t) MMR3PhysGetRamSize(PVM pVM);
 /** @} */

trunk/include/VBox/pdmdev.h

@@ -41 +41 @@
 #include <VBox/cfgm.h>
 #include <VBox/dbgf.h>
-#include <VBox/mm.h>
+#ifndef VBOX_WITH_NEW_PHYS_CODE
+# include <VBox/mm.h>
+#endif
 #include <VBox/err.h>
 #include <VBox/pci.h>
@@ -2660 +2662 @@
 
     /**
-     * Write protects a shadow ROM mapping.
-     *
-     * This is intented for use by the system BIOS or by the device that
-     * employs a shadow ROM BIOS, so that the shadow ROM mapping can be
-     * write protected once the POST is over.
+     * Changes the protection of shadowed ROM mapping.
+     *
+     * This is intented for use by the system BIOS, chipset or device in question to
+     * change the protection of shadowed ROM code after init and on reset.
      *
      * @param   pDevIns     Device instance.
-     * @param   GCPhysStart Where the shadow ROM mapping starts.
-     * @param   cbRange     The size of the shadow ROM mapping.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnROMProtectShadow,(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange));
+     * @param   GCPhysStart Where the mapping starts.
+     * @param   cbRange     The size of the mapping.
+     * @param   enmProt     The new protection type.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnROMProtectShadow,(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, PGMROMPROT enmProt));
 
     /**
@@ -3294 +3296 @@
  * @copydoc PDMDEVHLPR3::pfnROMProtectShadow
  */
-DECLINLINE(int) PDMDevHlpROMProtectShadow(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange)
-{
-    return pDevIns->pDevHlpR3->pfnROMProtectShadow(pDevIns, GCPhysStart, cbRange);
+DECLINLINE(int) PDMDevHlpROMProtectShadow(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, PGMROMPROT enmProt)
+{
+    return pDevIns->pDevHlpR3->pfnROMProtectShadow(pDevIns, GCPhysStart, cbRange, enmProt);
 }
 
@@ -3511 +3513 @@
 }
 
+#ifndef VBOX_WITH_NEW_PHYS_CODE
 /**
  * @copydoc PDMDEVHLPR3::pfnPhysReserve
@@ -3518 +3521 @@
     return pDevIns->pDevHlpR3->pfnPhysReserve(pDevIns, GCPhys, cbRange, pszDesc);
 }
+#endif
 
 /**

trunk/include/VBox/pgm.h

@@ -273 +273 @@
  */
 #define PGMMODE_IS_LONG_MODE(enmMode) ((enmMode) == PGMMODE_AMD64_NX || (enmMode) == PGMMODE_AMD64)
-
-/**
- * The current ROM page protection.
- */
-typedef enum PGMROMPROT
-{
-    /** The customary invalid value. */
-    PGMROMPROT_INVALID = 0,
-    /** Read from the virgin ROM page, ignore writes.
-     * Map the virgin page, use write access handler to ignore writes. */
-    PGMROMPROT_READ_ROM_WRITE_IGNORE,
-    /** Read from the virgin ROM page, write to the shadow RAM.
-     * Map the virgin page, use write access handler change the RAM. */
-    PGMROMPROT_READ_ROM_WRITE_RAM,
-    /** Read from the shadow ROM page, ignore writes.
-     * Map the shadow page read-only, use write access handler to ignore writes. */
-    PGMROMPROT_READ_RAM_WRITE_IGNORE,
-    /** Read from the shadow ROM page, ignore writes.
-     * Map the shadow page read-write, disabled write access handler. */
-    PGMROMPROT_READ_RAM_WRITE_RAM,
-    /** The end of valid values. */
-    PGMROMPROT_END,
-    /** The usual 32-bit type size hack. */
-    PGMROMPROT_32BIT_HACK = 0x7fffffff
-} PGMROMPROT;
 
 /**

trunk/include/VBox/rem.h

@@ -82 +82 @@
 #endif
 REMR3DECL(void) REMR3NotifyPhysRomRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, void *pvCopy, bool fShadow);
-REMR3DECL(void) REMR3NotifyPhysReserve(PVM pVM, RTGCPHYS GCPhys, RTUINT cb);
+REMR3DECL(void) REMR3NotifyPhysRamDeregister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb);
 REMR3DECL(void) REMR3NotifyHandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler);
 REMR3DECL(void) REMR3NotifyHandlerPhysicalDeregister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM);

trunk/include/VBox/types.h

@@ -543 +543 @@
 typedef PDMDATASEG const *PCPDMDATASEG;
 
+
+/**
+ * The current ROM page protection.
+ */
+typedef enum PGMROMPROT
+{
+    /** The customary invalid value. */
+    PGMROMPROT_INVALID = 0,
+    /** Read from the virgin ROM page, ignore writes.
+     * Map the virgin page, use write access handler to ignore writes. */
+    PGMROMPROT_READ_ROM_WRITE_IGNORE,
+    /** Read from the virgin ROM page, write to the shadow RAM.
+     * Map the virgin page, use write access handler change the RAM. */
+    PGMROMPROT_READ_ROM_WRITE_RAM,
+    /** Read from the shadow ROM page, ignore writes.
+     * Map the shadow page read-only, use write access handler to ignore writes. */
+    PGMROMPROT_READ_RAM_WRITE_IGNORE,
+    /** Read from the shadow ROM page, ignore writes.
+     * Map the shadow page read-write, disabled write access handler. */
+    PGMROMPROT_READ_RAM_WRITE_RAM,
+    /** The end of valid values. */
+    PGMROMPROT_END,
+    /** The usual 32-bit type size hack. */
+    PGMROMPROT_32BIT_HACK = 0x7fffffff
+} PGMROMPROT;
+
+
 /** @} */