From eea53ce14d49acddbb58418bb9055eed9d04648f Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Tue, 16 Dec 2008 15:31:52 +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@7049 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/CpuIoDxe/CpuIo.c | 4 ++-- DuetPkg/DxeIpl/LegacyTable.c | 8 ++++---- DuetPkg/EfiLdr/EfiLdr.h | 2 +- DuetPkg/FSVariable/VariableStorage.h | 4 ++-- DuetPkg/FvbRuntimeService/FwBlockService.h | 2 +- DuetPkg/Include/IndustryStandard/LegacyBiosMpTable.h | 4 ++-- DuetPkg/IsaAcpiDxe/PcatIsaAcpi.h | 2 +- DuetPkg/PciBusNoEnumerationDxe/PciBus.h | 2 +- DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.h | 2 +- DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.h | 2 +- DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c | 2 +- DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h | 2 +- DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) (limited to 'DuetPkg') diff --git a/DuetPkg/CpuIoDxe/CpuIo.c b/DuetPkg/CpuIoDxe/CpuIo.c index 9e5be46df8..11a21360f7 100644 --- a/DuetPkg/CpuIoDxe/CpuIo.c +++ b/DuetPkg/CpuIoDxe/CpuIo.c @@ -159,7 +159,7 @@ Returns: PTR Destination; EFI_STATUS Status; - Status = CpuIoCheckParameter (Width, Address, Count, Buffer, EFI_MAX_ADDRESS); + Status = CpuIoCheckParameter (Width, Address, Count, Buffer, MAX_ADDRESS); if (EFI_ERROR (Status)) { return Status; } @@ -220,7 +220,7 @@ Returns: PTR Destination; EFI_STATUS Status; - Status = CpuIoCheckParameter (Width, Address, Count, Buffer, EFI_MAX_ADDRESS); + Status = CpuIoCheckParameter (Width, Address, Count, Buffer, MAX_ADDRESS); if (EFI_ERROR (Status)) { return Status; } diff --git a/DuetPkg/DxeIpl/LegacyTable.c b/DuetPkg/DxeIpl/LegacyTable.c index ba9106915e..823a25ac5a 100644 --- a/DuetPkg/DxeIpl/LegacyTable.c +++ b/DuetPkg/DxeIpl/LegacyTable.c @@ -23,8 +23,8 @@ Revision History: #include "Debug.h" #define ACPI_RSD_PTR 0x2052545020445352LL -#define MPS_PTR EFI_SIGNATURE_32('_','M','P','_') -#define SMBIOS_PTR EFI_SIGNATURE_32('_','S','M','_') +#define MPS_PTR SIGNATURE_32('_','M','P','_') +#define SMBIOS_PTR SIGNATURE_32('_','S','M','_') #define EBDA_BASE_ADDRESS 0x40E @@ -266,7 +266,7 @@ FindAcpiPtr ( #pragma pack(1) //#define MCFG_SIGNATURE 0x4746434D -#define MCFG_SIGNATURE EFI_SIGNATURE_32 ('M', 'C', 'F', 'G') +#define MCFG_SIGNATURE SIGNATURE_32 ('M', 'C', 'F', 'G') typedef struct { UINT64 BaseAddress; UINT16 PciSegmentGroupNumber; @@ -275,7 +275,7 @@ typedef struct { UINT32 Reserved; } MCFG_STRUCTURE; -#define FADT_SIGNATURE EFI_SIGNATURE_32 ('F', 'A', 'C', 'P') +#define FADT_SIGNATURE SIGNATURE_32 ('F', 'A', 'C', 'P') typedef struct { DESCRIPTION_HEADER Header; UINT32 FIRMWARE_CTRL; diff --git a/DuetPkg/EfiLdr/EfiLdr.h b/DuetPkg/EfiLdr/EfiLdr.h index 979ed1d691..d4dfc7329d 100644 --- a/DuetPkg/EfiLdr/EfiLdr.h +++ b/DuetPkg/EfiLdr/EfiLdr.h @@ -42,7 +42,7 @@ Revision History: #define EFI_MAX_MEMORY_DESCRIPTORS 64 -#define LOADED_IMAGE_SIGNATURE EFI_SIGNATURE_32('l','d','r','i') +#define LOADED_IMAGE_SIGNATURE SIGNATURE_32('l','d','r','i') typedef struct { UINTN Signature; diff --git a/DuetPkg/FSVariable/VariableStorage.h b/DuetPkg/FSVariable/VariableStorage.h index 3ebfaeb5db..2c4a3f9808 100644 --- a/DuetPkg/FSVariable/VariableStorage.h +++ b/DuetPkg/FSVariable/VariableStorage.h @@ -24,8 +24,8 @@ Revision History #define _VARIABLE_STORAGE_H_ #define VAR_DEFAULT_VALUE (0xff) -#define VAR_DEFAULT_VALUE_16 EFI_SIGNATURE_16 (VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE) -#define VAR_DEFAULT_VALUE_32 EFI_SIGNATURE_32 (VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE, \ +#define VAR_DEFAULT_VALUE_16 SIGNATURE_16 (VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE) +#define VAR_DEFAULT_VALUE_32 SIGNATURE_32 (VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE, \ VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE) typedef struct _VARIABLE_STORAGE VARIABLE_STORAGE; diff --git a/DuetPkg/FvbRuntimeService/FwBlockService.h b/DuetPkg/FvbRuntimeService/FwBlockService.h index 47f70acc73..67a016ff48 100644 --- a/DuetPkg/FvbRuntimeService/FwBlockService.h +++ b/DuetPkg/FvbRuntimeService/FwBlockService.h @@ -113,7 +113,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', 'C') +#define FVB_DEVICE_SIGNATURE SIGNATURE_32 ('F', 'V', 'B', 'C') typedef struct { MEMMAP_DEVICE_PATH MemMapDevPath; diff --git a/DuetPkg/Include/IndustryStandard/LegacyBiosMpTable.h b/DuetPkg/Include/IndustryStandard/LegacyBiosMpTable.h index 9feb6f0595..5ac7445c5a 100644 --- a/DuetPkg/Include/IndustryStandard/LegacyBiosMpTable.h +++ b/DuetPkg/Include/IndustryStandard/LegacyBiosMpTable.h @@ -28,7 +28,7 @@ Abstract: // #pragma pack(push, 1) -#define EFI_LEGACY_MP_TABLE_FLOATING_POINTER_SIGNATURE EFI_SIGNATURE_32 ('_', 'M', 'P', '_') +#define EFI_LEGACY_MP_TABLE_FLOATING_POINTER_SIGNATURE SIGNATURE_32 ('_', 'M', 'P', '_') typedef struct { UINT32 Signature; UINT32 PhysicalAddress; @@ -44,7 +44,7 @@ typedef struct { } FeatureByte2_5; } EFI_LEGACY_MP_TABLE_FLOATING_POINTER; -#define EFI_LEGACY_MP_TABLE_HEADER_SIGNATURE EFI_SIGNATURE_32 ('P', 'C', 'M', 'P') +#define EFI_LEGACY_MP_TABLE_HEADER_SIGNATURE SIGNATURE_32 ('P', 'C', 'M', 'P') typedef struct { UINT32 Signature; UINT16 BaseTableLength; diff --git a/DuetPkg/IsaAcpiDxe/PcatIsaAcpi.h b/DuetPkg/IsaAcpiDxe/PcatIsaAcpi.h index b087134f54..8608156b9b 100644 --- a/DuetPkg/IsaAcpiDxe/PcatIsaAcpi.h +++ b/DuetPkg/IsaAcpiDxe/PcatIsaAcpi.h @@ -44,7 +44,7 @@ Revision History // // PCAT ISA ACPI device private data structure // -#define PCAT_ISA_ACPI_DEV_SIGNATURE EFI_SIGNATURE_32('L','P','C','D') +#define PCAT_ISA_ACPI_DEV_SIGNATURE SIGNATURE_32('L','P','C','D') typedef struct { UINTN Signature; diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h index 039967a98e..edc1eaf7b9 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h +++ b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h @@ -88,7 +88,7 @@ typedef struct { UINT8 Offset; } PCI_BAR; -#define PCI_IO_DEVICE_SIGNATURE EFI_SIGNATURE_32 ('p','c','i','o') +#define PCI_IO_DEVICE_SIGNATURE SIGNATURE_32 ('p','c','i','o') #define EFI_BRIDGE_IO32_DECODE_SUPPORTED 0x0001 #define EFI_BRIDGE_PMEM32_DECODE_SUPPORTED 0x0002 diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.h b/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.h index e6fbe92c67..1ba008b50c 100644 --- a/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.h +++ b/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.h @@ -26,7 +26,7 @@ Revision History #include "PciBus.h" -#define DRIVER_OVERRIDE_SIGNATURE EFI_SIGNATURE_32 ('d', 'r', 'o', 'v') +#define DRIVER_OVERRIDE_SIGNATURE SIGNATURE_32 ('d', 'r', 'o', 'v') typedef struct { UINT32 Signature; diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.h b/DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.h index 71d3a41e28..cae532563c 100644 --- a/DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.h +++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/DeviceIo.h @@ -24,7 +24,7 @@ Abstract: -#define DEVICE_IO_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('d', 'e', 'v', 'I') +#define DEVICE_IO_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('d', 'e', 'v', 'I') #define MAX_COMMON_BUFFER 0x00000000FFFFFFFF diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c index dc4530aa68..98bc27c26c 100644 --- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c +++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c @@ -131,7 +131,7 @@ PcatRootBridgeIoPciRW ( // Check PciExpressBaseAddress // if ((PrivateData->PciExpressBaseAddress == 0) || - (PrivateData->PciExpressBaseAddress >= EFI_MAX_ADDRESS)) { + (PrivateData->PciExpressBaseAddress >= MAX_ADDRESS)) { return EFI_UNSUPPORTED; } else { UsePciExpressAccess = TRUE; diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h index 960ad9a27f..cf6ed38e1c 100644 --- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h +++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridge.h @@ -44,7 +44,7 @@ Abstract: // // Driver Instance Data Prototypes // -#define PCAT_PCI_ROOT_BRIDGE_SIGNATURE EFI_SIGNATURE_32('p', 'c', 'r', 'b') +#define PCAT_PCI_ROOT_BRIDGE_SIGNATURE SIGNATURE_32('p', 'c', 'r', 'b') typedef struct { UINT32 Signature; diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c index 6003a58309..c0607b4716 100644 --- a/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c +++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/X64/PcatIo.c @@ -129,7 +129,7 @@ PcatRootBridgeIoPciRW ( // Check PciExpressBaseAddress // if ((PrivateData->PciExpressBaseAddress == 0) || - (PrivateData->PciExpressBaseAddress >= EFI_MAX_ADDRESS)) { + (PrivateData->PciExpressBaseAddress >= MAX_ADDRESS)) { return EFI_UNSUPPORTED; } else { UsePciExpressAccess = TRUE; -- cgit v1.2.3