tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1) Add _MSC_VER judgment for usage of #pragma intrinsic 

2) Change EFI_FVB_ATTRIBUTE to EFI_FVB2_ATTRIBUTE, As Zimmer, Vincent’s PI1.0 errata document said, in PI we need use EFI_FVB2_ATTRIBUTE to differ the specification change.
3) Remove duplicate definition of SERIAL_MODE, PARALLEL_MODE in Include\Framework\Legacy16.h
4) Remove EFI_FV_FILE_ATTRIB_FIXED and EFI_FV_FILE_ATTRIB_ALIGNMENT from IntelFrameworkPkg\Include\Protocol\FirmwareVolume.h, because they defined in PI specification.
5) Remove EFI_FORM_LABEL from IntelFrameworkPkg\Include\Protocol\HiiFramework.h


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3333 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2 2007-07-18 17:30:13 +00:00
parent ca451dba10
commit dcab253b05
7 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
View File

@ -50,8 +50,8 @@
PeCoffGetEntryPoint|$(WORKSPACE)/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeCoffGetEntryPoint|$(WORKSPACE)/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
PeCoffLib|$(WORKSPACE)/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf PeCoffLib|$(WORKSPACE)/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
PerformanceLib|$(WORKSPACE)/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf PerformanceLib|$(WORKSPACE)/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
PostCodeLib|$(WORKSPACE)/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf #PostCodeLib|$(WORKSPACE)/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
PostCodeLib|$(WORKSPACE)/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf #PostCodeLib|$(WORKSPACE)/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
PrintLib|$(WORKSPACE)/MdePkg/Library/BasePrintLib/BasePrintLib.inf PrintLib|$(WORKSPACE)/MdePkg/Library/BasePrintLib/BasePrintLib.inf
TimerLib|$(WORKSPACE)/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf TimerLib|$(WORKSPACE)/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
UefiDecompressLib|$(WORKSPACE)/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf UefiDecompressLib|$(WORKSPACE)/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
@ -91,7 +91,6 @@
PciIncompatibleDeviceSupportLib|$(WORKSPACE)/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf PciIncompatibleDeviceSupportLib|$(WORKSPACE)/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf
IoLib|${WORKSPACE}/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf IoLib|${WORKSPACE}/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
[LibraryClasses.common.DXE_RUNTIME_DRIVER] [LibraryClasses.common.DXE_RUNTIME_DRIVER]
HobLib|$(WORKSPACE)/MdePkg/Library/DxeHobLib/DxeHobLib.inf HobLib|$(WORKSPACE)/MdePkg/Library/DxeHobLib/DxeHobLib.inf
MemoryAllocationLib|$(WORKSPACE)/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf MemoryAllocationLib|$(WORKSPACE)/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf

3
IntelFrameworkPkg/Include/Framework/Legacy16.h
View File

@ -112,9 +112,6 @@ typedef struct {
// EFI_TO_COMPATIBILITY16_BOOT_TABLE // EFI_TO_COMPATIBILITY16_BOOT_TABLE
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
typedef UINT8 SERIAL_MODE;
typedef UINT8 PARALLEL_MODE;
// //
// DEVICE_PRODUCER_SERIAL & its modes // DEVICE_PRODUCER_SERIAL & its modes
// //

4
IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
View File

@ -115,10 +115,6 @@ EFI_STATUS
IN OUT EFI_FV_ATTRIBUTES *Attributes IN OUT EFI_FV_ATTRIBUTES *Attributes
); );
typedef UINT32 EFI_FV_FILE_ATTRIBUTES;
#define EFI_FV_FILE_ATTRIB_ALIGNMENT 0x0000001F
/** /**
Read the requested file (NameGuid) and returns data in Buffer. Read the requested file (NameGuid) and returns data in Buffer.

1
IntelFrameworkPkg/Include/Protocol/HiiFramework.h
View File

@ -77,7 +77,6 @@ typedef struct _EFI_HII_PROTOCOL EFI_HII_PROTOCOL;
// //
// The following types are currently defined: // The following types are currently defined:
// //
typedef UINT16 EFI_FORM_ID;
typedef UINT16 EFI_FORM_LABEL; typedef UINT16 EFI_FORM_LABEL;
#pragma pack(1) #pragma pack(1)

4
MdePkg/Include/Pi/PiFirmwareVolume.h
View File

@ -30,7 +30,7 @@ typedef UINT32 EFI_FV_FILE_ATTRIBUTES;
#define EFI_FV_FILE_ATTRIB_FIXED 0x00000100 #define EFI_FV_FILE_ATTRIB_FIXED 0x00000100
#define EFI_FV_FILE_ATTRIB_MEMORY_MAPPED 0x00000200 #define EFI_FV_FILE_ATTRIB_MEMORY_MAPPED 0x00000200
typedef UINT32 EFI_FVB_ATTRIBUTES; typedef UINT32 EFI_FVB2_ATTRIBUTES;
// //
// Attributes bit definitions // Attributes bit definitions
@ -98,7 +98,7 @@ typedef struct {
EFI_GUID FileSystemGuid; EFI_GUID FileSystemGuid;
UINT64 FvLength; UINT64 FvLength;
UINT32 Signature; UINT32 Signature;
EFI_FVB_ATTRIBUTES Attributes; EFI_FVB2_ATTRIBUTES Attributes;
UINT16 HeaderLength; UINT16 HeaderLength;
UINT16 Checksum; UINT16 Checksum;
UINT16 ExtHeaderOffset; UINT16 ExtHeaderOffset;

2
MdePkg/Include/Pi/PiPeiCis.h
View File

@ -607,7 +607,7 @@ EFI_STATUS
**/ **/
typedef struct { typedef struct {
EFI_FVB_ATTRIBUTES FvAttributes; EFI_FVB2_ATTRIBUTES FvAttributes;
EFI_GUID FvFormat; EFI_GUID FvFormat;
EFI_GUID FvName; EFI_GUID FvName;
VOID *FvStart; VOID *FvStart;

3
MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
View File

@ -36,6 +36,7 @@ unsigned short _outpw (unsigned short port, unsigned short dataword );
unsigned long _outpd (unsigned short port, unsigned long dataword ); unsigned long _outpd (unsigned short port, unsigned long dataword );
void _ReadWriteBarrier (void); void _ReadWriteBarrier (void);
#ifdef _MSC_VER
#pragma intrinsic(_inp) #pragma intrinsic(_inp)
#pragma intrinsic(_inpw) #pragma intrinsic(_inpw)
#pragma intrinsic(_inpd) #pragma intrinsic(_inpd)
@ -43,7 +44,7 @@ void _ReadWriteBarrier (void);
#pragma intrinsic(_outpw) #pragma intrinsic(_outpw)
#pragma intrinsic(_outpd) #pragma intrinsic(_outpd)
#pragma intrinsic(_ReadWriteBarrier) #pragma intrinsic(_ReadWriteBarrier)
#endif
// //
// _ReadWriteBarrier() forces memory reads and writes to complete at the point // _ReadWriteBarrier() forces memory reads and writes to complete at the point
// in the call. This is only a hint to the compiler and does emit code. // in the call. This is only a hint to the compiler and does emit code.