Clean up to update the reference of the these macros:

EFI_SIGNATURE_16 -> SIGNATURE_16
  EFI_SIGNATURE_32 -> SIGNATURE_32
  EFI_SIGNATURE_64 -> SIGNATURE_64
  EFI_FIELD_OFFSET -> OFFSET_OF
  EFI_MAX_BIT      -> MAX_BIT
  EFI_MAX_ADDRESS  -> MAX_ADDRESS
These macros are not defined in UEFI spec. It makes more sense to use the equivalent macros in Base.h to avoid alias.


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

MdePkg/Include/Guid/FileInfo.h

@@ -64,7 +64,7 @@ typedef struct {
 /// computes this size correctly no matter how big the FileName array is declared.
 /// This is required to make the EFI_FILE_INFO data structure ANSI compilant.
 ///
-#define SIZE_OF_EFI_FILE_INFO EFI_FIELD_OFFSET (EFI_FILE_INFO, FileName)
+#define SIZE_OF_EFI_FILE_INFO OFFSET_OF (EFI_FILE_INFO, FileName)
 
 extern EFI_GUID gEfiFileInfoGuid;
 

MdePkg/Include/Guid/FileSystemInfo.h

@@ -56,7 +56,7 @@ typedef struct {
 /// computes this size correctly no matter how big the VolumeLable array is declared.
 /// This is required to make the EFI_FILE_SYSTEM_INFO data structure ANSI compilant.
 ///
-#define SIZE_OF_EFI_FILE_SYSTEM_INFO  EFI_FIELD_OFFSET (EFI_FILE_SYSTEM_INFO, VolumeLabel)
+#define SIZE_OF_EFI_FILE_SYSTEM_INFO  OFFSET_OF (EFI_FILE_SYSTEM_INFO, VolumeLabel)
 
 extern EFI_GUID gEfiFileSystemInfoGuid;
 

MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h

@@ -30,7 +30,7 @@ typedef struct {
 } EFI_FILE_SYSTEM_VOLUME_LABEL;
 
 #define SIZE_OF_EFI_FILE_SYSTEM_VOLUME_LABEL \
-        EFI_FIELD_OFFSET (EFI_FILE_SYSTEM_VOLUME_LABEL, VolumeLabel)
+        OFFSET_OF (EFI_FILE_SYSTEM_VOLUME_LABEL, VolumeLabel)
 
 extern EFI_GUID gEfiFileSystemVolumeLabelInfoIdGuid;
 

MdePkg/Include/IndustryStandard/PeImage.h

@@ -335,7 +335,7 @@ typedef EFI_IMAGE_NT_HEADERS64    EFI_IMAGE_NT_HEADERS;
       (EFI_IMAGE_SECTION_HEADER *) \
         ( \
           (UINT32) ntheader + \
-          FIELD_OFFSET (EFI_IMAGE_NT_HEADERS, OptionalHeader) + \
+          OFFSET_OF (EFI_IMAGE_NT_HEADERS, OptionalHeader) + \
           ((EFI_IMAGE_NT_HEADERS *) (ntheader))->FileHeader.SizeOfOptionalHeader \
         ) \
     )

MdePkg/Include/IndustryStandard/Tpm12.h

@@ -19,7 +19,7 @@
 ///
 /// The start of TPM return codes
 ///
-#define TPM_BASE                    (EFI_MAX_BIT + (EFI_MAX_BIT >> 1))
+#define TPM_BASE                    (MAX_BIT + (MAX_BIT >> 1))
 
 //
 // All structures MUST be packed on a byte boundary.

MdePkg/Include/Pi/PiFirmwareVolume.h

@@ -155,7 +155,7 @@ typedef struct {
   EFI_FV_BLOCK_MAP_ENTRY    BlockMap[1];
 } EFI_FIRMWARE_VOLUME_HEADER;
 
-#define EFI_FVH_SIGNATURE EFI_SIGNATURE_32 ('_', 'F', 'V', 'H')
+#define EFI_FVH_SIGNATURE SIGNATURE_32 ('_', 'F', 'V', 'H')
 
 ///
 /// Firmware Volume Header Revision definition

MdePkg/Include/Protocol/DevicePath.h

@@ -853,7 +853,7 @@ typedef struct {
   CHAR16                          PathName[1];
 } FILEPATH_DEVICE_PATH;
 
-#define SIZE_OF_FILEPATH_DEVICE_PATH  EFI_FIELD_OFFSET(FILEPATH_DEVICE_PATH,PathName)
+#define SIZE_OF_FILEPATH_DEVICE_PATH  OFFSET_OF(FILEPATH_DEVICE_PATH,PathName)
 
 ///
 /// Media Protocol Device Path SubType

MdePkg/Include/Uefi/UefiSpec.h

@@ -1705,14 +1705,14 @@ EFI_STATUS
 //
 // EFI Runtime Services Table
 //
-#define EFI_SYSTEM_TABLE_SIGNATURE      EFI_SIGNATURE_64 ('I','B','I',' ','S','Y','S','T')
+#define EFI_SYSTEM_TABLE_SIGNATURE      SIGNATURE_64 ('I','B','I',' ','S','Y','S','T')
 #define EFI_SYSTEM_TABLE_REVISION       ((2 << 16) | (10))
 #define EFI_2_10_SYSTEM_TABLE_REVISION  ((2 << 16) | (10))
 #define EFI_2_00_SYSTEM_TABLE_REVISION  ((2 << 16) | (00))
 #define EFI_1_10_SYSTEM_TABLE_REVISION  ((1 << 16) | (10))
 #define EFI_1_02_SYSTEM_TABLE_REVISION  ((1 << 16) | (02))
 
-#define EFI_RUNTIME_SERVICES_SIGNATURE  EFI_SIGNATURE_64 ('R','U','N','T','S','E','R','V')
+#define EFI_RUNTIME_SERVICES_SIGNATURE  SIGNATURE_64 ('R','U','N','T','S','E','R','V')
 #define EFI_RUNTIME_SERVICES_REVISION   EFI_2_10_SYSTEM_TABLE_REVISION
 
 ///
@@ -1764,7 +1764,7 @@ typedef struct {
 } EFI_RUNTIME_SERVICES;
 
 
-#define EFI_BOOT_SERVICES_SIGNATURE   EFI_SIGNATURE_64 ('B','O','O','T','S','E','R','V')
+#define EFI_BOOT_SERVICES_SIGNATURE   SIGNATURE_64 ('B','O','O','T','S','E','R','V')
 #define EFI_BOOT_SERVICES_REVISION    EFI_2_10_SYSTEM_TABLE_REVISION
 
 ///

MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.c

@@ -20,7 +20,7 @@
 #include <Library/HobLib.h>
 #include <Library/ExtractGuidedSectionLib.h>
 
-#define PEI_EXTRACT_HANDLER_INFO_SIGNATURE EFI_SIGNATURE_32 ('P', 'E', 'H', 'I')
+#define PEI_EXTRACT_HANDLER_INFO_SIGNATURE SIGNATURE_32 ('P', 'E', 'H', 'I')
 
 typedef struct {
   UINT32                                  Signature;