X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FInclude%2FProtocol%2FSmmAccess2.h;h=eb315db1fbd48e2df71b5c84327f435178ab8217;hb=bd5ef82698e5e5931ae46e763187a472ce76b661;hp=17e884e6050738e6aef9f38544a7489728bc457a;hpb=8442c53e2b109931e1e053c82e18688e4a4484ad;p=mirror_edk2.git

diff --git a/MdePkg/Include/Protocol/SmmAccess2.h b/MdePkg/Include/Protocol/SmmAccess2.h
index 17e884e605..eb315db1fb 100644
--- a/MdePkg/Include/Protocol/SmmAccess2.h
+++ b/MdePkg/Include/Protocol/SmmAccess2.h
@@ -11,8 +11,8 @@
   - Preserving the system integrity, or "locking" the SMRAM, such that the settings cannot be 
     perturbed by either boot service or runtime agents 
 
-  Copyright (c) 2009, Intel Corporation                                                         
-  All rights reserved. This program and the accompanying materials                          
+  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials                          
   are licensed and made available under the terms and conditions of the BSD License         
   which accompanies this distribution.  The full text of the license may be found at        
   http://opensource.org/licenses/bsd-license.php                                            
@@ -25,51 +25,11 @@
 #ifndef _SMM_ACCESS2_H_
 #define _SMM_ACCESS2_H_
 
-#include <PiDxe.h>
-
 #define EFI_SMM_ACCESS2_PROTOCOL_GUID \
   { \
      0xc2702b74, 0x800c, 0x4131, {0x87, 0x46, 0x8f, 0xb5, 0xb8, 0x9c, 0xe4, 0xac } \
   }
 
-///
-/// SMRAM states and capabilities
-///
-#define EFI_SMRAM_OPEN                  0x00000001
-#define EFI_SMRAM_CLOSED                0x00000002
-#define EFI_SMRAM_LOCKED                0x00000004
-#define EFI_CACHEABLE                   0x00000008
-#define EFI_ALLOCATED                   0x00000010
-#define EFI_NEEDS_TESTING               0x00000020
-#define EFI_NEEDS_ECC_INITIALIZATION    0x00000040
-
-///
-/// Structure describing a SMRAM region and its accessibility attributes
-///
-typedef struct {
-  ///
-  /// Designates the physical address of the SMRAM in memory. This view of memory is 
-  /// the same as seen by I/O-based agents, for example, but it may not be the address seen 
-  /// by the processors.
-  ///
-  EFI_PHYSICAL_ADDRESS  PhysicalStart;
-  ///
-  /// Designates the address of the SMRAM, as seen by software executing on the 
-  /// processors. This address may or may not match PhysicalStart.
-  ///
-  EFI_PHYSICAL_ADDRESS  CpuStart;       
-  ///
-  /// Describes the number of bytes in the SMRAM region.
-  ///
-  UINT64                PhysicalSize;
-  ///
-  /// Describes the accessibility attributes of the SMRAM.  These attributes include the 
-  /// hardware state (e.g., Open/Closed/Locked), capability (e.g., cacheable), logical 
-  /// allocation (e.g., allocated), and pre-use initialization (e.g., needs testing/ECC 
-  /// initialization).
-  ///
-  UINT64                RegionState;
-} EFI_SMRAM_DESCRIPTOR;
 
 typedef struct _EFI_SMM_ACCESS2_PROTOCOL  EFI_SMM_ACCESS2_PROTOCOL;
 
@@ -88,8 +48,8 @@ typedef struct _EFI_SMM_ACCESS2_PROTOCOL  EFI_SMM_ACCESS2_PROTOCOL;
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_SMM_OPEN)(
-  IN CONST EFI_SMM_ACCESS2_PROTOCOL  *This
+(EFIAPI *EFI_SMM_OPEN2)(
+  IN EFI_SMM_ACCESS2_PROTOCOL  *This
   );
 
 /**
@@ -106,8 +66,8 @@ EFI_STATUS
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_SMM_CLOSE)(
-  IN CONST EFI_SMM_ACCESS2_PROTOCOL  *This
+(EFIAPI *EFI_SMM_CLOSE2)(
+  IN EFI_SMM_ACCESS2_PROTOCOL  *This
   );
 
 /**
@@ -123,8 +83,8 @@ EFI_STATUS
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_SMM_LOCK)(
-  IN CONST EFI_SMM_ACCESS2_PROTOCOL  *This
+(EFIAPI *EFI_SMM_LOCK2)(
+  IN EFI_SMM_ACCESS2_PROTOCOL  *This
   );
 
 /**
@@ -140,7 +100,7 @@ EFI_STATUS
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_SMM_CAPABILITIES)(
+(EFIAPI *EFI_SMM_CAPABILITIES2)(
   IN CONST EFI_SMM_ACCESS2_PROTOCOL  *This,
   IN OUT UINTN                       *SmramMapSize,
   IN OUT EFI_SMRAM_DESCRIPTOR        *SmramMap
@@ -152,10 +112,10 @@ EFI_STATUS
 ///  that the north bridge or memory controller would publish this protocol.
 /// 
 struct _EFI_SMM_ACCESS2_PROTOCOL {
-  EFI_SMM_OPEN          Open;
-  EFI_SMM_CLOSE         Close;
-  EFI_SMM_LOCK          Lock;
-  EFI_SMM_CAPABILITIES  GetCapabilities;
+  EFI_SMM_OPEN2          Open;
+  EFI_SMM_CLOSE2         Close;
+  EFI_SMM_LOCK2          Lock;
+  EFI_SMM_CAPABILITIES2  GetCapabilities;
   ///
   /// Indicates the current state of the SMRAM. Set to TRUE if SMRAM is locked.
   ///