Correct Minor Comments in M3 to M4 review.

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

diff --git a/MdePkg/Include/Ebc/ProcessorBind.h b/MdePkg/Include/Ebc/ProcessorBind.h
index 2e254ffb04ab609101fbffdf4a65c863fe45156b..7c10230eedde9c25beda9b7ce3af8b0ae7bdcb65 100644 (file)
--- a/MdePkg/Include/Ebc/ProcessorBind.h
+++ b/MdePkg/Include/Ebc/ProcessorBind.h
@@ -79,6 +79,15 @@ typedef unsigned long         UINTN;
 ///\r
 #define GLOBAL_REMOVE_IF_UNREFERENCED\r
 \r
+/**\r
+  Return the pointer to the first instruction of a function given a function pointer.\r
+  On EBC architectures, these two pointer values are the same, \r
+  so the implementation of this macro is very simple.\r
+  \r
+  @param  p A pointer to a function\r
+\r
+  @return The pointer to the first instruction of a function given a function pointer.\r
+**/\r
 #define FUNCTION_ENTRY_POINT(p) (p)\r
 \r
 #endif \r

diff --git a/MdePkg/Include/Guid/Acpi.h b/MdePkg/Include/Guid/Acpi.h
index ea616d3110c6186f990f741071bfbd7ac368bdbd..91e24f1b22747699c13523fe2e7b4b8be765c6d9 100644 (file)
--- a/MdePkg/Include/Guid/Acpi.h
+++ b/MdePkg/Include/Guid/Acpi.h
@@ -33,9 +33,9 @@
   }\r
 \r
 #define ACPI_10_TABLE_GUID     EFI_ACPI_10_TABLE_GUID\r
-///\r
-/// ACPI 2.0 or newer tables should use EFI_ACPI_TABLE_GUID.\r
-///\r
+//\r
+// ACPI 2.0 or newer tables should use EFI_ACPI_TABLE_GUID.\r
+//\r
 #define EFI_ACPI_20_TABLE_GUID EFI_ACPI_TABLE_GUID\r
 \r
 extern EFI_GUID gEfiAcpiTableGuid;\r

diff --git a/MdePkg/Include/Ia32/ProcessorBind.h b/MdePkg/Include/Ia32/ProcessorBind.h
index c452e62f32d1b8bdf44b1fc57efb4da8f39e749b..c3ca840242d492758ff4047c86e0d5723a5e8f46 100644 (file)
--- a/MdePkg/Include/Ia32/ProcessorBind.h
+++ b/MdePkg/Include/Ia32/ProcessorBind.h
@@ -209,6 +209,15 @@ typedef INT32   INTN;
   #endif \r
 #endif\r
 \r
+/**\r
+  Return the pointer to the first instruction of a function given a function pointer.\r
+  On IA32 CPU architectures, these two pointer values are the same, \r
+  so the implementation of this macro is very simple.\r
+  \r
+  @param  p A pointer to a function\r
+\r
+  @return The pointer to the first instruction of a function given a function pointer.\r
+**/\r
 #define FUNCTION_ENTRY_POINT(p) (p)\r
 \r
 #endif\r

diff --git a/MdePkg/Include/IndustryStandard/PeImage.h b/MdePkg/Include/IndustryStandard/PeImage.h
index 97a17e5eb5fcf0ce469b6d0e4ba4bcd8730d2d48..310f16b8e34f3cace31e87da835b5ed0cf72c109 100644 (file)
--- a/MdePkg/Include/IndustryStandard/PeImage.h
+++ b/MdePkg/Include/IndustryStandard/PeImage.h
@@ -134,8 +134,6 @@ typedef struct {
   UINT32  Size;\r
 } EFI_IMAGE_DATA_DIRECTORY;\r
 \r
-#define EFI_IMAGE_ROM_OPTIONAL_HDR_MAGIC      0x107\r
-\r
 //\r
 // Directory Entries\r
 //\r
@@ -386,7 +384,7 @@ typedef struct {
                                                    \r
 #define EFI_IMAGE_SCN_LNK_OTHER                    BIT8   ///< 0x00000100  ///< Reserved.\r
 #define EFI_IMAGE_SCN_LNK_INFO                     BIT9   ///< 0x00000200  ///< Section contains comments or some other type of information.\r
-#define EFI_IMAGE_SCN_LNK_REMOVE                   BIT10  ///< 0x00000800  ///< Section contents will not become part of image.\r
+#define EFI_IMAGE_SCN_LNK_REMOVE                   BIT11  ///< 0x00000800  ///< Section contents will not become part of image.\r
 #define EFI_IMAGE_SCN_LNK_COMDAT                   BIT12  ///< 0x00001000\r
                                                    \r
 #define EFI_IMAGE_SCN_ALIGN_1BYTES                 BIT20  ///< 0x00100000\r
@@ -566,15 +564,15 @@ typedef struct {
 //\r
 // Based relocation types.\r
 //\r
-#define EFI_IMAGE_REL_BASED_ABSOLUTE      0\r
-#define EFI_IMAGE_REL_BASED_HIGH          1\r
-#define EFI_IMAGE_REL_BASED_LOW           2\r
-#define EFI_IMAGE_REL_BASED_HIGHLOW       3\r
-#define EFI_IMAGE_REL_BASED_HIGHADJ       4\r
-#define EFI_IMAGE_REL_BASED_MIPS_JMPADDR  5\r
-#define EFI_IMAGE_REL_BASED_IA64_IMM64    9\r
-#define IMAGE_REL_BASED_MIPS_JMPADDR16    9\r
-#define EFI_IMAGE_REL_BASED_DIR64         10\r
+#define EFI_IMAGE_REL_BASED_ABSOLUTE        0\r
+#define EFI_IMAGE_REL_BASED_HIGH            1\r
+#define EFI_IMAGE_REL_BASED_LOW             2\r
+#define EFI_IMAGE_REL_BASED_HIGHLOW         3\r
+#define EFI_IMAGE_REL_BASED_HIGHADJ         4\r
+#define EFI_IMAGE_REL_BASED_MIPS_JMPADDR    5\r
+#define EFI_IMAGE_REL_BASED_IA64_IMM64      9\r
+#define EFI_IMAGE_REL_BASED_MIPS_JMPADDR16  9\r
+#define EFI_IMAGE_REL_BASED_DIR64           10\r
 \r
 ///\r
 /// Line number format.\r

diff --git a/MdePkg/Include/IndustryStandard/Sal.h b/MdePkg/Include/IndustryStandard/Sal.h
index ca1bfb2c29a044381d1d33ace18ff207a20feab9..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

diff --git a/MdePkg/Include/IndustryStandard/Scsi.h b/MdePkg/Include/IndustryStandard/Scsi.h
index ccb3590bdf28d6a100ad669a71c591c2f269f17d..c86c45287008386c78fe4dc7448a5e034d909523 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Scsi.h
+++ b/MdePkg/Include/IndustryStandard/Scsi.h
@@ -265,7 +265,7 @@ typedef struct {
 // defined here. Please refer to SCSI standard for full value definition.\r
 //\r
 #define EFI_SCSI_ASC_NOT_READY                    (0x04)\r
-#define   EFI_SCSI_ASCQ_IN_PROGRESS                 (0x01)\r
+#define EFI_SCSI_ASCQ_IN_PROGRESS                 (0x01)\r
 \r
 #define EFI_SCSI_ASC_MEDIA_ERR1                   (0x10)\r
 #define EFI_SCSI_ASC_MEDIA_ERR2                   (0x11)\r

diff --git a/MdePkg/Include/IndustryStandard/Tpm12.h b/MdePkg/Include/IndustryStandard/Tpm12.h
index eca5eec32717387d363501c3c4f30dbdf17e9f7d..77b2e9ad6b1fb1121ddbd299d2679ab6ac8959da 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Tpm12.h
+++ b/MdePkg/Include/IndustryStandard/Tpm12.h
@@ -1052,9 +1052,9 @@ typedef struct tdTPM_TRANSPORT_PUBLIC {
 //\r
 // Part 2, section 13.1.1 TPM_TRANSPORT_ATTRIBUTES Definitions\r
 //\r
-#define TPM_TRANSPORT_ENCRYPT       ((UINT32)0x00000001)\r
-#define TPM_TRANSPORT_LOG           ((UINT32)0x00000002)\r
-#define TPM_TRANSPORT_EXCLUSIVE     ((UINT32)0x00000004)\r
+#define TPM_TRANSPORT_ENCRYPT       ((UINT32)BIT0)\r
+#define TPM_TRANSPORT_LOG           ((UINT32)BIT1)\r
+#define TPM_TRANSPORT_EXCLUSIVE     ((UINT32)BIT2)\r
 \r
 ///\r
 /// Part 2, section 13.2 TPM_TRANSPORT_INTERNAL\r

diff --git a/MdePkg/Include/Ipf/ProcessorBind.h b/MdePkg/Include/Ipf/ProcessorBind.h
index 3dbeceb585cfd396d8d45eb9486999f88f42c860..31940a578854d89591c89f5817aec6f08987c78f 100644 (file)
--- a/MdePkg/Include/Ipf/ProcessorBind.h
+++ b/MdePkg/Include/Ipf/ProcessorBind.h
@@ -237,6 +237,18 @@ typedef struct {
   UINT64                    r11;\r
 } PAL_CALL_RETURN;\r
 \r
+/**\r
+  Return the pointer to the first instruction of a function given a function pointer.\r
+  For Itanium CPUs, all function calls are made through a PLABEL, so a pointer to a function \r
+  is actually a pointer to a PLABEL.  The pointer to the first instruction of the function \r
+  is contained within the PLABEL.  This macro may be used to retrieve a pointer to the first \r
+  instruction of a function independent of the CPU architecture being used.  This is very \r
+  useful when printing function addresses through DEBUG() macros.\r
+  \r
+  @param  p A pointer to a function\r
+\r
+  @return The pointer to the first instruction of a function given a function pointer.\r
+**/\r
 #define FUNCTION_ENTRY_POINT(p) (((EFI_PLABEL *)(p))->EntryPoint)\r
 \r
 #endif\r

diff --git a/MdePkg/Include/PiDxe.h b/MdePkg/Include/PiDxe.h
index d90368b5fa8a7a77cd129f9da73bf33715250cf2..3364cdf6220d044635002ebf9ea3e19ce195ceda 100644 (file)
--- a/MdePkg/Include/PiDxe.h
+++ b/MdePkg/Include/PiDxe.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Root include file for Mde Package DXE_CORE, DXE, SMM, SAL type modules.\r
+  Root include file for Mde Package DXE_CORE, DXE, RUNTIME, SMM, SAL type modules.\r
 \r
 Copyright (c) 2006 - 2007, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r

diff --git a/MdePkg/Include/X64/ProcessorBind.h b/MdePkg/Include/X64/ProcessorBind.h
index 3b61a3b826be2a3d64719310e549c0cf7fb239d8..2609a8e427f94e09752bfeebf04bcfb563c9cbce 100644 (file)
--- a/MdePkg/Include/X64/ProcessorBind.h
+++ b/MdePkg/Include/X64/ProcessorBind.h
@@ -238,6 +238,15 @@ typedef INT64   INTN;
   #endif  \r
 #endif\r
 \r
+/**\r
+  Return the pointer to the first instruction of a function given a function pointer.\r
+  On x64 CPU architectures, these two pointer values are the same, \r
+  so the implementation of this macro is very simple.\r
+  \r
+  @param  p A pointer to a function\r
+\r
+  @return The pointer to the first instruction of a function given a function pointer.\r
+**/\r
 #define FUNCTION_ENTRY_POINT(p) (p)\r
 \r
 #endif\r