Correct Minor Comments in M3 to M4 review.

[mirror_edk2.git] / MdePkg / Include / IndustryStandard / Sal.h

diff --git a/MdePkg/Include/IndustryStandard/Sal.h b/MdePkg/Include/IndustryStandard/Sal.h
index 37e7dbe71b947c61d80cac0dafd71ba414784440..bf6c54b1307185ff4be86b172c0cc0b6176e4006 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Sal.h
+++ b/MdePkg/Include/IndustryStandard/Sal.h
@@ -87,7 +87,7 @@ typedef struct {
 /**\r
   Prototype of SAL procedures.\r
 \r
-  @param  Arg0               Functional identifier.\r
+  @param  FunctionId         Functional identifier.\r
                              The upper 32 bits are ignored and only the lower 32 bits\r
                              are used. The following functional identifiers are defined:\r
                              0x01XXXXXX - Architected SAL functional group.\r
@@ -113,13 +113,13 @@ typedef
 SAL_RETURN_REGS\r
 (EFIAPI *SAL_PROC) (\r
   IN UINT64 FunctionId,\r
+  IN UINT64 Arg1,\r
   IN UINT64 Arg2,\r
   IN UINT64 Arg3,\r
   IN UINT64 Arg4,\r
   IN UINT64 Arg5,\r
   IN UINT64 Arg6,\r
-  IN UINT64 Arg7,\r
-  IN UINT64 Arg8\r
+  IN UINT64 Arg7\r
   );\r
 \r
 //\r
@@ -341,6 +341,7 @@ typedef struct _SAL_UPDATE_PAL_INFO_BLOCK {
 ///\r
 /// SAL System Table Definitions\r
 ///\r
+#pragma pack(1)\r
 typedef struct {\r
   ///\r
   /// The ASCII string representation of "SST_" which confirms the presence of the table. \r
@@ -415,7 +416,7 @@ typedef struct {
 #define EFI_SAL_ST_AP_WAKEUP_SIZE          16\r
 \r
 ///\r
-/// Format Entrypoint Descriptor Entry\r
+/// Format of Entrypoint Descriptor Entry\r
 ///\r
 typedef struct {\r
   UINT8   Type;         ///< Type here should be 0\r
@@ -427,7 +428,7 @@ typedef struct {
 } SAL_ST_ENTRY_POINT_DESCRIPTOR;\r
 \r
 ///\r
-/// Format Platform Features Descriptor Entry\r
+/// Format of Platform Features Descriptor Entry\r
 ///\r
 typedef struct {\r
   UINT8 Type;           ///< Type here should be 2\r
@@ -468,7 +469,7 @@ typedef struct {
   UINT64  NumberOfProcessors;\r
   UINT64  LocalIDRegister;\r
 } SAL_COHERENCE_DOMAIN_INFO;\r
-\r
+           \r
 ///\r
 /// Format of Purge Translation Cache Coherence Domain Entry\r
 ///\r
@@ -637,9 +638,6 @@ typedef struct {
 #define PROC_CR_LID_VALID_BIT_MASK          0x4\r
 #define PROC_STATIC_STRUCT_VALID_BIT_MASK   0x8\r
 #define CPU_INFO_VALID_BIT_MASK             0x1000000\r
-\r
-#pragma pack(1)\r
-\r
 ///\r
 /// Definition of Processor Machine Check Error Record\r
 ///\r
@@ -658,8 +656,6 @@ typedef struct {
   PSI_STATIC_STRUCT PsiValidData;\r
 } SAL_PROCESSOR_ERROR_RECORD;\r
 \r
-#pragma pack()\r
-\r
 ///\r
 /// GUID of Platform Memory Device Error Info\r
 ///\r
@@ -785,7 +781,6 @@ typedef struct {
   UINT8   SegmentNumber;\r
   UINT8   Reserved[5];\r
 } PCI_COMP_INFO;\r
-\r
 ///\r
 /// Definition of Platform PCI Component Error Info\r
 ///\r
@@ -819,8 +814,6 @@ typedef struct {
 #define SEL_EVENT_DATA1_VALID_BIT_MASK    0x80;\r
 #define SEL_EVENT_DATA2_VALID_BIT_MASK    0x100;\r
 #define SEL_EVENT_DATA3_VALID_BIT_MASK    0x200;\r
-\r
-#pragma pack(1)\r
 ///\r
 /// Definition of Platform SEL Device Error Info Record\r
 ///\r
@@ -839,7 +832,6 @@ typedef struct {
   UINT8           Data2;\r
   UINT8           Data3;\r
 } SAL_SEL_DEVICE_ERROR_RECORD;\r
-#pragma pack()\r
 \r
 ///\r
 /// GUID of Platform SMBIOS Device Error Info\r
@@ -913,4 +905,6 @@ typedef union {
   UINT8                               *Raw;\r
 } SAL_ERROR_RECORDS_POINTERS;\r
 \r
+#pragma pack()\r
+\r
 #endif\r