Rename PI SMM definitions which has same name with those of Framework SMM spec but...

[mirror_edk2.git] / IntelFrameworkPkg / Include / Guid / SmramMemoryReserve.h

diff --git a/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h b/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
index ca54e69cc424e1fb43c5a435ff736550380966e7..045e06dfb355e2f7795fa9536a3beb5f8e527b34 100644 (file)
--- a/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
+++ b/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
@@ -25,36 +25,23 @@
 #ifndef _EFI_SMM_PEI_SMRAM_MEMORY_RESERVE_H_\r
 #define _EFI_SMM_PEI_SMRAM_MEMORY_RESERVE_H_\r
 \r
-#include <PiPei.h>\r
+//\r
+// Share some common definitions with PI SMM\r
+//\r
+#include <Protocol/SmmAccess2.h>\r
 \r
 #define EFI_SMM_PEI_SMRAM_MEMORY_RESERVE \\r
   { \\r
     0x6dadf1d1, 0xd4cc, 0x4910, {0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d } \\r
   }\r
 \r
-///\r
-/// Describes the candidate regions for SMRAM that are\r
-/// supported by this platform.\r
-///\r
-typedef struct {\r
-  EFI_PHYSICAL_ADDRESS  PhysicalStart;  ///< Designates the physical address of the SMRAM in memory.\r
-  EFI_PHYSICAL_ADDRESS  CpuStart;       ///< Designates the address of the SMRAM, as seen by software executing on the processors. \r
-  UINT64                PhysicalSize;   ///< Describes the number of bytes in the SMRAM region.\r
-  UINT64                RegionState;    ///< Describes the accessibility attributes of the SMRAM.\r
-} EFI_SMRAM_DESCRIPTOR;\r
-\r
-//\r
-// Definition of SMRAM states, used as value for EFI_SMRAM_DESCRIPTOR.RegionState.\r
-//\r
-#define EFI_SMRAM_OPEN                0x00000001\r
-#define EFI_SMRAM_CLOSED              0x00000002\r
-#define EFI_SMRAM_LOCKED              0x00000004\r
-#define EFI_CACHEABLE                 0x00000008\r
-#define EFI_ALLOCATED                 0x00000010\r
-\r
-///\r
-/// GUID specific data structure of HOB for reserving SMRAM regions.\r
-///\r
+/**\r
+* GUID specific data structure of HOB for reserving SMRAM regions.\r
+*\r
+* Inconsistent with specification here: \r
+* EFI_HOB_SMRAM_DESCRIPTOR_BLOCK has been changed to EFI_SMRAM_HOB_DESCRIPTOR_BLOCK.\r
+* This inconsistency is kept in code in order for backward compatibility.\r
+**/\r
 typedef struct {\r
   ///\r
   /// Designates the number of possible regions in the system\r
@@ -66,8 +53,9 @@ typedef struct {
   /// regions for SMRAM that are supported by this platform. \r
   ///\r
   EFI_SMRAM_DESCRIPTOR  Descriptor[1];\r
-} EFI_HOB_SMRAM_DESCRIPTOR_BLOCK;\r
+} EFI_SMRAM_HOB_DESCRIPTOR_BLOCK;\r
 \r
 extern EFI_GUID gEfiSmmPeiSmramMemoryReserveGuid;\r
 \r
 #endif\r
+\r