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

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index ffd146e444b5acbe58d26bfda23978969fe33050..1764cc0956864f913235d60d98243b262149e369 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -50,8 +50,8 @@
   PeCoffGetEntryPoint|$(WORKSPACE)/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf\r
   PeCoffLib|$(WORKSPACE)/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
   PerformanceLib|$(WORKSPACE)/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
-  PostCodeLib|$(WORKSPACE)/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf\r
-  PostCodeLib|$(WORKSPACE)/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf\r
+  #PostCodeLib|$(WORKSPACE)/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf\r
+  #PostCodeLib|$(WORKSPACE)/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf\r
   PrintLib|$(WORKSPACE)/MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
   TimerLib|$(WORKSPACE)/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
   UefiDecompressLib|$(WORKSPACE)/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf\r
@@ -91,7 +91,6 @@
   PciIncompatibleDeviceSupportLib|$(WORKSPACE)/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf\r
   IoLib|${WORKSPACE}/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
 \r
-\r
 [LibraryClasses.common.DXE_RUNTIME_DRIVER]\r
   HobLib|$(WORKSPACE)/MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
   MemoryAllocationLib|$(WORKSPACE)/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r

diff --git a/IntelFrameworkPkg/Include/Framework/Legacy16.h b/IntelFrameworkPkg/Include/Framework/Legacy16.h
index 7f80c8ac722f607150d8bcef30dfe17ed3c59a3e..fdfc7f32dff72fd1a684eec5b2791b7a6106649d 100644 (file)
--- a/IntelFrameworkPkg/Include/Framework/Legacy16.h
+++ b/IntelFrameworkPkg/Include/Framework/Legacy16.h
@@ -112,9 +112,6 @@ typedef struct {
 // EFI_TO_COMPATIBILITY16_BOOT_TABLE\r
 ///////////////////////////////////////////////////////////////////////////////\r
 \r
-typedef UINT8 SERIAL_MODE;\r
-typedef UINT8 PARALLEL_MODE;\r
-\r
 //\r
 // DEVICE_PRODUCER_SERIAL & its modes\r
 //\r

diff --git a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
index d8fa30bd42216434ed2505f3d9aecd10b74560d8..5f789e1099bd186e4c92b331dee3853df2e9e9e1 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
+++ b/IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h
@@ -115,10 +115,6 @@ EFI_STATUS
   IN OUT EFI_FV_ATTRIBUTES          *Attributes\r
   );\r
 \r
-typedef UINT32  EFI_FV_FILE_ATTRIBUTES;\r
-\r
-#define EFI_FV_FILE_ATTRIB_ALIGNMENT  0x0000001F\r
-\r
 /**\r
   Read the requested file (NameGuid) and returns data in Buffer.\r
 \r

diff --git a/IntelFrameworkPkg/Include/Protocol/HiiFramework.h b/IntelFrameworkPkg/Include/Protocol/HiiFramework.h
index 4a2237852fb7b4977741ff08f55e5383c1460f01..56f701ec8d9641f31be73ad1a0187a6491dcf47a 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/HiiFramework.h
+++ b/IntelFrameworkPkg/Include/Protocol/HiiFramework.h
@@ -77,7 +77,6 @@ typedef struct _EFI_HII_PROTOCOL  EFI_HII_PROTOCOL;
 //\r
 // The following types are currently defined:\r
 //\r
-typedef UINT16  EFI_FORM_ID;\r
 typedef UINT16  EFI_FORM_LABEL;\r
 \r
 #pragma pack(1)\r

diff --git a/MdePkg/Include/Pi/PiFirmwareVolume.h b/MdePkg/Include/Pi/PiFirmwareVolume.h
index 7675df016c3052d58eee58446f367ef0cbff03bb..8406f4abde5bb6f623dbb922d6b7b104991566d8 100644 (file)
--- a/MdePkg/Include/Pi/PiFirmwareVolume.h
+++ b/MdePkg/Include/Pi/PiFirmwareVolume.h
@@ -30,7 +30,7 @@ typedef UINT32  EFI_FV_FILE_ATTRIBUTES;
 #define EFI_FV_FILE_ATTRIB_FIXED          0x00000100\r
 #define EFI_FV_FILE_ATTRIB_MEMORY_MAPPED  0x00000200\r
 \r
-typedef UINT32  EFI_FVB_ATTRIBUTES;\r
+typedef UINT32  EFI_FVB2_ATTRIBUTES;\r
 \r
 // \r
 // Attributes bit definitions\r
@@ -98,7 +98,7 @@ typedef struct {
   EFI_GUID                  FileSystemGuid;\r
   UINT64                    FvLength;\r
   UINT32                    Signature;\r
-  EFI_FVB_ATTRIBUTES        Attributes;\r
+  EFI_FVB2_ATTRIBUTES        Attributes;\r
   UINT16                    HeaderLength;\r
   UINT16                    Checksum;\r
   UINT16                    ExtHeaderOffset;\r

diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h
index da7c46e587e963956b84b0f2f2655110ca8985b0..59bff01f537b871fd5cbba727a73b0b8999c0c47 100644 (file)
--- a/MdePkg/Include/Pi/PiPeiCis.h
+++ b/MdePkg/Include/Pi/PiPeiCis.h
@@ -607,7 +607,7 @@ EFI_STATUS
 \r
 **/\r
 typedef struct {\r
-  EFI_FVB_ATTRIBUTES  FvAttributes;\r
+  EFI_FVB2_ATTRIBUTES FvAttributes;\r
   EFI_GUID            FvFormat;\r
   EFI_GUID            FvName;\r
   VOID                *FvStart;\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c
index 9fec1bcae90779cf399eef1ad3f32b770c63c700..6f076f7578de96ca9cb8faf3b39524b52929796e 100644 (file)
--- 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 );\r
 void          _ReadWriteBarrier (void);\r
 \r
+#ifdef _MSC_VER\r
 #pragma intrinsic(_inp)\r
 #pragma intrinsic(_inpw)\r
 #pragma intrinsic(_inpd)\r
@@ -43,7 +44,7 @@ void          _ReadWriteBarrier (void);
 #pragma intrinsic(_outpw)\r
 #pragma intrinsic(_outpd)\r
 #pragma intrinsic(_ReadWriteBarrier)\r
-\r
+#endif \r
 //\r
 // _ReadWriteBarrier() forces memory reads and writes to complete at the point\r
 // in the call. This is only a hint to the compiler and does emit code.\r