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

diff --git a/DuetPkg/CpuIoDxe/CpuIo.c b/DuetPkg/CpuIoDxe/CpuIo.c
index 9e5be46df8462a73f5a285c912404e8694663e92..11a21360f79af99ffbf145ffff6468295b7a755c 100644 (file)
--- a/DuetPkg/CpuIoDxe/CpuIo.c
+++ b/DuetPkg/CpuIoDxe/CpuIo.c
@@ -159,7 +159,7 @@ Returns:
   PTR        Destination;\r
   EFI_STATUS Status;\r
 \r
-  Status = CpuIoCheckParameter (Width, Address, Count, Buffer, EFI_MAX_ADDRESS);\r
+  Status = CpuIoCheckParameter (Width, Address, Count, Buffer, MAX_ADDRESS);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -220,7 +220,7 @@ Returns:
   PTR        Destination;\r
   EFI_STATUS Status;\r
 \r
-  Status = CpuIoCheckParameter (Width, Address, Count, Buffer, EFI_MAX_ADDRESS);\r
+  Status = CpuIoCheckParameter (Width, Address, Count, Buffer, MAX_ADDRESS);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

diff --git a/DuetPkg/DxeIpl/LegacyTable.c b/DuetPkg/DxeIpl/LegacyTable.c
index ba9106915ead62d6332db6d5297e602c28d96565..823a25ac5a472d9171e4c0088a9a9f7a55bb1e5f 100644 (file)
--- a/DuetPkg/DxeIpl/LegacyTable.c
+++ b/DuetPkg/DxeIpl/LegacyTable.c
@@ -23,8 +23,8 @@ Revision History:
 #include "Debug.h"\r
 \r
 #define ACPI_RSD_PTR      0x2052545020445352LL\r
-#define MPS_PTR           EFI_SIGNATURE_32('_','M','P','_')\r
-#define SMBIOS_PTR        EFI_SIGNATURE_32('_','S','M','_')\r
+#define MPS_PTR           SIGNATURE_32('_','M','P','_')\r
+#define SMBIOS_PTR        SIGNATURE_32('_','S','M','_')\r
 \r
 #define EBDA_BASE_ADDRESS 0x40E\r
 \r
@@ -266,7 +266,7 @@ FindAcpiPtr (
 \r
 #pragma pack(1)\r
 //#define MCFG_SIGNATURE  0x4746434D\r
-#define MCFG_SIGNATURE EFI_SIGNATURE_32 ('M', 'C', 'F', 'G')\r
+#define MCFG_SIGNATURE SIGNATURE_32 ('M', 'C', 'F', 'G')\r
 typedef struct {\r
   UINT64  BaseAddress;\r
   UINT16  PciSegmentGroupNumber;\r
@@ -275,7 +275,7 @@ typedef struct {
   UINT32  Reserved;\r
 } MCFG_STRUCTURE;\r
 \r
-#define FADT_SIGNATURE EFI_SIGNATURE_32 ('F', 'A', 'C', 'P')\r
+#define FADT_SIGNATURE SIGNATURE_32 ('F', 'A', 'C', 'P')\r
 typedef struct {\r
   DESCRIPTION_HEADER    Header;\r
   UINT32                FIRMWARE_CTRL;\r

diff --git a/DuetPkg/EfiLdr/EfiLdr.h b/DuetPkg/EfiLdr/EfiLdr.h
index 979ed1d691f7ede88d18fd40ee15d84ffa1631d1..d4dfc7329d0ca904323c07293dd7255ac5554cc4 100644 (file)
--- a/DuetPkg/EfiLdr/EfiLdr.h
+++ b/DuetPkg/EfiLdr/EfiLdr.h
@@ -42,7 +42,7 @@ Revision History:
 \r
 #define EFI_MAX_MEMORY_DESCRIPTORS 64\r
 \r
-#define LOADED_IMAGE_SIGNATURE     EFI_SIGNATURE_32('l','d','r','i')\r
+#define LOADED_IMAGE_SIGNATURE     SIGNATURE_32('l','d','r','i')\r
 \r
 typedef struct {\r
   UINTN                       Signature;\r

diff --git a/DuetPkg/FSVariable/VariableStorage.h b/DuetPkg/FSVariable/VariableStorage.h
index 3ebfaeb5db2fe692294de5d33fceef791e034b59..2c4a3f9808c984c90a7071db73a4f82361da84f2 100644 (file)
--- a/DuetPkg/FSVariable/VariableStorage.h
+++ b/DuetPkg/FSVariable/VariableStorage.h
@@ -24,8 +24,8 @@ Revision History
 #define _VARIABLE_STORAGE_H_\r
 \r
 #define VAR_DEFAULT_VALUE           (0xff)\r
-#define VAR_DEFAULT_VALUE_16        EFI_SIGNATURE_16 (VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE)\r
-#define VAR_DEFAULT_VALUE_32        EFI_SIGNATURE_32 (VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE, \\r
+#define VAR_DEFAULT_VALUE_16        SIGNATURE_16 (VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE)\r
+#define VAR_DEFAULT_VALUE_32        SIGNATURE_32 (VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE, \\r
                                                       VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE)\r
 \r
 typedef struct _VARIABLE_STORAGE VARIABLE_STORAGE;\r

diff --git a/DuetPkg/FvbRuntimeService/FwBlockService.h b/DuetPkg/FvbRuntimeService/FwBlockService.h
index 47f70acc73be93f0e9425d7188dfacb0bae89e43..67a016ff4822d8933df3d6d9e7f876edc8e1c2eb 100644 (file)
--- a/DuetPkg/FvbRuntimeService/FwBlockService.h
+++ b/DuetPkg/FvbRuntimeService/FwBlockService.h
@@ -113,7 +113,7 @@ typedef struct {
 //\r
 #define FVB_DEVICE_FROM_THIS(a)         CR (a, EFI_FW_VOL_BLOCK_DEVICE, FwVolBlockInstance, FVB_DEVICE_SIGNATURE)\r
 #define FVB_EXTEND_DEVICE_FROM_THIS(a)  CR (a, EFI_FW_VOL_BLOCK_DEVICE, FvbExtension, FVB_DEVICE_SIGNATURE)\r
-#define FVB_DEVICE_SIGNATURE            EFI_SIGNATURE_32 ('F', 'V', 'B', 'C')\r
+#define FVB_DEVICE_SIGNATURE            SIGNATURE_32 ('F', 'V', 'B', 'C')\r
 \r
 typedef struct {\r
   MEMMAP_DEVICE_PATH        MemMapDevPath;\r

diff --git a/DuetPkg/Include/IndustryStandard/LegacyBiosMpTable.h b/DuetPkg/Include/IndustryStandard/LegacyBiosMpTable.h
index 9feb6f0595fe615b28ef64e02676b4021141b80a..5ac7445c5ab87c8618b436673a798ebadbd49295 100644 (file)
--- a/DuetPkg/Include/IndustryStandard/LegacyBiosMpTable.h
+++ b/DuetPkg/Include/IndustryStandard/LegacyBiosMpTable.h
@@ -28,7 +28,7 @@ Abstract:
 //\r
 #pragma pack(push, 1)\r
 \r
-#define EFI_LEGACY_MP_TABLE_FLOATING_POINTER_SIGNATURE  EFI_SIGNATURE_32 ('_', 'M', 'P', '_')\r
+#define EFI_LEGACY_MP_TABLE_FLOATING_POINTER_SIGNATURE  SIGNATURE_32 ('_', 'M', 'P', '_')\r
 typedef struct {\r
   UINT32  Signature;\r
   UINT32  PhysicalAddress;\r
@@ -44,7 +44,7 @@ typedef struct {
   } FeatureByte2_5;\r
 } EFI_LEGACY_MP_TABLE_FLOATING_POINTER;\r
 \r
-#define EFI_LEGACY_MP_TABLE_HEADER_SIGNATURE  EFI_SIGNATURE_32 ('P', 'C', 'M', 'P')\r
+#define EFI_LEGACY_MP_TABLE_HEADER_SIGNATURE  SIGNATURE_32 ('P', 'C', 'M', 'P')\r
 typedef struct {\r
   UINT32  Signature;\r
   UINT16  BaseTableLength;\r

diff --git a/DuetPkg/IsaAcpiDxe/PcatIsaAcpi.h b/DuetPkg/IsaAcpiDxe/PcatIsaAcpi.h
index b087134f543c279e4d5297212e653c148eab70a9..8608156b9b5f6653d66377f8a67101449ee90e28 100644 (file)
--- a/DuetPkg/IsaAcpiDxe/PcatIsaAcpi.h
+++ b/DuetPkg/IsaAcpiDxe/PcatIsaAcpi.h
@@ -44,7 +44,7 @@ Revision History
 //\r
 // PCAT ISA ACPI device private data structure\r
 //\r
-#define PCAT_ISA_ACPI_DEV_SIGNATURE  EFI_SIGNATURE_32('L','P','C','D')\r
+#define PCAT_ISA_ACPI_DEV_SIGNATURE  SIGNATURE_32('L','P','C','D')\r
 \r
 typedef struct {\r
   UINTN                  Signature;\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
index 039967a98e77473c56f5c71e07a68f456efa3632..edc1eaf7b9ad0fc69bc5e1b81bff4f1e7101f7d8 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
@@ -88,7 +88,7 @@ typedef struct {
   UINT8         Offset;\r
 } PCI_BAR;\r
 \r
-#define PCI_IO_DEVICE_SIGNATURE   EFI_SIGNATURE_32 ('p','c','i','o')\r
+#define PCI_IO_DEVICE_SIGNATURE   SIGNATURE_32 ('p','c','i','o')\r
 \r
 #define EFI_BRIDGE_IO32_DECODE_SUPPORTED        0x0001 \r
 #define EFI_BRIDGE_PMEM32_DECODE_SUPPORTED      0x0002 \r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.h b/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.h
index e6fbe92c671f3d1afdb612203fa22bf5fe0e4ef2..1ba008b50c6332c444df096e2c1fd144f1c92ce1 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.h
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.h
@@ -26,7 +26,7 @@ Revision History
 \r
 #include "PciBus.h"\r
 \r
-#define DRIVER_OVERRIDE_SIGNATURE EFI_SIGNATURE_32 ('d', 'r', 'o', 'v')\r
+#define DRIVER_OVERRIDE_SIGNATURE SIGNATURE_32 ('d', 'r', 'o', 'v')\r
 \r
 typedef struct {\r
   UINT32          Signature;\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.h b/DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.h
index 71d3a41e289e5a334a17841222ae9bd8b3c7b0d5..cae532563c41fbfa1d8414b2fdd564dc01bca873 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.h
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.h
@@ -24,7 +24,7 @@ Abstract:
 \r
 \r
 \r
-#define DEVICE_IO_PRIVATE_DATA_SIGNATURE  EFI_SIGNATURE_32 ('d', 'e', 'v', 'I')\r
+#define DEVICE_IO_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('d', 'e', 'v', 'I')\r
 \r
 #define MAX_COMMON_BUFFER                 0x00000000FFFFFFFF\r
 \r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
index dc4530aa6837b37f98fb12eb0908408687fc5da5..98bc27c26c08b56100f622eee31815d60126b732 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
@@ -131,7 +131,7 @@ PcatRootBridgeIoPciRW (
     // Check PciExpressBaseAddress\r
     //\r
     if ((PrivateData->PciExpressBaseAddress == 0) ||\r
-        (PrivateData->PciExpressBaseAddress >= EFI_MAX_ADDRESS)) {\r
+        (PrivateData->PciExpressBaseAddress >= MAX_ADDRESS)) {\r
       return EFI_UNSUPPORTED;\r
     } else {\r
       UsePciExpressAccess = TRUE;\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h
index 960ad9a27fb823c5fec22caae549f6e0e5c1d609..cf6ed38e1c31df7896c4262b889ca391c3bb9552 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h
@@ -44,7 +44,7 @@ Abstract:
 //\r
 // Driver Instance Data Prototypes\r
 //\r
-#define PCAT_PCI_ROOT_BRIDGE_SIGNATURE  EFI_SIGNATURE_32('p', 'c', 'r', 'b')\r
+#define PCAT_PCI_ROOT_BRIDGE_SIGNATURE  SIGNATURE_32('p', 'c', 'r', 'b')\r
 \r
 typedef struct {\r
   UINT32                            Signature;\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
index 6003a58309d797266d38d73922955f2da00a27bb..c0607b471632deb15b74ffa815447d6a5dbe781b 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c
@@ -129,7 +129,7 @@ PcatRootBridgeIoPciRW (
     // Check PciExpressBaseAddress\r
     //\r
     if ((PrivateData->PciExpressBaseAddress == 0) ||\r
-        (PrivateData->PciExpressBaseAddress >= EFI_MAX_ADDRESS)) {\r
+        (PrivateData->PciExpressBaseAddress >= MAX_ADDRESS)) {\r
       return EFI_UNSUPPORTED;\r
     } else {\r
       UsePciExpressAccess = TRUE;\r