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

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
index 0ee9b1daf5e222348c9c7f3bc31fcd0e6c00bf1e..33d9c0d3827d37b83c400e236a0786f7d1e050ec 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
@@ -46,7 +46,7 @@ extern UINT8  CpuStrings[];
 //\r
 // Internal Data Structures\r
 //\r
-#define CPU_ARCH_PROT_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('c', 'a', 'p', 'd')\r
+#define CPU_ARCH_PROT_PRIVATE_SIGNATURE SIGNATURE_32 ('c', 'a', 'p', 'd')\r
 \r
 typedef struct {\r
   UINTN                 Signature;\r

diff --git a/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h b/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h
index 7934547c0f4b9870254ab78417adf7828cabf3a5..713f136b6beeea1da5e66e145ffdbd5f37a625e2 100644 (file)
--- a/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h
+++ b/Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h
@@ -46,7 +46,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', 'N')\r
+#define FVB_DEVICE_SIGNATURE            SIGNATURE_32 ('F', 'V', 'B', 'N')\r
 \r
 typedef struct {\r
   MEMMAP_DEVICE_PATH        MemMapDevPath;\r

diff --git a/Nt32Pkg/Include/Protocol/WinNtThunk.h b/Nt32Pkg/Include/Protocol/WinNtThunk.h
index 57bd7cf4a3a5b0f03414333936da2f7cb7bba8a2..181c4149d90d91b40f48563143e6506394673dd6 100644 (file)
--- a/Nt32Pkg/Include/Protocol/WinNtThunk.h
+++ b/Nt32Pkg/Include/Protocol/WinNtThunk.h
@@ -1099,7 +1099,7 @@ BOOL
 //\r
 //\r
 \r
-#define EFI_WIN_NT_THUNK_PROTOCOL_SIGNATURE EFI_SIGNATURE_32 ('N', 'T', 'T', 'T')\r
+#define EFI_WIN_NT_THUNK_PROTOCOL_SIGNATURE SIGNATURE_32 ('N', 'T', 'T', 'T')\r
 \r
 typedef struct {\r
   UINT64                              Signature;\r

diff --git a/Nt32Pkg/SnpNt32Dxe/SnpNt32.h b/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
index 6e9dafd2b7177c0c47f0b0f6bf64bf1a51fb3d9a..d0e04ce404dfcc234d9702868acd7a4fa4d20223 100644 (file)
--- a/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
+++ b/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
@@ -137,7 +137,7 @@ EFI_STATUS
 //\r
 //  Global data for this driver\r
 //\r
-#define SNP_NT32_DRIVER_SIGNATURE EFI_SIGNATURE_32 ('W', 'S', 'N', 'P')\r
+#define SNP_NT32_DRIVER_SIGNATURE SIGNATURE_32 ('W', 'S', 'N', 'P')\r
 \r
 typedef struct _SNPNT32_GLOBAL_DATA {\r
   UINT32                            Signature;\r
@@ -165,7 +165,7 @@ typedef struct _SNPNT32_GLOBAL_DATA {
 //\r
 //  Instance data for each fake SNP instance\r
 //\r
-#define SNP_NT32_INSTANCE_SIGNATURE EFI_SIGNATURE_32 ('w', 'S', 'N', 'P')\r
+#define SNP_NT32_INSTANCE_SIGNATURE SIGNATURE_32 ('w', 'S', 'N', 'P')\r
 \r
 typedef struct _SNPNT32_INSTANCE_DATA {\r
   UINT32                      Signature;\r

diff --git a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h
index 4095fd173675272494ad7c525d610d1f61580e39..5fef83e6f54cba0d723e631a4982890bccd9807b 100644 (file)
--- a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h
+++ b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h
@@ -58,7 +58,7 @@ typedef enum {
   EifWinNtMaxTypeDisks\r
 } WIN_NT_RAW_DISK_DEVICE_TYPE;\r
 \r
-#define WIN_NT_BLOCK_IO_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('N', 'T', 'b', 'k')\r
+#define WIN_NT_BLOCK_IO_PRIVATE_SIGNATURE SIGNATURE_32 ('N', 'T', 'b', 'k')\r
 typedef struct {\r
   UINTN                       Signature;\r
 \r

diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h
index d7a0e10e22dbc827bb7ce453096722b9faccf16a..447693048bad8e885fda6b378db720aca0ee1aba 100644 (file)
--- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h
+++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h
@@ -138,7 +138,7 @@ extern EFI_COMPONENT_NAME2_PROTOCOL  gWinNtBusDriverComponentName2;
 //\r
 // WinNt Bus Controller Structure\r
 //\r
-#define WIN_NT_BUS_DEVICE_SIGNATURE EFI_SIGNATURE_32 ('N', 'T', 'B', 'D')\r
+#define WIN_NT_BUS_DEVICE_SIGNATURE SIGNATURE_32 ('N', 'T', 'B', 'D')\r
 \r
 typedef struct {\r
   UINT64                    Signature;\r
@@ -148,7 +148,7 @@ typedef struct {
 //\r
 // WinNt Child Device Controller Structure\r
 //\r
-#define WIN_NT_IO_DEVICE_SIGNATURE  EFI_SIGNATURE_32 ('N', 'T', 'V', 'D')\r
+#define WIN_NT_IO_DEVICE_SIGNATURE  SIGNATURE_32 ('N', 'T', 'V', 'D')\r
 \r
 typedef struct {\r
   UINT64                    Signature;\r

diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGop.h b/Nt32Pkg/WinNtGopDxe/WinNtGop.h
index ee2eb9a589df2ec67cf05f1fa694ed04ad7aef07..b3cf9d265862db6127d7d91ac147c1dd517c04c4 100644 (file)
--- a/Nt32Pkg/WinNtGopDxe/WinNtGop.h
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGop.h
@@ -69,9 +69,9 @@ typedef struct {
 \r
 #define WIN_NT_GOP_CLASS_NAME       L"WinNtGopWindow"\r
 \r
-#define GOP_PRIVATE_DATA_SIGNATURE  EFI_SIGNATURE_32 ('S', 'g', 'o', 'N')\r
+#define GOP_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('S', 'g', 'o', 'N')\r
 \r
-#define WIN_NT_GOP_SIMPLE_TEXTIN_EX_NOTIFY_SIGNATURE EFI_SIGNATURE_32 ('W', 'g', 'S', 'n')\r
+#define WIN_NT_GOP_SIMPLE_TEXTIN_EX_NOTIFY_SIGNATURE SIGNATURE_32 ('W', 'g', 'S', 'n')\r
 \r
 typedef struct _WIN_NT_GOP_SIMPLE_TEXTIN_EX_NOTIFY {\r
   UINTN                                 Signature;\r

diff --git a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h
index a5365cbe97a26daac0f13d5eb44d9faf0a8ccd3a..348cca82b459c7467e74e2e0b6eee0ad73fa4dc3 100644 (file)
--- a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h
+++ b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h
@@ -58,7 +58,7 @@ typedef struct {
   UINT8   Data[SERIAL_MAX_BUFFER_SIZE];\r
 } SERIAL_DEV_FIFO;\r
 \r
-#define WIN_NT_SERIAL_IO_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('N', 'T', 's', 'i')\r
+#define WIN_NT_SERIAL_IO_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('N', 'T', 's', 'i')\r
 typedef struct {\r
   UINT64                    Signature;\r
 \r

diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h
index 427b89d6f80ef10478a4622afa74df389fc2351a..691868a8baedc260056a0b9edecf47110dc17c00 100644 (file)
--- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h
+++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h
@@ -28,7 +28,7 @@ Abstract:
 #define _WIN_NT_SIMPLE_FILE_SYSTEM_H_\r
 \r
 \r
-#define WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('N', 'T', 'f', 's')\r
+#define WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE SIGNATURE_32 ('N', 'T', 'f', 's')\r
 \r
 typedef struct {\r
   UINTN                           Signature;\r
@@ -46,7 +46,7 @@ typedef struct {
       WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE \\r
       )\r
 \r
-#define WIN_NT_EFI_FILE_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('l', 'o', 'f', 's')\r
+#define WIN_NT_EFI_FILE_PRIVATE_SIGNATURE SIGNATURE_32 ('l', 'o', 'f', 's')\r
 \r
 //\r
 // Bit definitions for EFI_TIME.Daylight\r