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:
@@ -30,7 +30,7 @@ typedef UINT32 EFI_FV_FILE_ATTRIBUTES;
|
||||
#define EFI_FV_FILE_ATTRIB_FIXED 0x00000100
|
||||
#define EFI_FV_FILE_ATTRIB_MEMORY_MAPPED 0x00000200
|
||||
|
||||
typedef UINT32 EFI_FVB_ATTRIBUTES;
|
||||
typedef UINT32 EFI_FVB2_ATTRIBUTES;
|
||||
|
||||
//
|
||||
// Attributes bit definitions
|
||||
@@ -98,7 +98,7 @@ typedef struct {
|
||||
EFI_GUID FileSystemGuid;
|
||||
UINT64 FvLength;
|
||||
UINT32 Signature;
|
||||
EFI_FVB_ATTRIBUTES Attributes;
|
||||
EFI_FVB2_ATTRIBUTES Attributes;
|
||||
UINT16 HeaderLength;
|
||||
UINT16 Checksum;
|
||||
UINT16 ExtHeaderOffset;
|
||||
|
@@ -607,7 +607,7 @@ EFI_STATUS
|
||||
|
||||
**/
|
||||
typedef struct {
|
||||
EFI_FVB_ATTRIBUTES FvAttributes;
|
||||
EFI_FVB2_ATTRIBUTES FvAttributes;
|
||||
EFI_GUID FvFormat;
|
||||
EFI_GUID FvName;
|
||||
VOID *FvStart;
|
||||
|
@@ -36,6 +36,7 @@ unsigned short _outpw (unsigned short port, unsigned short dataword );
|
||||
unsigned long _outpd (unsigned short port, unsigned long dataword );
|
||||
void _ReadWriteBarrier (void);
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma intrinsic(_inp)
|
||||
#pragma intrinsic(_inpw)
|
||||
#pragma intrinsic(_inpd)
|
||||
@@ -43,7 +44,7 @@ void _ReadWriteBarrier (void);
|
||||
#pragma intrinsic(_outpw)
|
||||
#pragma intrinsic(_outpd)
|
||||
#pragma intrinsic(_ReadWriteBarrier)
|
||||
|
||||
#endif
|
||||
//
|
||||
// _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.
|
||||
|
Reference in New Issue
Block a user