Move EFI_SMRAM_DESCRIPTOR into PiMultiPhase.h. Since the top level includes in the...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10105 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h
index b8decc5fbf87d8ece973ebcb6c1594b814296073..8dcc0d1670ac58751e09bd6a27855d56ec6993a1 100644 (file)
--- a/MdePkg/Include/Pi/PiMultiPhase.h
+++ b/MdePkg/Include/Pi/PiMultiPhase.h
@@ -1,7 +1,7 @@
 /** @file\r
   Include file matches things in PI for multiple module types.\r
 \r
-  Copyright (c) 2006 - 2009, Intel Corporation                                                         \r
+  Copyright (c) 2006 - 2010, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -94,4 +94,43 @@
 #define EFI_AUTH_STATUS_ALL                 0x0f\r
 ///@}\r
 \r
+///\r
+/// SMRAM states and capabilities\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
+#define EFI_NEEDS_TESTING               0x00000020\r
+#define EFI_NEEDS_ECC_INITIALIZATION    0x00000040\r
+\r
+///\r
+/// Structure describing a SMRAM region and its accessibility attributes\r
+///\r
+typedef struct {\r
+  ///\r
+  /// Designates the physical address of the SMRAM in memory. This view of memory is \r
+  /// the same as seen by I/O-based agents, for example, but it may not be the address seen \r
+  /// by the processors.\r
+  ///\r
+  EFI_PHYSICAL_ADDRESS  PhysicalStart;\r
+  ///\r
+  /// Designates the address of the SMRAM, as seen by software executing on the \r
+  /// processors. This address may or may not match PhysicalStart.\r
+  ///\r
+  EFI_PHYSICAL_ADDRESS  CpuStart;       \r
+  ///\r
+  /// Describes the number of bytes in the SMRAM region.\r
+  ///\r
+  UINT64                PhysicalSize;\r
+  ///\r
+  /// Describes the accessibility attributes of the SMRAM.  These attributes include the \r
+  /// hardware state (e.g., Open/Closed/Locked), capability (e.g., cacheable), logical \r
+  /// allocation (e.g., allocated), and pre-use initialization (e.g., needs testing/ECC \r
+  /// initialization).\r
+  ///\r
+  UINT64                RegionState;\r
+} EFI_SMRAM_DESCRIPTOR;\r
+\r
 #endif\r

diff --git a/MdePkg/Include/Protocol/SmmAccess2.h b/MdePkg/Include/Protocol/SmmAccess2.h
index d33578d275502182a98a8e21aa8c1fbe3474ba79..a8c6c2ebe0fe778e56b258f507d8a9dbc4fd1a8b 100644 (file)
--- a/MdePkg/Include/Protocol/SmmAccess2.h
+++ b/MdePkg/Include/Protocol/SmmAccess2.h
@@ -11,7 +11,7 @@
   - Preserving the system integrity, or "locking" the SMRAM, such that the settings cannot be \r
     perturbed by either boot service or runtime agents \r
 \r
-  Copyright (c) 2009, Intel Corporation                                                         \r
+  Copyright (c) 2009 - 2010, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -25,8 +25,6 @@
 #ifndef _SMM_ACCESS2_H_\r
 #define _SMM_ACCESS2_H_\r
 \r
-#include <PiDxe.h>\r
-\r
 ///\r
 /// Note:\r
 ///   To avoid name conflict between PI and Framework SMM spec, the following names defined\r
@@ -43,44 +41,6 @@
      0xc2702b74, 0x800c, 0x4131, {0x87, 0x46, 0x8f, 0xb5, 0xb8, 0x9c, 0xe4, 0xac } \\r
   }\r
 \r
-///\r
-/// SMRAM states and capabilities\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
-#define EFI_NEEDS_TESTING               0x00000020\r
-#define EFI_NEEDS_ECC_INITIALIZATION    0x00000040\r
-\r
-///\r
-/// Structure describing a SMRAM region and its accessibility attributes\r
-///\r
-typedef struct {\r
-  ///\r
-  /// Designates the physical address of the SMRAM in memory. This view of memory is \r
-  /// the same as seen by I/O-based agents, for example, but it may not be the address seen \r
-  /// by the processors.\r
-  ///\r
-  EFI_PHYSICAL_ADDRESS  PhysicalStart;\r
-  ///\r
-  /// Designates the address of the SMRAM, as seen by software executing on the \r
-  /// processors. This address may or may not match PhysicalStart.\r
-  ///\r
-  EFI_PHYSICAL_ADDRESS  CpuStart;       \r
-  ///\r
-  /// Describes the number of bytes in the SMRAM region.\r
-  ///\r
-  UINT64                PhysicalSize;\r
-  ///\r
-  /// Describes the accessibility attributes of the SMRAM.  These attributes include the \r
-  /// hardware state (e.g., Open/Closed/Locked), capability (e.g., cacheable), logical \r
-  /// allocation (e.g., allocated), and pre-use initialization (e.g., needs testing/ECC \r
-  /// initialization).\r
-  ///\r
-  UINT64                RegionState;\r
-} EFI_SMRAM_DESCRIPTOR;\r
 \r
 typedef struct _EFI_SMM_ACCESS2_PROTOCOL  EFI_SMM_ACCESS2_PROTOCOL;\r
 \r