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

1 files changed, 2 insertions, 1 deletions

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
index 9fec1bcae9..6f076f7578 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
@@ -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.