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

2 files changed, 0 insertions, 5 deletions

diff --git a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
index d8fa30bd42..5f789e1099 100644
--- a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
+++ b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
@@ -115,10 +115,6 @@ EFI_STATUS
   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.

 

diff --git a/IntelFrameworkPkg/Include/Protocol/HiiFramework.h b/IntelFrameworkPkg/Include/Protocol/HiiFramework.h
index 4a2237852f..56f701ec8d 100644
--- a/IntelFrameworkPkg/Include/Protocol/HiiFramework.h
+++ b/IntelFrameworkPkg/Include/Protocol/HiiFramework.h
@@ -77,7 +77,6 @@ typedef struct _EFI_HII_PROTOCOL  EFI_HII_PROTOCOL;
 //

 // The following types are currently defined:

 //

-typedef UINT16  EFI_FORM_ID;

 typedef UINT16  EFI_FORM_LABEL;

 

 #pragma pack(1)