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

3 files changed, 3 insertions, 3 deletions

diff --git a/MdePkg/Include/Guid/FileInfo.h b/MdePkg/Include/Guid/FileInfo.h
index 271005f309..da5868920d 100644
--- a/MdePkg/Include/Guid/FileInfo.h
+++ b/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;

 

diff --git a/MdePkg/Include/Guid/FileSystemInfo.h b/MdePkg/Include/Guid/FileSystemInfo.h
index d1515a8c2a..9a937cbf28 100644
--- a/MdePkg/Include/Guid/FileSystemInfo.h
+++ b/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;

 

diff --git a/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h b/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
index 20f798328d..9d56e47677 100644
--- a/MdePkg/Include/Guid/FileSystemVolumeLabelInfo.h
+++ b/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;