X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFrameworkPkg%2FInclude%2FFramework%2FSmmCis.h;h=122c471add9b09f9ce307a4928eda11340bf6189;hp=d6572d01417b5a468f572460ef915750e3568733;hb=b6d47a83ac311c8980472f3d83ff477f58491a7c;hpb=18d7ae2ee6d2fc861bd74e68d3d495e6ff3a88cc

diff --git a/IntelFrameworkPkg/Include/Framework/SmmCis.h b/IntelFrameworkPkg/Include/Framework/SmmCis.h
index d6572d0141..122c471add 100644
--- a/IntelFrameworkPkg/Include/Framework/SmmCis.h
+++ b/IntelFrameworkPkg/Include/Framework/SmmCis.h
@@ -16,8 +16,6 @@
 #ifndef _FRAMEWORK_SMM_CIS_H_
 #define _FRAMEWORK_SMM_CIS_H_
 
-#include <Framework/DxeCis.h>
-
 #define EFI_SMM_CPU_IO_GUID \
   { \
     0x5f439a0b, 0x45d8, 0x4682, {0xa4, 0xf4, 0xf0, 0x57, 0x6b, 0x51, 0x34, 0x41 } \
@@ -104,7 +102,7 @@ struct _EFI_SMM_CPU_IO_INTERFACE {
   @retval EFI_SUCCESS           The requested number of bytes was allocated.
   @retval EFI_OUT_OF_RESOURCES  The pool requested could not be allocated.
   @retval EFI_UNSUPPORTED       In runtime.
-  @Note: Inconsistent with specification here:
+  @note: Inconsistent with specification here:
          In Framework Spec, This definition is naming EFI_SMM_ALLOCATE_POOL. However, 
          To avoid the naming conflict, the definition is renamed.
 **/
@@ -124,7 +122,7 @@ EFI_STATUS
   @retval EFI_SUCCESS           The memory was returned to the system.
   @retval EFI_INVALID_PARAMETER Buffer was invalid.
   @retval EFI_UNSUPPORTED       In runtime.
-  @Note: Inconsistent with specification here:
+  @note: Inconsistent with specification here:
          In Framework Spec, This definition is naming EFI_SMM_FREE_POOL However, 
          To avoid the naming conflict, the definition is renamed.
 **/
@@ -149,7 +147,7 @@ EFI_STATUS
   @retval EFI_NOT_FOUND         The requested pages could not be found.
   @retval EFI_INVALID_PARAMETER Type is not AllocateAnyPages or AllocateMaxAddress
                                 or AllocateAddress. Or MemoryType is in the range EfiMaxMemoryType..0x7FFFFFFF.
-  @Note: Inconsistent with specification here:
+  @note: Inconsistent with specification here:
          In Framework Spec, This definition is naming EFI_SMM_ALLOCATE_PAGES However, 
          To avoid the naming conflict, the definition is renamed.
 **/
@@ -172,7 +170,7 @@ EFI_STATUS
   @retval EFI_INVALID_PARAMETER Memory is not a page-aligned address or NumberOfPages is invalid.
   @retval EFI_NOT_FOUND         The requested memory pages were not allocated with SmmAllocatePages().
   
-  @Note: Inconsistent with specification here:
+  @note: Inconsistent with specification here:
          In Framework Spec, This definition is naming EFI_SMM_FREE_PAGES However, 
          To avoid the naming conflict, the definition is renamed.
 **/
@@ -182,6 +180,7 @@ EFI_STATUS
   IN EFI_PHYSICAL_ADDRESS   Memory,
   IN UINTN                  NumberOfPages
   );
+
 /**
   Frees memory pages for the system.
 
@@ -197,7 +196,7 @@ EFI_STATUS
   @retval EFI_INVALID_PARAMETER The CPU requested is not available on this SMI invocation.
   @retval EFI_INVALID_PARAMETER The CPU cannot support an additional service invocation.
   
-  @Note: Inconsistent with specification here:
+  @note: Inconsistent with specification here:
          In Framework Spec, No this definition. This method is introduced in PI1.0 spec for 
          implementation needed.
          
@@ -205,7 +204,7 @@ EFI_STATUS
 typedef
 EFI_STATUS
 (EFIAPI *EFI_SMM_STARTUP_THIS_AP)(
-  IN  EFI_AP_PROCEDURE                    Procedure,
+  IN  FRAMEWORK_EFI_AP_PROCEDURE          Procedure,
   IN  UINTN                               CpuNumber,
   IN  OUT VOID                            *ProcArguments OPTIONAL
   );