From f3f2e05db8c89628498ec4efdb16184747824c63 Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Tue, 16 Dec 2008 15:34:21 +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@7056 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/BdsDxe/BootMaint/BootMaint.h | 16 ++++++------- .../Universal/BdsDxe/BootMngr/BootManager.h | 2 +- .../Universal/BdsDxe/DeviceMngr/DeviceManager.h | 2 +- MdeModulePkg/Universal/BdsDxe/FrontPage.h | 2 +- MdeModulePkg/Universal/BdsDxe/Hotkey.h | 2 +- .../Universal/Console/ConSplitterDxe/ConSplitter.h | 6 ++--- .../Console/GraphicsConsoleDxe/GraphicsConsole.h | 2 +- .../Universal/Console/TerminalDxe/Terminal.h | 4 ++-- MdeModulePkg/Universal/DebugPortDxe/DebugPort.h | 2 +- MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h | 2 +- .../Universal/Disk/PartitionDxe/Partition.h | 2 +- .../Universal/DriverSampleDxe/DriverSample.h | 2 +- MdeModulePkg/Universal/EbcDxe/EbcInt.h | 2 +- .../FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h | 2 +- .../FirmwareVolume/FaultTolerantWriteDxe/FtwMisc.c | 4 ++-- .../Universal/HiiDatabaseDxe/HiiDatabase.h | 28 +++++++++++----------- .../MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c | 2 +- MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h | 4 ++-- .../Universal/Network/Dhcp4Dxe/Dhcp4Impl.h | 4 ++-- .../Universal/Network/IScsiDxe/IScsiConfig.h | 2 +- .../Universal/Network/IScsiDxe/IScsiImpl.h | 6 ++--- .../Universal/Network/Ip4ConfigDxe/Ip4Config.h | 2 +- MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h | 8 +++---- MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h | 4 ++-- MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h | 2 +- MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h | 2 +- .../Universal/Network/Mtftp4Dxe/Mtftp4Impl.h | 4 ++-- MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h | 4 ++-- .../Universal/Network/PxeDhcp4Dxe/PxeDhcp4.h | 2 +- MdeModulePkg/Universal/Network/SnpDxe/Snp.h | 2 +- MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h | 2 +- .../Universal/Network/Tcp4Dxe/Tcp4Driver.h | 2 +- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h | 4 ++-- .../Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c | 2 +- .../Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h | 2 +- .../Universal/Network/UefiPxeBcDxe/PxeBcImpl.h | 2 +- .../PlatOverMngr/PlatOverMngr.h | 2 +- MdeModulePkg/Universal/SetupBrowserDxe/Setup.h | 20 ++++++++-------- MdeModulePkg/Universal/SetupBrowserDxe/Ui.h | 4 ++-- 39 files changed, 84 insertions(+), 84 deletions(-) (limited to 'MdeModulePkg/Universal') diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h index cd36f3ee42..03b61afdb9 100644 --- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h +++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h @@ -82,7 +82,7 @@ extern UINT8 FEBin[]; // // Callback function helper // -#define BMM_CALLBACK_DATA_SIGNATURE EFI_SIGNATURE_32 ('C', 'b', 'c', 'k') +#define BMM_CALLBACK_DATA_SIGNATURE SIGNATURE_32 ('C', 'b', 'c', 'k') #define BMM_CALLBACK_DATA_FROM_THIS(a) CR (a, BMM_CALLBACK_DATA, BmmConfigAccess, BMM_CALLBACK_DATA_SIGNATURE) #define FE_CALLBACK_DATA_FROM_THIS(a) CR (a, BMM_CALLBACK_DATA, FeConfigAccess, BMM_CALLBACK_DATA_SIGNATURE) @@ -144,13 +144,13 @@ typedef enum { // // All of the signatures that will be used in list structure // -#define BM_MENU_OPTION_SIGNATURE EFI_SIGNATURE_32 ('m', 'e', 'n', 'u') -#define BM_LOAD_OPTION_SIGNATURE EFI_SIGNATURE_32 ('l', 'o', 'a', 'd') -#define BM_CONSOLE_OPTION_SIGNATURE EFI_SIGNATURE_32 ('c', 'n', 's', 'l') -#define BM_FILE_OPTION_SIGNATURE EFI_SIGNATURE_32 ('f', 'i', 'l', 'e') -#define BM_HANDLE_OPTION_SIGNATURE EFI_SIGNATURE_32 ('h', 'n', 'd', 'l') -#define BM_TERMINAL_OPTION_SIGNATURE EFI_SIGNATURE_32 ('t', 'r', 'm', 'l') -#define BM_MENU_ENTRY_SIGNATURE EFI_SIGNATURE_32 ('e', 'n', 't', 'r') +#define BM_MENU_OPTION_SIGNATURE SIGNATURE_32 ('m', 'e', 'n', 'u') +#define BM_LOAD_OPTION_SIGNATURE SIGNATURE_32 ('l', 'o', 'a', 'd') +#define BM_CONSOLE_OPTION_SIGNATURE SIGNATURE_32 ('c', 'n', 's', 'l') +#define BM_FILE_OPTION_SIGNATURE SIGNATURE_32 ('f', 'i', 'l', 'e') +#define BM_HANDLE_OPTION_SIGNATURE SIGNATURE_32 ('h', 'n', 'd', 'l') +#define BM_TERMINAL_OPTION_SIGNATURE SIGNATURE_32 ('t', 'r', 'm', 'l') +#define BM_MENU_ENTRY_SIGNATURE SIGNATURE_32 ('e', 'n', 't', 'r') #define BM_LOAD_CONTEXT_SELECT 0x0 #define BM_CONSOLE_CONTEXT_SELECT 0x1 diff --git a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h index 3fe70c1c5d..4e460788a7 100644 --- a/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h +++ b/MdeModulePkg/Universal/BdsDxe/BootMngr/BootManager.h @@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // extern UINT8 BootManagerVfrBin[]; -#define BOOT_MANAGER_CALLBACK_DATA_SIGNATURE EFI_SIGNATURE_32 ('B', 'M', 'C', 'B') +#define BOOT_MANAGER_CALLBACK_DATA_SIGNATURE SIGNATURE_32 ('B', 'M', 'C', 'B') typedef struct { UINTN Signature; diff --git a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h index 9668452ddb..23809dd924 100644 --- a/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h +++ b/MdeModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.h @@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // extern UINT8 DeviceManagerVfrBin[]; -#define DEVICE_MANAGER_CALLBACK_DATA_SIGNATURE EFI_SIGNATURE_32 ('D', 'M', 'C', 'B') +#define DEVICE_MANAGER_CALLBACK_DATA_SIGNATURE SIGNATURE_32 ('D', 'M', 'C', 'B') typedef struct { UINTN Signature; diff --git a/MdeModulePkg/Universal/BdsDxe/FrontPage.h b/MdeModulePkg/Universal/BdsDxe/FrontPage.h index aaefbd565a..d8e3bb49b8 100644 --- a/MdeModulePkg/Universal/BdsDxe/FrontPage.h +++ b/MdeModulePkg/Universal/BdsDxe/FrontPage.h @@ -46,7 +46,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. 0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe} \ } -#define FRONT_PAGE_CALLBACK_DATA_SIGNATURE EFI_SIGNATURE_32 ('F', 'P', 'C', 'B') +#define FRONT_PAGE_CALLBACK_DATA_SIGNATURE SIGNATURE_32 ('F', 'P', 'C', 'B') typedef struct { UINTN Signature; diff --git a/MdeModulePkg/Universal/BdsDxe/Hotkey.h b/MdeModulePkg/Universal/BdsDxe/Hotkey.h index 944e5fb9a1..f2d1c60bf6 100644 --- a/MdeModulePkg/Universal/BdsDxe/Hotkey.h +++ b/MdeModulePkg/Universal/BdsDxe/Hotkey.h @@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define GET_KEY_CODE_COUNT(KeyOptions) (((KeyOptions) & EFI_KEY_CODE_COUNT) >> 8) -#define BDS_HOTKEY_OPTION_SIGNATURE EFI_SIGNATURE_32 ('B', 'd', 'K', 'O') +#define BDS_HOTKEY_OPTION_SIGNATURE SIGNATURE_32 ('B', 'd', 'K', 'O') typedef struct { UINTN Signature; LIST_ENTRY Link; diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h index 407081e186..f9601fc194 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h @@ -91,9 +91,9 @@ typedef struct { // // Private data for the EFI_SIMPLE_TEXT_INPUT_PROTOCOL splitter // -#define TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('T', 'i', 'S', 'p') +#define TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('T', 'i', 'S', 'p') -#define TEXT_IN_EX_SPLITTER_NOTIFY_SIGNATURE EFI_SIGNATURE_32 ('T', 'i', 'S', 'n') +#define TEXT_IN_EX_SPLITTER_NOTIFY_SIGNATURE SIGNATURE_32 ('T', 'i', 'S', 'n') typedef struct _TEXT_IN_EX_SPLITTER_NOTIFY { UINTN Signature; @@ -173,7 +173,7 @@ typedef struct { // // Private data for the EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL splitter // -#define TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('T', 'o', 'S', 'p') +#define TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('T', 'o', 'S', 'p') typedef struct { EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput; diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h index e3e5c38159..dd5e6e5b35 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h @@ -186,7 +186,7 @@ extern EFI_NARROW_GLYPH gUsStdNarrowGlyphData[]; // // Device Structure // -#define GRAPHICS_CONSOLE_DEV_SIGNATURE EFI_SIGNATURE_32 ('g', 's', 't', 'o') +#define GRAPHICS_CONSOLE_DEV_SIGNATURE SIGNATURE_32 ('g', 's', 't', 'o') typedef struct { UINTN Columns; diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h index 57fdb07c18..1aedfee788 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h @@ -59,9 +59,9 @@ typedef struct { EFI_INPUT_KEY Data[FIFO_MAX_NUMBER + 1]; } EFI_KEY_FIFO; -#define TERMINAL_DEV_SIGNATURE EFI_SIGNATURE_32 ('t', 'm', 'n', 'l') +#define TERMINAL_DEV_SIGNATURE SIGNATURE_32 ('t', 'm', 'n', 'l') -#define TERMINAL_CONSOLE_IN_EX_NOTIFY_SIGNATURE EFI_SIGNATURE_32 ('t', 'm', 'e', 'n') +#define TERMINAL_CONSOLE_IN_EX_NOTIFY_SIGNATURE SIGNATURE_32 ('t', 'm', 'e', 'n') typedef struct _TERMINAL_CONSOLE_IN_EX_NOTIFY { UINTN Signature; diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h index 2379b349ca..71d9e089d5 100644 --- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h +++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h @@ -43,7 +43,7 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gDebugPortComponentName2; // // local type definitions // -#define DEBUGPORT_DEVICE_SIGNATURE EFI_SIGNATURE_32 ('D', 'B', 'G', 'P') +#define DEBUGPORT_DEVICE_SIGNATURE SIGNATURE_32 ('D', 'B', 'G', 'P') // // Device structure used by driver diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h index cedda09ac0..4bc6d28603 100644 --- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h +++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h @@ -29,7 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include -#define DISK_IO_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('d', 's', 'k', 'I') +#define DISK_IO_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('d', 's', 'k', 'I') #define DATA_BUFFER_BLOCK_NUM (64) diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h index a8f4d23b82..a9bbcc6586 100644 --- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h +++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h @@ -41,7 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // // Partition private data // -#define PARTITION_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('P', 'a', 'r', 't') +#define PARTITION_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('P', 'a', 'r', 't') typedef struct { UINT64 Signature; diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h index 5b686bc77a..c0094eed90 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h +++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h @@ -73,7 +73,7 @@ extern UINT8 DriverSampleStrings[]; #define DYNAMIC_ONE_OF_VAR_OFFSET OFFSET_OF (DRIVER_SAMPLE_CONFIGURATION, DynamicOneof) #define DYNAMIC_ORDERED_LIST_VAR_OFFSET OFFSET_OF (DRIVER_SAMPLE_CONFIGURATION, DynamicOrderedList) -#define DRIVER_SAMPLE_PRIVATE_SIGNATURE EFI_SIGNATURE_32 ('D', 'S', 'p', 's') +#define DRIVER_SAMPLE_PRIVATE_SIGNATURE SIGNATURE_32 ('D', 'S', 'p', 's') typedef struct { UINTN Signature; diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.h b/MdeModulePkg/Universal/EbcDxe/EbcInt.h index 5ad58c0ffe..66339d1a85 100644 --- a/MdeModulePkg/Universal/EbcDxe/EbcInt.h +++ b/MdeModulePkg/Universal/EbcDxe/EbcInt.h @@ -383,7 +383,7 @@ typedef struct { VM_CONTEXT VmContext; } EFI_EBC_THUNK_DATA; -#define EBC_PROTOCOL_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('e', 'b', 'c', 'p') +#define EBC_PROTOCOL_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('e', 'b', 'c', 'p') #define EBC_PROTOCOL_PRIVATE_DATA_FROM_THIS(a) \ diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h index a7cc406c32..91512dd331 100644 --- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h +++ b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.h @@ -67,7 +67,7 @@ typedef struct { // } EFI_FTW_LITE_RECORD; -#define FTW_LITE_DEVICE_SIGNATURE EFI_SIGNATURE_32 ('F', 'T', 'W', 'L') +#define FTW_LITE_DEVICE_SIGNATURE SIGNATURE_32 ('F', 'T', 'W', 'L') // // MACRO for Block size. diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwMisc.c b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwMisc.c index 1efbd2c41b..46cdd60ee5 100644 --- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwMisc.c +++ b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwMisc.c @@ -423,7 +423,7 @@ FlushSpareBlockToWorkingBlock ( // Set WorkingBlockInvalid in EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER // before erase the working block. // - // Offset = EFI_FIELD_OFFSET(EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER, + // Offset = OFFSET_OF(EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER, // WorkingBlockInvalid); // To skip Signature and Crc: sizeof(EFI_GUID)+sizeof(UINT32). // @@ -481,7 +481,7 @@ FlushSpareBlockToWorkingBlock ( // // Update the VALID of the working block // - // Offset = EFI_FIELD_OFFSET(EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER, + // Offset = OFFSET_OF(EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER, // WorkingBlockValid); // Hardcode offset sizeof(EFI_GUID)+sizeof(UINT32), to skip Signature and Crc // diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h index 8b0b5a3fb3..62c5b2d7af 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h @@ -69,7 +69,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define EFI_HII_VARSTORE_NAME_VALUE 1 #define EFI_HII_VARSTORE_EFI_VARIABLE 2 -#define HII_FORMSET_STORAGE_SIGNATURE EFI_SIGNATURE_32 ('H', 'S', 'T', 'G') +#define HII_FORMSET_STORAGE_SIGNATURE SIGNATURE_32 ('H', 'S', 'T', 'G') typedef struct { UINTN Signature; LIST_ENTRY Entry; @@ -89,7 +89,7 @@ typedef struct { // // String Package definitions // -#define HII_STRING_PACKAGE_SIGNATURE EFI_SIGNATURE_32 ('h','i','s','p') +#define HII_STRING_PACKAGE_SIGNATURE SIGNATURE_32 ('h','i','s','p') typedef struct _HII_STRING_PACKAGE_INSTANCE { UINTN Signature; EFI_HII_STRING_PACKAGE_HDR *StringPkgHdr; @@ -102,7 +102,7 @@ typedef struct _HII_STRING_PACKAGE_INSTANCE { // // Form Package definitions // -#define HII_IFR_PACKAGE_SIGNATURE EFI_SIGNATURE_32 ('h','f','r','p') +#define HII_IFR_PACKAGE_SIGNATURE SIGNATURE_32 ('h','f','r','p') typedef struct _HII_IFR_PACKAGE_INSTANCE { UINTN Signature; EFI_HII_PACKAGE_HEADER FormPkgHdr; @@ -113,7 +113,7 @@ typedef struct _HII_IFR_PACKAGE_INSTANCE { // // Simple Font Package definitions // -#define HII_S_FONT_PACKAGE_SIGNATURE EFI_SIGNATURE_32 ('h','s','f','p') +#define HII_S_FONT_PACKAGE_SIGNATURE SIGNATURE_32 ('h','s','f','p') typedef struct _HII_SIMPLE_FONT_PACKAGE_INSTANCE { UINTN Signature; EFI_HII_SIMPLE_FONT_PACKAGE_HDR *SimpleFontPkgHdr; @@ -123,7 +123,7 @@ typedef struct _HII_SIMPLE_FONT_PACKAGE_INSTANCE { // // Font Package definitions // -#define HII_FONT_PACKAGE_SIGNATURE EFI_SIGNATURE_32 ('h','i','f','p') +#define HII_FONT_PACKAGE_SIGNATURE SIGNATURE_32 ('h','i','f','p') typedef struct _HII_FONT_PACKAGE_INSTANCE { UINTN Signature; EFI_HII_FONT_PACKAGE_HDR *FontPkgHdr; @@ -132,7 +132,7 @@ typedef struct _HII_FONT_PACKAGE_INSTANCE { LIST_ENTRY GlyphInfoList; } HII_FONT_PACKAGE_INSTANCE; -#define HII_GLYPH_INFO_SIGNATURE EFI_SIGNATURE_32 ('h','g','i','s') +#define HII_GLYPH_INFO_SIGNATURE SIGNATURE_32 ('h','g','i','s') typedef struct _HII_GLYPH_INFO { UINTN Signature; LIST_ENTRY Entry; @@ -140,7 +140,7 @@ typedef struct _HII_GLYPH_INFO { EFI_HII_GLYPH_INFO Cell; } HII_GLYPH_INFO; -#define HII_FONT_INFO_SIGNATURE EFI_SIGNATURE_32 ('h','l','f','i') +#define HII_FONT_INFO_SIGNATURE SIGNATURE_32 ('h','l','f','i') typedef struct _HII_FONT_INFO { UINTN Signature; LIST_ENTRY Entry; @@ -148,7 +148,7 @@ typedef struct _HII_FONT_INFO { UINT8 FontId; } HII_FONT_INFO; -#define HII_GLOBAL_FONT_INFO_SIGNATURE EFI_SIGNATURE_32 ('h','g','f','i') +#define HII_GLOBAL_FONT_INFO_SIGNATURE SIGNATURE_32 ('h','g','f','i') typedef struct _HII_GLOBAL_FONT_INFO { UINTN Signature; LIST_ENTRY Entry; @@ -174,7 +174,7 @@ typedef struct _HII_IMAGE_PACKAGE_INSTANCE { // // Keyboard Layout Pacakge definitions // -#define HII_KB_LAYOUT_PACKAGE_SIGNATURE EFI_SIGNATURE_32 ('h','k','l','p') +#define HII_KB_LAYOUT_PACKAGE_SIGNATURE SIGNATURE_32 ('h','k','l','p') typedef struct _HII_KEYBOARD_LAYOUT_PACKAGE_INSTANCE { UINTN Signature; UINT8 *KeyboardPkg; @@ -184,7 +184,7 @@ typedef struct _HII_KEYBOARD_LAYOUT_PACKAGE_INSTANCE { // // Guid Package definitions // -#define HII_GUID_PACKAGE_SIGNATURE EFI_SIGNATURE_32 ('h','i','g','p') +#define HII_GUID_PACKAGE_SIGNATURE SIGNATURE_32 ('h','i','g','p') typedef struct _HII_GUID_PACKAGE_INSTANCE { UINTN Signature; UINT8 *GuidPkg; @@ -207,7 +207,7 @@ typedef struct _HII_DATABASE_PACKAGE_LIST_INSTANCE { UINT8 *DevicePathPkg; } HII_DATABASE_PACKAGE_LIST_INSTANCE; -#define HII_HANDLE_SIGNATURE EFI_SIGNATURE_32 ('h','i','h','l') +#define HII_HANDLE_SIGNATURE SIGNATURE_32 ('h','i','h','l') typedef struct { UINTN Signature; @@ -215,7 +215,7 @@ typedef struct { UINTN Key; } HII_HANDLE; -#define HII_DATABASE_RECORD_SIGNATURE EFI_SIGNATURE_32 ('h','i','d','r') +#define HII_DATABASE_RECORD_SIGNATURE SIGNATURE_32 ('h','i','d','r') typedef struct _HII_DATABASE_RECORD { UINTN Signature; @@ -225,7 +225,7 @@ typedef struct _HII_DATABASE_RECORD { LIST_ENTRY DatabaseEntry; } HII_DATABASE_RECORD; -#define HII_DATABASE_NOTIFY_SIGNATURE EFI_SIGNATURE_32 ('h','i','d','n') +#define HII_DATABASE_NOTIFY_SIGNATURE SIGNATURE_32 ('h','i','d','n') typedef struct _HII_DATABASE_NOTIFY { UINTN Signature; @@ -237,7 +237,7 @@ typedef struct _HII_DATABASE_NOTIFY { LIST_ENTRY DatabaseNotifyEntry; } HII_DATABASE_NOTIFY; -#define HII_DATABASE_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('H', 'i', 'D', 'p') +#define HII_DATABASE_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('H', 'i', 'D', 'p') typedef struct _HII_DATABASE_PRIVATE_DATA { UINTN Signature; diff --git a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c index 3e16403d79..0f9ddb9b72 100644 --- a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c +++ b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTest.c @@ -85,7 +85,7 @@ BaseMemoryTest ( // // Make sure we don't try and test anything above the max physical address range // - ASSERT (BeginAddress + MemoryLength < EFI_MAX_ADDRESS); + ASSERT (BeginAddress + MemoryLength < MAX_ADDRESS); switch (Operation) { case Extensive: diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h index db889d4672..7fd5e1bf31 100644 --- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h +++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h @@ -71,7 +71,7 @@ typedef enum { ByBoth = MATCH_SW_ADDRESS | MATCH_HW_ADDRESS } FIND_OPTYPE; -#define ARP_INSTANCE_DATA_SIGNATURE EFI_SIGNATURE_32('A', 'R', 'P', 'I') +#define ARP_INSTANCE_DATA_SIGNATURE SIGNATURE_32('A', 'R', 'P', 'I') // //comment for macro @@ -97,7 +97,7 @@ typedef struct { BOOLEAN Destroyed; } ARP_INSTANCE_DATA; -#define ARP_SERVICE_DATA_SIGNATURE EFI_SIGNATURE_32('A', 'R', 'P', 'S') +#define ARP_SERVICE_DATA_SIGNATURE SIGNATURE_32('A', 'R', 'P', 'S') // //comment for macro diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h index db75addae8..4832ecd747 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h @@ -48,8 +48,8 @@ typedef struct _DHCP_PROTOCOL DHCP_PROTOCOL; #include "Dhcp4Option.h" #include "Dhcp4Io.h" -#define DHCP_SERVICE_SIGNATURE EFI_SIGNATURE_32 ('D', 'H', 'C', 'P') -#define DHCP_PROTOCOL_SIGNATURE EFI_SIGNATURE_32 ('d', 'h', 'c', 'p') +#define DHCP_SERVICE_SIGNATURE SIGNATURE_32 ('D', 'H', 'C', 'P') +#define DHCP_PROTOCOL_SIGNATURE SIGNATURE_32 ('d', 'h', 'c', 'p') typedef enum { // diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h index eb6e0e3853..8b2951216e 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.h @@ -30,7 +30,7 @@ extern UINT8 IScsiDxeStrings[]; #define ISCSI_CONFIG_VAR_ATTR (EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE) -#define ISCSI_FORM_CALLBACK_INFO_SIGNATURE EFI_SIGNATURE_32 ('I', 'f', 'c', 'i') +#define ISCSI_FORM_CALLBACK_INFO_SIGNATURE SIGNATURE_32 ('I', 'f', 'c', 'i') diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h index 34847f52b8..50ed03af75 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiImpl.h @@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "IScsiIbft.h" -#define ISCSI_SESSION_SIGNATURE EFI_SIGNATURE_32 ('I', 'S', 'S', 'N') +#define ISCSI_SESSION_SIGNATURE SIGNATURE_32 ('I', 'S', 'S', 'N') struct _ISCSI_SESSION { UINT32 Signature; @@ -79,7 +79,7 @@ struct _ISCSI_SESSION { UINT8 ErrorRecoveryLevel; }; -#define ISCSI_CONNECTION_SIGNATURE EFI_SIGNATURE_32 ('I', 'S', 'C', 'N') +#define ISCSI_CONNECTION_SIGNATURE SIGNATURE_32 ('I', 'S', 'C', 'N') struct _ISCSI_CONNECTION { UINT32 Signature; @@ -118,7 +118,7 @@ struct _ISCSI_CONNECTION { ISCSI_DIGEST_TYPE DataDigest; }; -#define ISCSI_DRIVER_DATA_SIGNATURE EFI_SIGNATURE_32 ('I', 'S', 'D', 'A') +#define ISCSI_DRIVER_DATA_SIGNATURE SIGNATURE_32 ('I', 'S', 'D', 'A') #define ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU(PassThru) \ CR ( \ diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h index 46e9f890d5..0213aa2dcc 100644 --- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h +++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h @@ -49,7 +49,7 @@ typedef enum { } IP4_CONFIG_STATE; #define IP4_PROTO_ICMP 0x01 -#define IP4_CONFIG_INSTANCE_SIGNATURE EFI_SIGNATURE_32 ('I', 'P', '4', 'C') +#define IP4_CONFIG_INSTANCE_SIGNATURE SIGNATURE_32 ('I', 'P', '4', 'C') typedef enum { DHCP_TAG_PARA_LIST = 55, diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h index 8c06cfc55b..e32764d80b 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h @@ -25,10 +25,10 @@ Abstract: #define __EFI_IP4_IF_H__ typedef enum { - IP4_FRAME_RX_SIGNATURE = EFI_SIGNATURE_32 ('I', 'P', 'F', 'R'), - IP4_FRAME_TX_SIGNATURE = EFI_SIGNATURE_32 ('I', 'P', 'F', 'T'), - IP4_FRAME_ARP_SIGNATURE = EFI_SIGNATURE_32 ('I', 'P', 'F', 'A'), - IP4_INTERFACE_SIGNATURE = EFI_SIGNATURE_32 ('I', 'P', 'I', 'F') + IP4_FRAME_RX_SIGNATURE = SIGNATURE_32 ('I', 'P', 'F', 'R'), + IP4_FRAME_TX_SIGNATURE = SIGNATURE_32 ('I', 'P', 'F', 'T'), + IP4_FRAME_ARP_SIGNATURE = SIGNATURE_32 ('I', 'P', 'F', 'A'), + IP4_INTERFACE_SIGNATURE = SIGNATURE_32 ('I', 'P', 'I', 'F') } IP4_IF_ENUM_TYPES; /** diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h index 08ca3708dd..c72e27ad55 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h @@ -53,8 +53,8 @@ Abstract: typedef enum { - IP4_PROTOCOL_SIGNATURE = EFI_SIGNATURE_32 ('I', 'P', '4', 'P'), - IP4_SERVICE_SIGNATURE = EFI_SIGNATURE_32 ('I', 'P', '4', 'S'), + IP4_PROTOCOL_SIGNATURE = SIGNATURE_32 ('I', 'P', '4', 'P'), + IP4_SERVICE_SIGNATURE = SIGNATURE_32 ('I', 'P', '4', 'S'), // // The state of IP4 protocol. It starts from UNCONFIGED. if it is diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h index 198c914051..3be0e8751e 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h @@ -42,7 +42,7 @@ extern EFI_DRIVER_BINDING_PROTOCOL gMnpDriverBinding; extern EFI_COMPONENT_NAME_PROTOCOL gMnpComponentName; extern EFI_COMPONENT_NAME2_PROTOCOL gMnpComponentName2; -#define MNP_SERVICE_DATA_SIGNATURE EFI_SIGNATURE_32 ('M', 'n', 'p', 'S') +#define MNP_SERVICE_DATA_SIGNATURE SIGNATURE_32 ('M', 'n', 'p', 'S') typedef struct _MNP_SERVICE_DATA { UINT32 Signature; diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h b/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h index 371b7b5469..7fa8bc8f74 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpImpl.h @@ -40,7 +40,7 @@ Abstract: #define UNICAST_PACKET MNP_RECEIVE_UNICAST #define BROADCAST_PACKET MNP_RECEIVE_BROADCAST -#define MNP_INSTANCE_DATA_SIGNATURE EFI_SIGNATURE_32 ('M', 'n', 'p', 'I') +#define MNP_INSTANCE_DATA_SIGNATURE SIGNATURE_32 ('M', 'n', 'p', 'I') #define MNP_INSTANCE_DATA_FROM_THIS(a) \ CR ( \ diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h index 04ca1a1eb3..780a86a001 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h @@ -50,8 +50,8 @@ typedef struct _MTFTP4_PROTOCOL MTFTP4_PROTOCOL; #include "Mtftp4Support.h" enum { - MTFTP4_SERVICE_SIGNATURE = EFI_SIGNATURE_32 ('T', 'F', 'T', 'P'), - MTFTP4_PROTOCOL_SIGNATURE = EFI_SIGNATURE_32 ('t', 'f', 't', 'p'), + MTFTP4_SERVICE_SIGNATURE = SIGNATURE_32 ('T', 'F', 'T', 'P'), + MTFTP4_PROTOCOL_SIGNATURE = SIGNATURE_32 ('t', 'f', 't', 'p'), MTFTP4_DEFAULT_SERVER_PORT = 69, MTFTP4_DEFAULT_TIMEOUT = 3, diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h index 56c139371f..1d6b74be54 100644 --- a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h +++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.h @@ -53,7 +53,7 @@ Abstract: #define SUPPORT_IPV6 0 -#define PXE_BASECODE_DEVICE_SIGNATURE EFI_SIGNATURE_32 ('p', 'x', 'e', 'd') +#define PXE_BASECODE_DEVICE_SIGNATURE SIGNATURE_32 ('p', 'x', 'e', 'd') // // Determine the classes of IPv4 address @@ -168,7 +168,7 @@ typedef struct { // // // -#define LOADFILE_DEVICE_SIGNATURE EFI_SIGNATURE_32 ('p', 'x', 'e', 'l') +#define LOADFILE_DEVICE_SIGNATURE SIGNATURE_32 ('p', 'x', 'e', 'l') typedef struct { UINTN Signature; diff --git a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.h b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.h index cefe52d08c..691a990d14 100644 --- a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.h +++ b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4.h @@ -46,7 +46,7 @@ typedef struct { // UINTN Signature; -#define PXE_DHCP4_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('p', 'x', 'D', '4') +#define PXE_DHCP4_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('p', 'x', 'D', '4') // // Device handle the protocol is bound to. // diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.h b/MdeModulePkg/Universal/Network/SnpDxe/Snp.h index 8ef5f97a80..675057577c 100644 --- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.h +++ b/MdeModulePkg/Universal/Network/SnpDxe/Snp.h @@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define FOUR_GIGABYTES (UINT64) 0x100000000ULL -#define SNP_DRIVER_SIGNATURE EFI_SIGNATURE_32 ('s', 'n', 'd', 's') +#define SNP_DRIVER_SIGNATURE SIGNATURE_32 ('s', 'n', 'd', 's') #define MAX_MAP_LENGTH 100 #define PCI_BAR_IO_MASK 0x00000003 diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h index 3c687063c2..11406ed6d0 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h @@ -114,7 +114,7 @@ typedef enum { #define SOCK_IS_NO_MORE_DATA(Sock) (0 != ((Sock)->Flag & SO_NO_MORE_DATA)) -#define SOCK_SIGNATURE EFI_SIGNATURE_32 ('S', 'O', 'C', 'K') +#define SOCK_SIGNATURE SIGNATURE_32 ('S', 'O', 'C', 'K') #define SOCK_FROM_THIS(a) CR ((a), SOCKET, NetProtocol, SOCK_SIGNATURE) diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h index 42303f3cf1..44ff26575b 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h @@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include -#define TCP4_DRIVER_SIGNATURE EFI_SIGNATURE_32 ('T', 'C', 'P', '4') +#define TCP4_DRIVER_SIGNATURE SIGNATURE_32 ('T', 'C', 'P', '4') #define TCP4_PORT_KNOWN 1024 #define TCP4_PORT_USER_RESERVED 65535 diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h index 368538ee58..23b07a6d35 100644 --- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h +++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h @@ -57,7 +57,7 @@ extern UINT16 mUdp4RandomPort; #define UDP4_PORT_KNOWN 1024 -#define UDP4_SERVICE_DATA_SIGNATURE EFI_SIGNATURE_32('U', 'd', 'p', '4') +#define UDP4_SERVICE_DATA_SIGNATURE SIGNATURE_32('U', 'd', 'p', '4') #define UDP4_SERVICE_DATA_FROM_THIS(a) \ CR ( \ @@ -81,7 +81,7 @@ typedef struct _UDP4_SERVICE_DATA_ { CHAR16 *MacString; } UDP4_SERVICE_DATA; -#define UDP4_INSTANCE_DATA_SIGNATURE EFI_SIGNATURE_32('U', 'd', 'p', 'I') +#define UDP4_INSTANCE_DATA_SIGNATURE SIGNATURE_32('U', 'd', 'p', 'I') #define UDP4_INSTANCE_DATA_FROM_THIS(a) \ CR ( \ diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c index eb91307944..b5ba22f491 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c @@ -206,7 +206,7 @@ PxeBcParseCachedDhcpPacket ( // And do not count dhcp option header, or else will destory the serverhostname. // Options[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] = (EFI_DHCP4_PACKET_OPTION *) (&Offer->Dhcp4.Header.BootFileName[0] - - EFI_FIELD_OFFSET (EFI_DHCP4_PACKET_OPTION, Data[0])); + OFFSET_OF (EFI_DHCP4_PACKET_OPTION, Data[0])); } diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h index fcc227272e..b3438d0e14 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h @@ -277,7 +277,7 @@ typedef struct { UINT8 CredTypeLen; } PXEBC_VENDOR_OPTION; -#define PXEBC_CACHED_DHCP4_PACKET_MAX_SIZE (EFI_FIELD_OFFSET (EFI_DHCP4_PACKET, Dhcp4) + PXEBC_DHCP4_MAX_PACKET_SIZE) +#define PXEBC_CACHED_DHCP4_PACKET_MAX_SIZE (OFFSET_OF (EFI_DHCP4_PACKET, Dhcp4) + PXEBC_DHCP4_MAX_PACKET_SIZE) typedef struct { union { diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h index 17bd863e5f..075a19617a 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h @@ -52,7 +52,7 @@ typedef struct _PXEBC_PRIVATE_DATA PXEBC_PRIVATE_DATA; #include "PxeBcMtftp.h" #include "PxeBcSupport.h" -#define PXEBC_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('P', 'X', 'E', 'P') +#define PXEBC_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('P', 'X', 'E', 'P') #define PXEBC_MTFTP_TIMEOUT 4 #define PXEBC_MTFTP_RETRIES 6 diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h index a7ce6dbbdb..d414e7c09d 100644 --- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h +++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h @@ -55,7 +55,7 @@ Abstract: #define ALIGN_SIZE(a) ((a % MIN_ALIGNMENT_SIZE) ? MIN_ALIGNMENT_SIZE - (a % MIN_ALIGNMENT_SIZE) : 0) -#define EFI_CALLBACK_INFO_SIGNATURE EFI_SIGNATURE_32 ('C', 'l', 'b', 'k') +#define EFI_CALLBACK_INFO_SIGNATURE SIGNATURE_32 ('C', 'l', 'b', 'k') #define EFI_CALLBACK_INFO_FROM_THIS(a) CR (a, EFI_CALLBACK_INFO, ConfigAccess, EFI_CALLBACK_INFO_SIGNATURE) #define MAX_CHOICE_NUM 0x100 #define UPDATE_DATA_SIZE 0x1000 diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h index ac419d1465..b4aef47567 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h @@ -163,7 +163,7 @@ typedef struct { (((EFI_SPECIFICATION_VERSION) & 0xf) << 4) | \ ((EFI_SPECIFICATION_ERRATA_VERSION) & 0xf)) -#define SETUP_DRIVER_SIGNATURE EFI_SIGNATURE_32 ('F', 'B', 'D', 'V') +#define SETUP_DRIVER_SIGNATURE SIGNATURE_32 ('F', 'B', 'D', 'V') typedef struct { UINT32 Signature; @@ -204,7 +204,7 @@ typedef struct { EFI_IFR_TYPE_VALUE Value; } EFI_HII_VALUE; -#define NAME_VALUE_NODE_SIGNATURE EFI_SIGNATURE_32 ('N', 'V', 'S', 'T') +#define NAME_VALUE_NODE_SIGNATURE SIGNATURE_32 ('N', 'V', 'S', 'T') typedef struct { UINTN Signature; @@ -216,7 +216,7 @@ typedef struct { #define NAME_VALUE_NODE_FROM_LINK(a) CR (a, NAME_VALUE_NODE, Link, NAME_VALUE_NODE_SIGNATURE) -#define FORMSET_STORAGE_SIGNATURE EFI_SIGNATURE_32 ('F', 'S', 'T', 'G') +#define FORMSET_STORAGE_SIGNATURE SIGNATURE_32 ('F', 'S', 'T', 'G') typedef struct { UINTN Signature; @@ -244,7 +244,7 @@ typedef struct { #define FORMSET_STORAGE_FROM_LINK(a) CR (a, FORMSET_STORAGE, Link, FORMSET_STORAGE_SIGNATURE) -#define EXPRESSION_OPCODE_SIGNATURE EFI_SIGNATURE_32 ('E', 'X', 'O', 'P') +#define EXPRESSION_OPCODE_SIGNATURE SIGNATURE_32 ('E', 'X', 'O', 'P') typedef struct { UINTN Signature; @@ -270,7 +270,7 @@ typedef struct { #define EXPRESSION_OPCODE_FROM_LINK(a) CR (a, EXPRESSION_OPCODE, Link, EXPRESSION_OPCODE_SIGNATURE) -#define FORM_EXPRESSION_SIGNATURE EFI_SIGNATURE_32 ('F', 'E', 'X', 'P') +#define FORM_EXPRESSION_SIGNATURE SIGNATURE_32 ('F', 'E', 'X', 'P') typedef struct { UINTN Signature; @@ -288,7 +288,7 @@ typedef struct { #define FORM_EXPRESSION_FROM_LINK(a) CR (a, FORM_EXPRESSION, Link, FORM_EXPRESSION_SIGNATURE) -#define QUESTION_DEFAULT_SIGNATURE EFI_SIGNATURE_32 ('Q', 'D', 'F', 'T') +#define QUESTION_DEFAULT_SIGNATURE SIGNATURE_32 ('Q', 'D', 'F', 'T') typedef struct { UINTN Signature; @@ -302,7 +302,7 @@ typedef struct { #define QUESTION_DEFAULT_FROM_LINK(a) CR (a, QUESTION_DEFAULT, Link, QUESTION_DEFAULT_SIGNATURE) -#define QUESTION_OPTION_SIGNATURE EFI_SIGNATURE_32 ('Q', 'O', 'P', 'T') +#define QUESTION_OPTION_SIGNATURE SIGNATURE_32 ('Q', 'O', 'P', 'T') typedef struct { UINTN Signature; @@ -318,7 +318,7 @@ typedef struct { #define QUESTION_OPTION_FROM_LINK(a) CR (a, QUESTION_OPTION, Link, QUESTION_OPTION_SIGNATURE) -#define FORM_BROWSER_STATEMENT_SIGNATURE EFI_SIGNATURE_32 ('F', 'S', 'T', 'A') +#define FORM_BROWSER_STATEMENT_SIGNATURE SIGNATURE_32 ('F', 'S', 'T', 'A') typedef struct { UINTN Signature; LIST_ENTRY Link; @@ -390,7 +390,7 @@ typedef struct { #define FORM_BROWSER_STATEMENT_FROM_LINK(a) CR (a, FORM_BROWSER_STATEMENT, Link, FORM_BROWSER_STATEMENT_SIGNATURE) -#define FORM_BROWSER_FORM_SIGNATURE EFI_SIGNATURE_32 ('F', 'F', 'R', 'M') +#define FORM_BROWSER_FORM_SIGNATURE SIGNATURE_32 ('F', 'F', 'R', 'M') typedef struct { UINTN Signature; @@ -407,7 +407,7 @@ typedef struct { #define FORM_BROWSER_FORM_FROM_LINK(a) CR (a, FORM_BROWSER_FORM, Link, FORM_BROWSER_FORM_SIGNATURE) -#define FORMSET_DEFAULTSTORE_SIGNATURE EFI_SIGNATURE_32 ('F', 'D', 'F', 'S') +#define FORMSET_DEFAULTSTORE_SIGNATURE SIGNATURE_32 ('F', 'D', 'F', 'S') typedef struct { UINTN Signature; diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h index 957a739c61..0f27de5ed1 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h @@ -104,8 +104,8 @@ typedef struct { FORM_BROWSER_STATEMENT *Statement; } UI_MENU_SELECTION; -#define UI_MENU_OPTION_SIGNATURE EFI_SIGNATURE_32 ('u', 'i', 'm', 'm') -#define UI_MENU_LIST_SIGNATURE EFI_SIGNATURE_32 ('u', 'i', 'm', 'l') +#define UI_MENU_OPTION_SIGNATURE SIGNATURE_32 ('u', 'i', 'm', 'm') +#define UI_MENU_LIST_SIGNATURE SIGNATURE_32 ('u', 'i', 'm', 'l') typedef struct { UINTN Signature; -- cgit v1.2.3