diff options
| -rw-r--r-- | IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 5 | ||||
| -rw-r--r-- | IntelFrameworkPkg/Include/Framework/Legacy16.h | 3 | ||||
| -rw-r--r-- | IntelFrameworkPkg/Include/Protocol/FirmwareVolume.h | 4 | ||||
| -rw-r--r-- | IntelFrameworkPkg/Include/Protocol/HiiFramework.h | 1 | ||||
| -rw-r--r-- | MdePkg/Include/Pi/PiFirmwareVolume.h | 4 | ||||
| -rw-r--r-- | MdePkg/Include/Pi/PiPeiCis.h | 2 | ||||
| -rw-r--r-- | MdePkg/Library/BaseIoLibIntrinsic/IoLibMsc.c | 3 |
7 files changed, 7 insertions, 15 deletions
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc index ffd146e444..1764cc0956 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc @@ -50,8 +50,8 @@ PeCoffGetEntryPoint|$(WORKSPACE)/MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
PeCoffLib|$(WORKSPACE)/MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
PerformanceLib|$(WORKSPACE)/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
- PostCodeLib|$(WORKSPACE)/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
- PostCodeLib|$(WORKSPACE)/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
+ #PostCodeLib|$(WORKSPACE)/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
+ #PostCodeLib|$(WORKSPACE)/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
PrintLib|$(WORKSPACE)/MdePkg/Library/BasePrintLib/BasePrintLib.inf
TimerLib|$(WORKSPACE)/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
UefiDecompressLib|$(WORKSPACE)/MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
@@ -91,7 +91,6 @@ PciIncompatibleDeviceSupportLib|$(WORKSPACE)/IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf
IoLib|${WORKSPACE}/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
-
[LibraryClasses.common.DXE_RUNTIME_DRIVER]
HobLib|$(WORKSPACE)/MdePkg/Library/DxeHobLib/DxeHobLib.inf
MemoryAllocationLib|$(WORKSPACE)/MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf
diff --git a/IntelFrameworkPkg/Include/Framework/Legacy16.h b/IntelFrameworkPkg/Include/Framework/Legacy16.h index 7f80c8ac72..fdfc7f32df 100644 --- a/IntelFrameworkPkg/Include/Framework/Legacy16.h +++ b/IntelFrameworkPkg/Include/Framework/Legacy16.h @@ -112,9 +112,6 @@ typedef struct { // EFI_TO_COMPATIBILITY16_BOOT_TABLE
///////////////////////////////////////////////////////////////////////////////
-typedef UINT8 SERIAL_MODE;
-typedef UINT8 PARALLEL_MODE;
-
//
// DEVICE_PRODUCER_SERIAL & its modes
//
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)
diff --git a/MdePkg/Include/Pi/PiFirmwareVolume.h b/MdePkg/Include/Pi/PiFirmwareVolume.h index 7675df016c..8406f4abde 100644 --- 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
#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;
diff --git a/MdePkg/Include/Pi/PiPeiCis.h b/MdePkg/Include/Pi/PiPeiCis.h index da7c46e587..59bff01f53 100644 --- a/MdePkg/Include/Pi/PiPeiCis.h +++ b/MdePkg/Include/Pi/PiPeiCis.h @@ -607,7 +607,7 @@ EFI_STATUS **/
typedef struct {
- EFI_FVB_ATTRIBUTES FvAttributes;
+ EFI_FVB2_ATTRIBUTES FvAttributes;
EFI_GUID FvFormat;
EFI_GUID FvName;
VOID *FvStart;
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.
|