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

12 files changed, 46 insertions, 46 deletions

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index 359c0258eb..aecf72f87f 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -121,7 +121,7 @@ typedef struct {
 // DXE Dispatcher Data structures

 //

 

-#define KNOWN_HANDLE_SIGNATURE  EFI_SIGNATURE_32('k','n','o','w')

+#define KNOWN_HANDLE_SIGNATURE  SIGNATURE_32('k','n','o','w')

 typedef struct {

   UINTN           Signature;

   LIST_ENTRY      Link;         // mFvHandleList

@@ -129,7 +129,7 @@ typedef struct {
 } KNOWN_HANDLE;

 

 

-#define EFI_CORE_DRIVER_ENTRY_SIGNATURE EFI_SIGNATURE_32('d','r','v','r')

+#define EFI_CORE_DRIVER_ENTRY_SIGNATURE SIGNATURE_32('d','r','v','r')

 typedef struct {

   UINTN                           Signature;

   LIST_ENTRY                      Link;             // mDriverList

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

 //The data structure of GCD memory map entry

 //

-#define EFI_GCD_MAP_SIGNATURE  EFI_SIGNATURE_32('g','c','d','m')

+#define EFI_GCD_MAP_SIGNATURE  SIGNATURE_32('g','c','d','m')

 typedef struct {

   UINTN                 Signature;

   LIST_ENTRY            Link;

diff --git a/MdeModulePkg/Core/Dxe/Event/Event.h b/MdeModulePkg/Core/Dxe/Event/Event.h
index f9384bc6cb..b8b02b6898 100644
--- a/MdeModulePkg/Core/Dxe/Event/Event.h
+++ b/MdeModulePkg/Core/Dxe/Event/Event.h
@@ -23,7 +23,7 @@ extern  UINTN                   gEventPending;
 //

 // EFI_EVENT

 //

-#define EVENT_SIGNATURE         EFI_SIGNATURE_32('e','v','n','t')

+#define EVENT_SIGNATURE         SIGNATURE_32('e','v','n','t')

 typedef struct {

   UINTN                   Signature;

   UINT32                  Type;

diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h b/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h
index bb29cc4d44..2d0f704dde 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVolDriver.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define __FW_VOL_DRIVER_H_

 

 

-#define FV2_DEVICE_SIGNATURE EFI_SIGNATURE_32 ('_', 'F', 'V', '2')

+#define FV2_DEVICE_SIGNATURE SIGNATURE_32 ('_', 'F', 'V', '2')

 

 //

 // Used to track all non-deleted files

diff --git a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.h b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.h
index 0fa4c296bc..d06beb0385 100644
--- a/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.h
+++ b/MdeModulePkg/Core/Dxe/FwVolBlock/FwVolBlock.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _FWVOL_BLOCK_H_

 

 

-#define FVB_DEVICE_SIGNATURE       EFI_SIGNATURE_32('_','F','V','B')

+#define FVB_DEVICE_SIGNATURE       SIGNATURE_32('_','F','V','B')

 

 

 typedef struct {

diff --git a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
index a379e5c5a7..6df0a9f3cd 100644
--- a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
+++ b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
@@ -1857,7 +1857,7 @@ CoreInitializeMemoryServices (
   // The max address must be within the physically addressible range for the processor.

   //

   MaxMemoryLength = 0;

-  MaxAddress      = EFI_MAX_ADDRESS;

+  MaxAddress      = MAX_ADDRESS;

   do {

     HighAddress = 0;

     Found       = FALSE;

diff --git a/MdeModulePkg/Core/Dxe/Hand/Handle.h b/MdeModulePkg/Core/Dxe/Hand/Handle.h
index f7b85dba26..af3ae54f66 100644
--- a/MdeModulePkg/Core/Dxe/Hand/Handle.h
+++ b/MdeModulePkg/Core/Dxe/Hand/Handle.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define  _HAND_H_

 

 

-#define EFI_HANDLE_SIGNATURE            EFI_SIGNATURE_32('h','n','d','l')

+#define EFI_HANDLE_SIGNATURE            SIGNATURE_32('h','n','d','l')

 

 ///

 /// IHANDLE - contains a list of protocol handles

@@ -34,7 +34,7 @@ typedef struct {
 

 #define ASSERT_IS_HANDLE(a)  ASSERT((a)->Signature == EFI_HANDLE_SIGNATURE)

 

-#define PROTOCOL_ENTRY_SIGNATURE        EFI_SIGNATURE_32('p','r','t','e')

+#define PROTOCOL_ENTRY_SIGNATURE        SIGNATURE_32('p','r','t','e')

 

 ///

 /// PROTOCOL_ENTRY - each different protocol has 1 entry in the protocol

@@ -54,7 +54,7 @@ typedef struct {
 } PROTOCOL_ENTRY;

 

 

-#define PROTOCOL_INTERFACE_SIGNATURE  EFI_SIGNATURE_32('p','i','f','c')

+#define PROTOCOL_INTERFACE_SIGNATURE  SIGNATURE_32('p','i','f','c')

 

 ///

 /// PROTOCOL_INTERFACE - each protocol installed on a handle is tracked

@@ -78,7 +78,7 @@ typedef struct {
 

 } PROTOCOL_INTERFACE;

 

-#define OPEN_PROTOCOL_DATA_SIGNATURE  EFI_SIGNATURE_32('p','o','d','l')

+#define OPEN_PROTOCOL_DATA_SIGNATURE  SIGNATURE_32('p','o','d','l')

 

 typedef struct {

   UINTN                       Signature;

@@ -92,7 +92,7 @@ typedef struct {
 } OPEN_PROTOCOL_DATA;

 

 

-#define PROTOCOL_NOTIFY_SIGNATURE       EFI_SIGNATURE_32('p','r','t','n')

+#define PROTOCOL_NOTIFY_SIGNATURE       SIGNATURE_32('p','r','t','n')

 

 ///

 /// PROTOCOL_NOTIFY - used for each register notification for a protocol

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.h b/MdeModulePkg/Core/Dxe/Image/Image.h
index 37660201b1..54f71c3820 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.h
+++ b/MdeModulePkg/Core/Dxe/Image/Image.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _IMAGE_H_

 #define _IMAGE_H_

 

-#define LOADED_IMAGE_PRIVATE_DATA_SIGNATURE   EFI_SIGNATURE_32('l','d','r','i')

+#define LOADED_IMAGE_PRIVATE_DATA_SIGNATURE   SIGNATURE_32('l','d','r','i')

 

 typedef struct {

     UINTN                       Signature;

@@ -65,7 +65,7 @@ typedef struct {
           CR(a, LOADED_IMAGE_PRIVATE_DATA, Info, LOADED_IMAGE_PRIVATE_DATA_SIGNATURE)

 

 

-#define LOAD_PE32_IMAGE_PRIVATE_DATA_SIGNATURE  EFI_SIGNATURE_32('l','p','e','i')

+#define LOAD_PE32_IMAGE_PRIVATE_DATA_SIGNATURE  SIGNATURE_32('l','p','e','i')

 

 typedef struct {

     UINTN                       Signature;

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

 // Private Data Types

 //

-#define IMAGE_FILE_HANDLE_SIGNATURE       EFI_SIGNATURE_32('i','m','g','f')

+#define IMAGE_FILE_HANDLE_SIGNATURE       SIGNATURE_32('i','m','g','f')

 typedef struct {

   UINTN               Signature;

   BOOLEAN             FreeBuffer;

diff --git a/MdeModulePkg/Core/Dxe/Mem/Imem.h b/MdeModulePkg/Core/Dxe/Mem/Imem.h
index 8a60d59f4c..c840a5dc30 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Imem.h
+++ b/MdeModulePkg/Core/Dxe/Mem/Imem.h
@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // MEMORY_MAP_ENTRY

 //

 

-#define MEMORY_MAP_SIGNATURE   EFI_SIGNATURE_32('m','m','a','p')

+#define MEMORY_MAP_SIGNATURE   SIGNATURE_32('m','m','a','p')

 typedef struct {

   UINTN           Signature;

   LIST_ENTRY      Link;

diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/MdeModulePkg/Core/Dxe/Mem/Page.c
index 648667eb3c..fa54e7f0e6 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Page.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Page.c
@@ -53,24 +53,24 @@ LIST_ENTRY   mFreeMemoryMapEntryList = INITIALIZE_LIST_HEAD_VARIABLE (mFreeMemor
 BOOLEAN      mMemoryTypeInformationInitialized = FALSE;

 

 EFI_MEMORY_TYPE_STAISTICS mMemoryTypeStatistics[EfiMaxMemoryType + 1] = {

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE,  FALSE },  // EfiReservedMemoryType

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiLoaderCode

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiLoaderData

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiBootServicesCode

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiBootServicesData

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE,  TRUE  },  // EfiRuntimeServicesCode

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE,  TRUE  },  // EfiRuntimeServicesData

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiConventionalMemory

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiUnusableMemory

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE,  FALSE },  // EfiACPIReclaimMemory

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE,  FALSE },  // EfiACPIMemoryNVS

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiMemoryMappedIO

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiMemoryMappedIOPortSpace

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE,  TRUE  },  // EfiPalCode

-  { 0, EFI_MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }   // EfiMaxMemoryType

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE,  FALSE },  // EfiReservedMemoryType

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiLoaderCode

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiLoaderData

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiBootServicesCode

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiBootServicesData

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE,  TRUE  },  // EfiRuntimeServicesCode

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE,  TRUE  },  // EfiRuntimeServicesData

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiConventionalMemory

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiUnusableMemory

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE,  FALSE },  // EfiACPIReclaimMemory

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE,  FALSE },  // EfiACPIMemoryNVS

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiMemoryMappedIO

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE },  // EfiMemoryMappedIOPortSpace

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, TRUE,  TRUE  },  // EfiPalCode

+  { 0, MAX_ADDRESS, 0, 0, EfiMaxMemoryType, FALSE, FALSE }   // EfiMaxMemoryType

 };

 

-EFI_PHYSICAL_ADDRESS mDefaultMaximumAddress = EFI_MAX_ADDRESS;

+EFI_PHYSICAL_ADDRESS mDefaultMaximumAddress = MAX_ADDRESS;

 

 EFI_MEMORY_TYPE_INFORMATION gMemoryTypeInformation[EfiMaxMemoryType + 1] = {

   { EfiReservedMemoryType,      0 },

@@ -387,7 +387,7 @@ PromoteMemoryResource (
     Entry = CR (Link, EFI_GCD_MAP_ENTRY, Link, EFI_GCD_MAP_SIGNATURE);

 

     if (Entry->GcdMemoryType == EfiGcdMemoryTypeReserved &&

-        Entry->EndAddress < EFI_MAX_ADDRESS &&

+        Entry->EndAddress < MAX_ADDRESS &&

         (Entry->Capabilities & (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED | EFI_MEMORY_TESTED)) ==

           (EFI_MEMORY_PRESENT | EFI_MEMORY_INITIALIZED)) {

       //

@@ -513,7 +513,7 @@ CoreAddMemoryDescriptor (
               gMemoryTypeInformation[FreeIndex].NumberOfPages

               );

             mMemoryTypeStatistics[Type].BaseAddress    = 0;

-            mMemoryTypeStatistics[Type].MaximumAddress = EFI_MAX_ADDRESS;

+            mMemoryTypeStatistics[Type].MaximumAddress = MAX_ADDRESS;

           }

         }

         return;

@@ -571,7 +571,7 @@ CoreAddMemoryDescriptor (
       }

     }

     mMemoryTypeStatistics[Type].CurrentNumberOfPages = 0;

-    if (mMemoryTypeStatistics[Type].MaximumAddress == EFI_MAX_ADDRESS) {

+    if (mMemoryTypeStatistics[Type].MaximumAddress == MAX_ADDRESS) {

       mMemoryTypeStatistics[Type].MaximumAddress = mDefaultMaximumAddress;

     }

   }

@@ -1019,7 +1019,7 @@ CoreAllocatePages (
   //

   // The max address is the max natively addressable address for the processor

   //

-  MaxAddress = EFI_MAX_ADDRESS;

+  MaxAddress = MAX_ADDRESS;

 

   if (Type == AllocateMaxAddress) {

     MaxAddress = Start;

@@ -1127,7 +1127,7 @@ CoreFreePages (
   //

   // Destroy the contents

   //

-  if (Memory < EFI_MAX_ADDRESS) {

+  if (Memory < MAX_ADDRESS) {

     DEBUG_CLEAR_MEMORY ((VOID *)(UINTN)Memory, NumberOfPages << EFI_PAGE_SHIFT);

   }

 

@@ -1357,7 +1357,7 @@ CoreAllocatePoolPages (
   //

   // Find the pages to convert

   //

-  Start = FindFreePages (EFI_MAX_ADDRESS, NumberOfPages, PoolType, Alignment);

+  Start = FindFreePages (MAX_ADDRESS, NumberOfPages, PoolType, Alignment);

 

   //

   // Convert it to boot services data

diff --git a/MdeModulePkg/Core/Dxe/Mem/Pool.c b/MdeModulePkg/Core/Dxe/Mem/Pool.c
index ce70cff513..d92935991a 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Pool.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Pool.c
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "DxeMain.h"

 #include "Imem.h"

 

-#define POOL_FREE_SIGNATURE   EFI_SIGNATURE_32('p','f','r','0')

+#define POOL_FREE_SIGNATURE   SIGNATURE_32('p','f','r','0')

 typedef struct {

   UINT32          Signature;

   UINT32          Index;

@@ -23,7 +23,7 @@ typedef struct {
 } POOL_FREE;

 

 

-#define POOL_HEAD_SIGNATURE   EFI_SIGNATURE_32('p','h','d','0')

+#define POOL_HEAD_SIGNATURE   SIGNATURE_32('p','h','d','0')

 typedef struct {

   UINT32          Signature;

   UINT32          Size;

@@ -32,9 +32,9 @@ typedef struct {
   CHAR8           Data[1];

 } POOL_HEAD;

 

-#define SIZE_OF_POOL_HEAD EFI_FIELD_OFFSET(POOL_HEAD,Data)

+#define SIZE_OF_POOL_HEAD OFFSET_OF(POOL_HEAD,Data)

 

-#define POOL_TAIL_SIGNATURE   EFI_SIGNATURE_32('p','t','a','l')

+#define POOL_TAIL_SIGNATURE   SIGNATURE_32('p','t','a','l')

 typedef struct {

   UINT32      Signature;

   UINT32      Size;

@@ -60,7 +60,7 @@ typedef struct {
 // Globals

 //

 

-#define POOL_SIGNATURE  EFI_SIGNATURE_32('p','l','s','t')

+#define POOL_SIGNATURE  SIGNATURE_32('p','l','s','t')

 typedef struct {

     INTN             Signature;

     UINTN            Used;

diff --git a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c b/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
index 2b17239d30..d2c40049d2 100644
--- a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
+++ b/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
@@ -43,7 +43,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //

 // Local defines and typedefs

 //

-#define CORE_SECTION_CHILD_SIGNATURE  EFI_SIGNATURE_32('S','X','C','S')

+#define CORE_SECTION_CHILD_SIGNATURE  SIGNATURE_32('S','X','C','S')

 #define CHILD_SECTION_NODE_FROM_LINK(Node) \

   CR (Node, CORE_SECTION_CHILD_NODE, Link, CORE_SECTION_CHILD_SIGNATURE)

 

@@ -68,7 +68,7 @@ typedef struct {
   EFI_GUID                    *EncapsulationGuid;

 } CORE_SECTION_CHILD_NODE;

 

-#define CORE_SECTION_STREAM_SIGNATURE EFI_SIGNATURE_32('S','X','S','S')

+#define CORE_SECTION_STREAM_SIGNATURE SIGNATURE_32('S','X','S','S')

 #define STREAM_NODE_FROM_LINK(Node) \

   CR (Node, CORE_SECTION_STREAM_NODE, Link, CORE_SECTION_STREAM_SIGNATURE)

 

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index 1a5201c1d1..f1dd2e88ac 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -120,7 +120,7 @@ typedef struct {
 } CACHE_SECTION_DATA;

 

 

-#define PEI_CORE_HANDLE_SIGNATURE  EFI_SIGNATURE_32('P','e','i','C')

+#define PEI_CORE_HANDLE_SIGNATURE  SIGNATURE_32('P','e','i','C')

 

 ///

 /// Pei Core private data structure instance