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
This commit is contained in:
qhuang8 2008-12-16 15:31:52 +00:00
parent 99e1dd896a
commit eea53ce14d
13 changed files with 19 additions and 19 deletions

View File

@ -159,7 +159,7 @@ Returns:
PTR Destination; PTR Destination;
EFI_STATUS Status; EFI_STATUS Status;
Status = CpuIoCheckParameter (Width, Address, Count, Buffer, EFI_MAX_ADDRESS); Status = CpuIoCheckParameter (Width, Address, Count, Buffer, MAX_ADDRESS);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }
@ -220,7 +220,7 @@ Returns:
PTR Destination; PTR Destination;
EFI_STATUS Status; EFI_STATUS Status;
Status = CpuIoCheckParameter (Width, Address, Count, Buffer, EFI_MAX_ADDRESS); Status = CpuIoCheckParameter (Width, Address, Count, Buffer, MAX_ADDRESS);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }

View File

@ -23,8 +23,8 @@ Revision History:
#include "Debug.h" #include "Debug.h"
#define ACPI_RSD_PTR 0x2052545020445352LL #define ACPI_RSD_PTR 0x2052545020445352LL
#define MPS_PTR EFI_SIGNATURE_32('_','M','P','_') #define MPS_PTR SIGNATURE_32('_','M','P','_')
#define SMBIOS_PTR EFI_SIGNATURE_32('_','S','M','_') #define SMBIOS_PTR SIGNATURE_32('_','S','M','_')
#define EBDA_BASE_ADDRESS 0x40E #define EBDA_BASE_ADDRESS 0x40E
@ -266,7 +266,7 @@ FindAcpiPtr (
#pragma pack(1) #pragma pack(1)
//#define MCFG_SIGNATURE 0x4746434D //#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 { typedef struct {
UINT64 BaseAddress; UINT64 BaseAddress;
UINT16 PciSegmentGroupNumber; UINT16 PciSegmentGroupNumber;
@ -275,7 +275,7 @@ typedef struct {
UINT32 Reserved; UINT32 Reserved;
} MCFG_STRUCTURE; } MCFG_STRUCTURE;
#define FADT_SIGNATURE EFI_SIGNATURE_32 ('F', 'A', 'C', 'P') #define FADT_SIGNATURE SIGNATURE_32 ('F', 'A', 'C', 'P')
typedef struct { typedef struct {
DESCRIPTION_HEADER Header; DESCRIPTION_HEADER Header;
UINT32 FIRMWARE_CTRL; UINT32 FIRMWARE_CTRL;

View File

@ -42,7 +42,7 @@ Revision History:
#define EFI_MAX_MEMORY_DESCRIPTORS 64 #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 { typedef struct {
UINTN Signature; UINTN Signature;

View File

@ -24,8 +24,8 @@ Revision History
#define _VARIABLE_STORAGE_H_ #define _VARIABLE_STORAGE_H_
#define VAR_DEFAULT_VALUE (0xff) #define VAR_DEFAULT_VALUE (0xff)
#define VAR_DEFAULT_VALUE_16 EFI_SIGNATURE_16 (VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE) #define VAR_DEFAULT_VALUE_16 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_32 SIGNATURE_32 (VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE, \
VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE) VAR_DEFAULT_VALUE, VAR_DEFAULT_VALUE)
typedef struct _VARIABLE_STORAGE VARIABLE_STORAGE; typedef struct _VARIABLE_STORAGE VARIABLE_STORAGE;

View File

@ -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_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_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 { typedef struct {
MEMMAP_DEVICE_PATH MemMapDevPath; MEMMAP_DEVICE_PATH MemMapDevPath;

View File

@ -28,7 +28,7 @@ Abstract:
// //
#pragma pack(push, 1) #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 { typedef struct {
UINT32 Signature; UINT32 Signature;
UINT32 PhysicalAddress; UINT32 PhysicalAddress;
@ -44,7 +44,7 @@ typedef struct {
} FeatureByte2_5; } FeatureByte2_5;
} EFI_LEGACY_MP_TABLE_FLOATING_POINTER; } 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 { typedef struct {
UINT32 Signature; UINT32 Signature;
UINT16 BaseTableLength; UINT16 BaseTableLength;

View File

@ -44,7 +44,7 @@ Revision History
// //
// PCAT ISA ACPI device private data structure // 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 { typedef struct {
UINTN Signature; UINTN Signature;

View File

@ -88,7 +88,7 @@ typedef struct {
UINT8 Offset; UINT8 Offset;
} PCI_BAR; } 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_IO32_DECODE_SUPPORTED 0x0001
#define EFI_BRIDGE_PMEM32_DECODE_SUPPORTED 0x0002 #define EFI_BRIDGE_PMEM32_DECODE_SUPPORTED 0x0002

View File

@ -26,7 +26,7 @@ Revision History
#include "PciBus.h" #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 { typedef struct {
UINT32 Signature; UINT32 Signature;

View File

@ -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 #define MAX_COMMON_BUFFER 0x00000000FFFFFFFF

View File

@ -131,7 +131,7 @@ PcatRootBridgeIoPciRW (
// Check PciExpressBaseAddress // Check PciExpressBaseAddress
// //
if ((PrivateData->PciExpressBaseAddress == 0) || if ((PrivateData->PciExpressBaseAddress == 0) ||
(PrivateData->PciExpressBaseAddress >= EFI_MAX_ADDRESS)) { (PrivateData->PciExpressBaseAddress >= MAX_ADDRESS)) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} else { } else {
UsePciExpressAccess = TRUE; UsePciExpressAccess = TRUE;

View File

@ -44,7 +44,7 @@ Abstract:
// //
// Driver Instance Data Prototypes // 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 { typedef struct {
UINT32 Signature; UINT32 Signature;

View File

@ -129,7 +129,7 @@ PcatRootBridgeIoPciRW (
// Check PciExpressBaseAddress // Check PciExpressBaseAddress
// //
if ((PrivateData->PciExpressBaseAddress == 0) || if ((PrivateData->PciExpressBaseAddress == 0) ||
(PrivateData->PciExpressBaseAddress >= EFI_MAX_ADDRESS)) { (PrivateData->PciExpressBaseAddress >= MAX_ADDRESS)) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} else { } else {
UsePciExpressAccess = TRUE; UsePciExpressAccess = TRUE;