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@7056 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 5 insertions, 5 deletions

diff --git a/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOver.h b/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOver.h
index 50622b8bd3..a2e5bf4f67 100644
--- a/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOver.h
+++ b/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOver.h
@@ -39,7 +39,7 @@
 #include <Guid/OverrideVariable.h>

 

 

-#define PLATFORM_OVERRIDE_ITEM_SIGNATURE      EFI_SIGNATURE_32('p','d','o','i')

+#define PLATFORM_OVERRIDE_ITEM_SIGNATURE      SIGNATURE_32('p','d','o','i')

  typedef struct _PLATFORM_OVERRIDE_ITEM {

   UINTN                                 Signature;

   LIST_ENTRY                            Link;

@@ -52,7 +52,7 @@
   EFI_HANDLE                            LastReturnedImageHandle;

 } PLATFORM_OVERRIDE_ITEM;

 

-#define DRIVER_IMAGE_INFO_SIGNATURE           EFI_SIGNATURE_32('p','d','i','i')

+#define DRIVER_IMAGE_INFO_SIGNATURE           SIGNATURE_32('p','d','i','i')

 typedef struct _DRIVER_IMAGE_INFO {

   UINTN                                 Signature;

   LIST_ENTRY                            Link;

@@ -62,7 +62,7 @@ typedef struct _DRIVER_IMAGE_INFO {
   BOOLEAN                               UnStartable;

 } DRIVER_IMAGE_INFO;

 

-#define DEVICE_PATH_STACK_ITEM_SIGNATURE      EFI_SIGNATURE_32('d','p','s','i')

+#define DEVICE_PATH_STACK_ITEM_SIGNATURE      SIGNATURE_32('d','p','s','i')

 typedef struct _DEVICE_PATH_STACK_ITEM{

   UINTN                                 Signature;

   LIST_ENTRY                            Link;

diff --git a/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c b/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c
index b746c68bf5..5f9985f11f 100644
--- a/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c
+++ b/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c
@@ -159,7 +159,7 @@ FreeMappingDatabase (
   // The entry which contains the mapping that Controller Device Path to a set of Driver Device Paths

   // There are often multi mapping entries in a variable.

   //

-  UINT32                         SIGNATURE;            //EFI_SIGNATURE_32('p','d','o','i')

+  UINT32                         SIGNATURE;            //SIGNATURE_32('p','d','o','i')

   UINT32                         DriverNum;

   EFI_DEVICE_PATH_PROTOCOL       ControllerDevicePath[];

   EFI_DEVICE_PATH_PROTOCOL       DriverDevicePath[];

diff --git a/MdeModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/MdeModulePkg/Library/GenericBdsLib/InternalBdsLib.h
index b1bf7fcdda..cb11b6e02d 100644
--- a/MdeModulePkg/Library/GenericBdsLib/InternalBdsLib.h
+++ b/MdeModulePkg/Library/GenericBdsLib/InternalBdsLib.h
@@ -71,7 +71,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PcdLib.h>

 #include <Library/DxeServicesLib.h>

 

-#define PERFORMANCE_SIGNATURE   EFI_SIGNATURE_32 ('P', 'e', 'r', 'f')

+#define PERFORMANCE_SIGNATURE   SIGNATURE_32 ('P', 'e', 'r', 'f')

 #define PERF_TOKEN_SIZE         28

 #define PERF_TOKEN_LENGTH       (PERF_TOKEN_SIZE - 1)

 #define PERF_PEI_ENTRY_MAX_NUM  50