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

diff --git a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.h b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.h
index 7d3c960e1087642dfd092598889d4642e99108d4..5a41a0acf8239ba0b641aa33799420bd3ed56fd9 100644 (file)
--- a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.h
+++ b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThru.h
@@ -100,7 +100,7 @@ typedef struct {
   UINT16                          DriveAddress;\r
 } IDE_BASE_REGISTERS;\r
 \r
-#define ATAPI_SCSI_PASS_THRU_DEV_SIGNATURE  EFI_SIGNATURE_32 ('a', 's', 'p', 't')\r
+#define ATAPI_SCSI_PASS_THRU_DEV_SIGNATURE  SIGNATURE_32 ('a', 's', 'p', 't')\r
 \r
 typedef struct {\r
   UINTN                            Signature;\r

diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h
index b726d54099261f10a02a69448b1882897b2cce50..3edf540463764a2b463840c8d521776f07067b23 100644 (file)
--- a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h
+++ b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430.h
@@ -67,7 +67,7 @@ typedef struct {
 //\r
 // Cirrus Logic 5440 Private Data Structure\r
 //\r
-#define CIRRUS_LOGIC_5430_PRIVATE_DATA_SIGNATURE  EFI_SIGNATURE_32 ('C', 'L', '5', '4')\r
+#define CIRRUS_LOGIC_5430_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('C', 'L', '5', '4')\r
 \r
 typedef struct {\r
   UINT64                                Signature;\r