From f02bd3768c1aba2d4e023c7623dff4dab2dbb1df Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Tue, 16 Dec 2008 15:31:57 +0000 Subject: 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@7050 6f19259b-4bc3-4df7-8a09-765794883524 --- IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h | 2 +- IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h | 6 +++--- .../Universal/SectionExtractionDxe/SectionExtraction.h | 4 ++-- IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'IntelFrameworkModulePkg/Universal') diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h index 787901b62f..33d870fc70 100644 --- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h +++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClass.h @@ -52,7 +52,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // // VGA Class Device Structure // -#define VGA_CLASS_DEV_SIGNATURE EFI_SIGNATURE_32 ('V', 'G', 'A', 'C') +#define VGA_CLASS_DEV_SIGNATURE SIGNATURE_32 ('V', 'G', 'A', 'C') typedef struct { UINTN Signature; diff --git a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h index c73edac1a6..ebd0d08fa2 100644 --- a/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h +++ b/IntelFrameworkModulePkg/Universal/DataHubDxe/DataHub.h @@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include -#define DATA_HUB_INSTANCE_SIGNATURE EFI_SIGNATURE_32 ('D', 'H', 'u', 'b') +#define DATA_HUB_INSTANCE_SIGNATURE SIGNATURE_32 ('D', 'H', 'u', 'b') typedef struct { UINT32 Signature; @@ -77,7 +77,7 @@ typedef struct { // structure. Head pointer to the list is the Log member of // EFI_DATA_ENTRY. Record is a copy of the data passed in. // -#define EFI_DATA_ENTRY_SIGNATURE EFI_SIGNATURE_32 ('D', 'r', 'e', 'c') +#define EFI_DATA_ENTRY_SIGNATURE SIGNATURE_32 ('D', 'r', 'e', 'c') typedef struct { UINT32 Signature; LIST_ENTRY Link; @@ -94,7 +94,7 @@ typedef struct { // Private data to contain the filter driver Event and it's // associated EFI_TPL. // -#define EFI_DATA_HUB_FILTER_DRIVER_SIGNATURE EFI_SIGNATURE_32 ('D', 'h', 'F', 'd') +#define EFI_DATA_HUB_FILTER_DRIVER_SIGNATURE SIGNATURE_32 ('D', 'h', 'F', 'd') typedef struct { UINT32 Signature; diff --git a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.h b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.h index 869744afee..663cd7354a 100644 --- a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.h +++ b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.h @@ -57,7 +57,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) @@ -82,7 +82,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/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h index 82d253606d..6a4da2f7be 100644 --- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h +++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h @@ -45,7 +45,7 @@ #define MAX_NUMBER_DATAHUB_RECORDS 1000 #define DATAHUB_BYTES_PER_RECORD EFI_STATUS_CODE_DATA_MAX_SIZE #define EMPTY_RECORD_TAG 0xFF -#define DATAHUB_STATUS_CODE_SIGNATURE EFI_SIGNATURE_32 ('B', 'D', 'H', 'S') +#define DATAHUB_STATUS_CODE_SIGNATURE SIGNATURE_32 ('B', 'D', 'H', 'S') // // Address type of pointer. -- cgit v1.2.3