added EFI_SIGNATURE_XX in Base.h, and updated the industry header files to use them.

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

1 files changed, 4 insertions, 5 deletions

diff --git a/MdePkg/Include/Uefi/UefiBaseType.h b/MdePkg/Include/Uefi/UefiBaseType.h
index fff78a80e5..fb87559c45 100644
--- a/MdePkg/Include/Uefi/UefiBaseType.h
+++ b/MdePkg/Include/Uefi/UefiBaseType.h
@@ -157,11 +157,10 @@ typedef union {
 //

 // Define macros to build data structure signatures from characters.

 //

-#define EFI_SIGNATURE_16(A, B)        ((A) | (B << 8))

-#define EFI_SIGNATURE_32(A, B, C, D)  (EFI_SIGNATURE_16 (A, B) | (EFI_SIGNATURE_16 (C, D) << 16))

-#define EFI_SIGNATURE_64(A, B, C, D, E, F, G, H) \

-    (EFI_SIGNATURE_32 (A, B, C, D) | ((UINT64) (EFI_SIGNATURE_32 (E, F, G, H)) << 32))

-

+#define EFI_SIGNATURE_16(A, B)                    SIGNATURE_16 (A, B)

+#define EFI_SIGNATURE_32(A, B, C, D)              SIGNATURE_32 (A, B, C, D)

+#define EFI_SIGNATURE_64(A, B, C, D, E, F, G, H)  SIGNATURE_64 (A, B, C, D, E, F, G, H)

+    

 

 ///

 ///  Returns the byte offset to a field within a structure