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

9 files changed, 11 insertions, 11 deletions

diff --git a/UnixPkg/CpuRuntimeDxe/CpuDriver.h b/UnixPkg/CpuRuntimeDxe/CpuDriver.h
index 8898143cfc..db25a57af0 100644
--- a/UnixPkg/CpuRuntimeDxe/CpuDriver.h
+++ b/UnixPkg/CpuRuntimeDxe/CpuDriver.h
@@ -29,7 +29,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;

diff --git a/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h b/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h
index f005f39c01..eb868111a4 100644
--- a/UnixPkg/FvbServicesRuntimeDxe/FwBlockService.h
+++ b/UnixPkg/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;

diff --git a/UnixPkg/Include/Protocol/UnixThunk.h b/UnixPkg/Include/Protocol/UnixThunk.h
index a0908a0c45..ddddf1a036 100644
--- a/UnixPkg/Include/Protocol/UnixThunk.h
+++ b/UnixPkg/Include/Protocol/UnixThunk.h
@@ -193,7 +193,7 @@ int
 //
 //
 
-#define EFI_UNIX_THUNK_PROTOCOL_SIGNATURE EFI_SIGNATURE_32 ('L', 'N', 'X', 'T')
+#define EFI_UNIX_THUNK_PROTOCOL_SIGNATURE SIGNATURE_32 ('L', 'N', 'X', 'T')
 
 typedef struct _EFI_UNIX_THUNK_PROTOCOL {
   UINT64                              Signature;
diff --git a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.h b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.h
index c446f31d95..70ab77ef36 100644
--- a/UnixPkg/UnixBlockIoDxe/UnixBlockIo.h
+++ b/UnixPkg/UnixBlockIoDxe/UnixBlockIo.h
@@ -46,7 +46,7 @@ Abstract:
 //

 #define LANGUAGESUPPORTED "eng"

 

-#define UNIX_BLOCK_IO_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('L', 'X', 'b', 'k')

+#define UNIX_BLOCK_IO_PRIVATE_SIGNATURE SIGNATURE_32 ('L', 'X', 'b', 'k')

 typedef struct {

   UINTN                       Signature;

 

diff --git a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.h b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.h
index ffc3881544..0cd3d8d7eb 100644
--- a/UnixPkg/UnixBusDriverDxe/UnixBusDriver.h
+++ b/UnixPkg/UnixBusDriverDxe/UnixBusDriver.h
@@ -127,7 +127,7 @@ extern EFI_COMPONENT_NAME_PROTOCOL  gUnixBusDriverComponentName;
 //

 // Unix Bus Controller Structure

 //

-#define UNIX_BUS_DEVICE_SIGNATURE EFI_SIGNATURE_32 ('L', 'X', 'B', 'D')

+#define UNIX_BUS_DEVICE_SIGNATURE SIGNATURE_32 ('L', 'X', 'B', 'D')

 

 typedef struct {

   UINT64                    Signature;

@@ -137,7 +137,7 @@ typedef struct {
 //

 // Unix Child Device Controller Structure

 //

-#define UNIX_IO_DEVICE_SIGNATURE  EFI_SIGNATURE_32 ('L', 'X', 'V', 'D')

+#define UNIX_IO_DEVICE_SIGNATURE  SIGNATURE_32 ('L', 'X', 'V', 'D')

 

 typedef struct {

   UINT64                    Signature;

diff --git a/UnixPkg/UnixConsoleDxe/Console.h b/UnixPkg/UnixConsoleDxe/Console.h
index 9f95fe8eba..7a3c7da8b9 100644
--- a/UnixPkg/UnixConsoleDxe/Console.h
+++ b/UnixPkg/UnixConsoleDxe/Console.h
@@ -47,7 +47,7 @@ extern EFI_DRIVER_BINDING_PROTOCOL gUnixConsoleDriverBinding;
 extern EFI_COMPONENT_NAME_PROTOCOL gUnixConsoleComponentName;

 

 #define UNIX_SIMPLE_TEXT_PRIVATE_DATA_SIGNATURE \

-          EFI_SIGNATURE_32('U','X','s','c')

+          SIGNATURE_32('U','X','s','c')

 

 typedef struct {

   UINT64                        Signature;

diff --git a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h
index 023ff48eb8..2a63f24d48 100644
--- a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h
+++ b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.h
@@ -55,7 +55,7 @@ typedef struct {
   UINT8   Data[SERIAL_MAX_BUFFER_SIZE];

 } SERIAL_DEV_FIFO;

 

-#define UNIX_SERIAL_IO_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('U', 'N', 's', 'i')

+#define UNIX_SERIAL_IO_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('U', 'N', 's', 'i')

 typedef struct {

   UINT64                    Signature;

 

diff --git a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h
index 51dce83a91..59fe085b70 100644
--- a/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h
+++ b/UnixPkg/UnixSimpleFileSystemDxe/UnixSimpleFileSystem.h
@@ -43,7 +43,7 @@ extern EFI_DRIVER_BINDING_PROTOCOL gUnixSimpleFileSystemDriverBinding;
 extern EFI_COMPONENT_NAME_PROTOCOL gUnixSimpleFileSystemComponentName;

 

 

-#define UNIX_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('L', 'X', 'f', 's')

+#define UNIX_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE SIGNATURE_32 ('L', 'X', 'f', 's')

 

 typedef struct {

   UINTN                           Signature;

@@ -61,7 +61,7 @@ typedef struct {
       UNIX_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE \

       )

 

-#define UNIX_EFI_FILE_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('l', 'o', 'f', 's')

+#define UNIX_EFI_FILE_PRIVATE_SIGNATURE SIGNATURE_32 ('l', 'o', 'f', 's')

 

 typedef struct {

   UINTN                           Signature;

diff --git a/UnixPkg/UnixUgaDxe/UnixUga.h b/UnixPkg/UnixUgaDxe/UnixUga.h
index 8401029af7..908e809196 100644
--- a/UnixPkg/UnixUgaDxe/UnixUga.h
+++ b/UnixPkg/UnixUgaDxe/UnixUga.h
@@ -41,7 +41,7 @@ extern EFI_COMPONENT_NAME_PROTOCOL gUnixUgaComponentName;
 
 #define UNIX_UGA_CLASS_NAME       L"UnixUgaWindow"
 
-#define UGA_PRIVATE_DATA_SIGNATURE  EFI_SIGNATURE_32 ('S', 'g', 'o', 'N')
+#define UGA_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('S', 'g', 'o', 'N')
 typedef struct {
   UINT64                      Signature;