Menu
▾
▴
SF.net SVN: edk2-buildtools:[2617] trunk/BaseTools/Source/C
|
From: <yz...@us...> - 2013-11-27 05:58:57
|
Revision: 2617
http://sourceforge.net/p/edk2-buildtools/code/2617
Author: yzhen22
Date: 2013-11-27 05:58:54 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
update EFI_SIGNATURE_x to SIGNATURE_x which is more common version to keep in step with other pkg
Signed-off-by: Yuxin Zheng <yux...@in...>
Reviewed-by: Chen, Hesheng <hes...@in...>
Reviewed-by: Liu, Yingke D <Yin...@in... >
Reviewed-by: Feng, Bob C <bob...@in...>
Modified Paths:
--------------
trunk/BaseTools/Source/C/GenFv/GenFvInternalLib.h
trunk/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h
trunk/BaseTools/Source/C/Include/Common/UefiBaseTypes.h
trunk/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
trunk/BaseTools/Source/C/Include/IndustryStandard/pci22.h
Modified: trunk/BaseTools/Source/C/GenFv/GenFvInternalLib.h
===================================================================
--- trunk/BaseTools/Source/C/GenFv/GenFvInternalLib.h 2013-11-27 05:55:10 UTC (rev 2616)
+++ trunk/BaseTools/Source/C/GenFv/GenFvInternalLib.h 2013-11-27 05:58:54 UTC (rev 2617)
@@ -168,7 +168,7 @@
// VTF (Firmware Volume Top File) signatures
//
#define IA32_X64_VTF_SIGNATURE_OFFSET 0x14
-#define IA32_X64_VTF0_SIGNATURE EFI_SIGNATURE_32('V','T','F',0)
+#define IA32_X64_VTF0_SIGNATURE SIGNATURE_32('V','T','F',0)
//
// Defines to calculate the offset for PEI CORE entry points
Modified: trunk/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h
===================================================================
--- trunk/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h 2013-11-27 05:55:10 UTC (rev 2616)
+++ trunk/BaseTools/Source/C/Include/Common/PiFirmwareVolume.h 2013-11-27 05:58:54 UTC (rev 2617)
@@ -111,7 +111,7 @@
EFI_FV_BLOCK_MAP_ENTRY BlockMap[1];
} EFI_FIRMWARE_VOLUME_HEADER;
-#define EFI_FVH_SIGNATURE EFI_SIGNATURE_32 ('_', 'F', 'V', 'H')
+#define EFI_FVH_SIGNATURE SIGNATURE_32 ('_', 'F', 'V', 'H')
///
/// Firmware Volume Header Revision definition
Modified: trunk/BaseTools/Source/C/Include/Common/UefiBaseTypes.h
===================================================================
--- trunk/BaseTools/Source/C/Include/Common/UefiBaseTypes.h 2013-11-27 05:55:10 UTC (rev 2616)
+++ trunk/BaseTools/Source/C/Include/Common/UefiBaseTypes.h 2013-11-27 05:58:54 UTC (rev 2617)
@@ -1,7 +1,7 @@
/** @file
Defines data types and constants introduced in UEFI.
- Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
@@ -146,10 +146,10 @@
//
// Define macros to build data structure signatures from characters.
//
-#define EFI_SIGNATURE_16(A, B) ((A) | (B << 8))
-#define EFI_SIGNATURE_32(A, B, C, D) (EFI_SIGNATURE_16 (A, B) | (EFI_SIGNATURE_16 (C, D) << 16))
-#define EFI_SIGNATURE_64(A, B, C, D, E, F, G, H) \
- (EFI_SIGNATURE_32 (A, B, C, D) | ((UINT64) (EFI_SIGNATURE_32 (E, F, G, H)) << 32))
+#define SIGNATURE_16(A, B) ((A) | (B << 8))
+#define SIGNATURE_32(A, B, C, D) (SIGNATURE_16 (A, B) | (SIGNATURE_16 (C, D) << 16))
+#define SIGNATURE_64(A, B, C, D, E, F, G, H) \
+ (SIGNATURE_32 (A, B, C, D) | ((UINT64) (SIGNATURE_32 (E, F, G, H)) << 32))
//
Modified: trunk/BaseTools/Source/C/Include/IndustryStandard/PeImage.h
===================================================================
--- trunk/BaseTools/Source/C/Include/IndustryStandard/PeImage.h 2013-11-27 05:55:10 UTC (rev 2616)
+++ trunk/BaseTools/Source/C/Include/IndustryStandard/PeImage.h 2013-11-27 05:58:54 UTC (rev 2617)
@@ -4,7 +4,7 @@
@bug Fix text - doc as defined in MSFT EFI specification.
- Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
@@ -648,7 +648,7 @@
///
/// Debug Data Structure defined by Apple Mach-O to Coff utility
///
-#define CODEVIEW_SIGNATURE_MTOC EFI_SIGNATURE_32('M', 'T', 'O', 'C')
+#define CODEVIEW_SIGNATURE_MTOC SIGNATURE_32('M', 'T', 'O', 'C')
typedef struct {
UINT32 Signature; ///< "MTOC"
EFI_GUID MachOUuid;
Modified: trunk/BaseTools/Source/C/Include/IndustryStandard/pci22.h
===================================================================
--- trunk/BaseTools/Source/C/Include/IndustryStandard/pci22.h 2013-11-27 05:55:10 UTC (rev 2616)
+++ trunk/BaseTools/Source/C/Include/IndustryStandard/pci22.h 2013-11-27 05:58:54 UTC (rev 2617)
@@ -1,7 +1,7 @@
/** @file
Support for PCI 2.2 standard.
- Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
@@ -335,7 +335,7 @@
#pragma pack()
#define PCI_EXPANSION_ROM_HEADER_SIGNATURE 0xaa55
-#define PCI_DATA_STRUCTURE_SIGNATURE EFI_SIGNATURE_32 ('P', 'C', 'I', 'R')
+#define PCI_DATA_STRUCTURE_SIGNATURE SIGNATURE_32 ('P', 'C', 'I', 'R')
#define PCI_CODE_TYPE_PCAT_IMAGE 0x00
#define PCI_CODE_TYPE_EFI_IMAGE 0x03
#define EFI_PCI_EXPANSION_ROM_HEADER_COMPRESSED 0x0001
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
