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

Nt32Pkg/CpuRuntimeDxe/CpuDriver.h

@@ -46,7 +46,7 @@ extern UINT8  CpuStrings[];
 //
 // Internal Data Structures
 //
-#define CPU_ARCH_PROT_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('c', 'a', 'p', 'd')
+#define CPU_ARCH_PROT_PRIVATE_SIGNATURE SIGNATURE_32 ('c', 'a', 'p', 'd')
 
 typedef struct {
   UINTN                 Signature;

Nt32Pkg/FvbServicesRuntimeDxe/FwBlockService.h

@@ -46,7 +46,7 @@ typedef struct {
 //
 #define FVB_DEVICE_FROM_THIS(a)         CR (a, EFI_FW_VOL_BLOCK_DEVICE, FwVolBlockInstance, FVB_DEVICE_SIGNATURE)
 #define FVB_EXTEND_DEVICE_FROM_THIS(a)  CR (a, EFI_FW_VOL_BLOCK_DEVICE, FvbExtension, FVB_DEVICE_SIGNATURE)
-#define FVB_DEVICE_SIGNATURE            EFI_SIGNATURE_32 ('F', 'V', 'B', 'N')
+#define FVB_DEVICE_SIGNATURE            SIGNATURE_32 ('F', 'V', 'B', 'N')
 
 typedef struct {
   MEMMAP_DEVICE_PATH        MemMapDevPath;

Nt32Pkg/Include/Protocol/WinNtThunk.h

@@ -1099,7 +1099,7 @@ BOOL
 //
 //
 
-#define EFI_WIN_NT_THUNK_PROTOCOL_SIGNATURE EFI_SIGNATURE_32 ('N', 'T', 'T', 'T')
+#define EFI_WIN_NT_THUNK_PROTOCOL_SIGNATURE SIGNATURE_32 ('N', 'T', 'T', 'T')
 
 typedef struct {
   UINT64                              Signature;

Nt32Pkg/SnpNt32Dxe/SnpNt32.h

@@ -137,7 +137,7 @@ EFI_STATUS
 //
 //  Global data for this driver
 //
-#define SNP_NT32_DRIVER_SIGNATURE EFI_SIGNATURE_32 ('W', 'S', 'N', 'P')
+#define SNP_NT32_DRIVER_SIGNATURE SIGNATURE_32 ('W', 'S', 'N', 'P')
 
 typedef struct _SNPNT32_GLOBAL_DATA {
   UINT32                            Signature;
@@ -165,7 +165,7 @@ typedef struct _SNPNT32_GLOBAL_DATA {
 //
 //  Instance data for each fake SNP instance
 //
-#define SNP_NT32_INSTANCE_SIGNATURE EFI_SIGNATURE_32 ('w', 'S', 'N', 'P')
+#define SNP_NT32_INSTANCE_SIGNATURE SIGNATURE_32 ('w', 'S', 'N', 'P')
 
 typedef struct _SNPNT32_INSTANCE_DATA {
   UINT32                      Signature;

Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.h

@@ -58,7 +58,7 @@ typedef enum {
   EifWinNtMaxTypeDisks
 } WIN_NT_RAW_DISK_DEVICE_TYPE;
 
-#define WIN_NT_BLOCK_IO_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('N', 'T', 'b', 'k')
+#define WIN_NT_BLOCK_IO_PRIVATE_SIGNATURE SIGNATURE_32 ('N', 'T', 'b', 'k')
 typedef struct {
   UINTN                       Signature;
 

Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h

@@ -138,7 +138,7 @@ extern EFI_COMPONENT_NAME2_PROTOCOL  gWinNtBusDriverComponentName2;
 //
 // WinNt Bus Controller Structure
 //
-#define WIN_NT_BUS_DEVICE_SIGNATURE EFI_SIGNATURE_32 ('N', 'T', 'B', 'D')
+#define WIN_NT_BUS_DEVICE_SIGNATURE SIGNATURE_32 ('N', 'T', 'B', 'D')
 
 typedef struct {
   UINT64                    Signature;
@@ -148,7 +148,7 @@ typedef struct {
 //
 // WinNt Child Device Controller Structure
 //
-#define WIN_NT_IO_DEVICE_SIGNATURE  EFI_SIGNATURE_32 ('N', 'T', 'V', 'D')
+#define WIN_NT_IO_DEVICE_SIGNATURE  SIGNATURE_32 ('N', 'T', 'V', 'D')
 
 typedef struct {
   UINT64                    Signature;

Nt32Pkg/WinNtGopDxe/WinNtGop.h

@@ -69,9 +69,9 @@ typedef struct {
 
 #define WIN_NT_GOP_CLASS_NAME       L"WinNtGopWindow"
 
-#define GOP_PRIVATE_DATA_SIGNATURE  EFI_SIGNATURE_32 ('S', 'g', 'o', 'N')
+#define GOP_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('S', 'g', 'o', 'N')
 
-#define WIN_NT_GOP_SIMPLE_TEXTIN_EX_NOTIFY_SIGNATURE EFI_SIGNATURE_32 ('W', 'g', 'S', 'n')
+#define WIN_NT_GOP_SIMPLE_TEXTIN_EX_NOTIFY_SIGNATURE SIGNATURE_32 ('W', 'g', 'S', 'n')
 
 typedef struct _WIN_NT_GOP_SIMPLE_TEXTIN_EX_NOTIFY {
   UINTN                                 Signature;

Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.h

@@ -58,7 +58,7 @@ typedef struct {
   UINT8   Data[SERIAL_MAX_BUFFER_SIZE];
 } SERIAL_DEV_FIFO;
 
-#define WIN_NT_SERIAL_IO_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('N', 'T', 's', 'i')
+#define WIN_NT_SERIAL_IO_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('N', 'T', 's', 'i')
 typedef struct {
   UINT64                    Signature;
 

Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.h

@@ -28,7 +28,7 @@ Abstract:
 #define _WIN_NT_SIMPLE_FILE_SYSTEM_H_
 
 
-#define WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('N', 'T', 'f', 's')
+#define WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE SIGNATURE_32 ('N', 'T', 'f', 's')
 
 typedef struct {
   UINTN                           Signature;
@@ -46,7 +46,7 @@ typedef struct {
       WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE \
       )
 
-#define WIN_NT_EFI_FILE_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('l', 'o', 'f', 's')
+#define WIN_NT_EFI_FILE_PRIVATE_SIGNATURE SIGNATURE_32 ('l', 'o', 'f', 's')
 
 //
 // Bit definitions for EFI_TIME.Daylight