diff options
23 files changed, 93 insertions, 46 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiApi.h b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiApi.h index 6939481..052f45b 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Include/EfiApi.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Include/EfiApi.h @@ -414,10 +414,10 @@ EFI_STATUS typedef enum {
EfiResetCold,
EfiResetWarm,
- EfiResetShutdown,
+ EfiResetShutdown
#if ((TIANO_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000))
- EfiResetUpdate
+ , EfiResetUpdate
#endif
} EFI_RESET_TYPE;
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h index 54e7b44..2ee545a 100644 --- a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h +++ b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h @@ -78,7 +78,7 @@ typedef enum _EFI_MEMORY_ARRAY_USE { EfiMemoryArrayUseVideoMemory = 0x04,
EfiMemoryArrayUseFlashMemory = 0x05,
EfiMemoryArrayUseNonVolatileRam = 0x06,
- EfiMemoryArrayUseCacheMemory = 0x07,
+ EfiMemoryArrayUseCacheMemory = 0x07
} EFI_MEMORY_ARRAY_USE;
typedef enum _EFI_MEMORY_ERROR_CORRECTION {
@@ -88,7 +88,7 @@ typedef enum _EFI_MEMORY_ERROR_CORRECTION { EfiMemoryErrorCorrectionParity = 0x04,
EfiMemoryErrorCorrectionSingleBitEcc = 0x05,
EfiMemoryErrorCorrectionMultiBitEcc = 0x06,
- EfiMemoryErrorCorrectionCrc = 0x07,
+ EfiMemoryErrorCorrectionCrc = 0x07
} EFI_MEMORY_ERROR_CORRECTION;
typedef struct {
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h index 77519d6..d2956ec 100644 --- a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h +++ b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMisc.h @@ -137,7 +137,7 @@ typedef enum { EfiSystemWakeupTypeLanRemote = 5,
EfiSystemWakeupTypePowerSwitch = 6,
EfiSystemWakeupTypePciPme = 7,
- EfiSystemWakeupTypeAcPowerRestored = 8,
+ EfiSystemWakeupTypeAcPowerRestored = 8
} EFI_MISC_SYSTEM_WAKEUP_TYPE;
typedef struct {
@@ -180,7 +180,7 @@ typedef enum { EfiBaseBoardTypeMotherBoard = 0xA,
EfiBaseBoardTypeProcessorMemoryModule = 0xB,
EfiBaseBoardTypeProcessorIOModule = 0xC,
- EfiBaseBoardTypeInterconnectBoard = 0xD,
+ EfiBaseBoardTypeInterconnectBoard = 0xD
} EFI_BASE_BOARD_TYPE;
typedef struct {
@@ -248,7 +248,7 @@ typedef enum { EfiChassisStateSafe = 3,
EfiChassisStateWarning = 4,
EfiChassisStateCritical = 5,
- EfiChassisStateNonRecoverable = 6,
+ EfiChassisStateNonRecoverable = 6
} EFI_MISC_CHASSIS_STATE;
typedef enum {
@@ -256,7 +256,7 @@ typedef enum { EfiChassisSecurityStatusUnknown = 2,
EfiChassisSecurityStatusNone = 3,
EfiChassisSecurityStatusExternalInterfaceLockedOut = 4,
- EfiChassisSecurityStatusExternalInterfaceLockedEnabled = 5,
+ EfiChassisSecurityStatusExternalInterfaceLockedEnabled = 5
} EFI_MISC_CHASSIS_SECURITY_STATE;
typedef struct {
@@ -338,7 +338,7 @@ typedef enum { EfiPortConnectorTypePCH98 = 0xA2,
EfiPortConnectorTypePC98Note = 0xA3,
EfiPortConnectorTypePC98Full = 0xA4,
- EfiPortConnectorTypeOther = 0xFF,
+ EfiPortConnectorTypeOther = 0xFF
} EFI_MISC_PORT_CONNECTOR_TYPE;
typedef enum {
@@ -378,7 +378,7 @@ typedef enum { EfiPortTypeSas = 0x21,
EfiPortType8251Compatible = 0xA0,
EfiPortType8251FifoCompatible = 0xA1,
- EfiPortTypeOther = 0xFF,
+ EfiPortTypeOther = 0xFF
} EFI_MISC_PORT_TYPE;
@@ -445,14 +445,14 @@ typedef enum { EfiSlotDataBusWidth8xOrx8 = 0xB,
EfiSlotDataBusWidth12xOrx12 = 0xC,
EfiSlotDataBusWidth16xOrx16 = 0xD,
- EfiSlotDataBusWidth32xOrx32 = 0xE,
+ EfiSlotDataBusWidth32xOrx32 = 0xE
} EFI_MISC_SLOT_DATA_BUS_WIDTH;
typedef enum {
EfiSlotUsageOther = 1,
EfiSlotUsageUnknown = 2,
EfiSlotUsageAvailable = 3,
- EfiSlotUsageInUse = 4,
+ EfiSlotUsageInUse = 4
} EFI_MISC_SLOT_USAGE;
typedef enum {
@@ -613,7 +613,7 @@ typedef enum { EfiPointingDeviceTypeGlidePoint = 6,
EfiPointingDeviceTouchPad = 7,
EfiPointingDeviceTouchScreen = 8,
- EfiPointingDeviceOpticalSensor = 9,
+ EfiPointingDeviceOpticalSensor = 9
} EFI_MISC_POINTING_DEVICE_TYPE;
typedef enum {
@@ -627,7 +627,7 @@ typedef enum { EfiPointingDeviceInterfaceADB = 8,
EfiPointingDeviceInterfaceBusMouseDB9 = 0xA0,
EfiPointingDeviceInterfaceBusMouseMicroDin = 0xA1,
- EfiPointingDeviceInterfaceUsb = 0xA2,
+ EfiPointingDeviceInterfaceUsb = 0xA2
} EFI_MISC_POINTING_DEVICE_INTERFACE;
typedef struct {
@@ -652,7 +652,7 @@ typedef enum { EfiPortableBatteryDeviceChemistryNickelMetalHydride = 5,
EfiPortableBatteryDeviceChemistryLithiumIon = 6,
EfiPortableBatteryDeviceChemistryZincAir = 7,
- EfiPortableBatteryDeviceChemistryLithiumPolymer = 8,
+ EfiPortableBatteryDeviceChemistryLithiumPolymer = 8
} EFI_MISC_PORTABLE_BATTERY_DEVICE_CHEMISTRY;
typedef struct {
@@ -908,7 +908,7 @@ typedef enum { EfiBootInformationStatusWatchdogTimerExpired = 8,
EfiBootInformationStatusStartReserved = 9,
EfiBootInformationStatusStartOemSpecific = 128,
- EfiBootInformationStatusStartProductSpecific = 192,
+ EfiBootInformationStatusStartProductSpecific = 192
} EFI_MISC_BOOT_INFORMATION_STATUS_TYPE;
typedef struct {
@@ -977,7 +977,7 @@ typedef enum { EfiIpmiOther = 0,
EfiIpmiKcs = 1,
EfiIpmiSmic = 2,
- EfiIpmiBt = 3,
+ EfiIpmiBt = 3
} EFI_MISC_IPMI_INTERFACE_TYPE;
typedef struct {
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h b/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h index 4836462..4a7445f 100644 --- a/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h +++ b/EdkCompatibilityPkg/Foundation/Framework/Include/TianoSpecError.h @@ -22,7 +22,7 @@ Abstract: #ifndef _TIANO_SPEC_ERROR_H_
#define _TIANO_SPEC_ERROR_H_
-#include "EfiBind.h"
+#include <EfiBind.h>
#define TIANO_ERROR(a) (MAX_2_BITS | (a))
//
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h index 88f7b83..79b671d 100644 --- a/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h +++ b/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h @@ -36,7 +36,7 @@ Abstract: //
typedef enum {
PeiResetCold,
- PeiResetWarm,
+ PeiResetWarm
} PEI_RESET_TYPE;
typedef
diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h index b273fb6..ef9dae4 100644 --- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h +++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h @@ -218,7 +218,7 @@ typedef enum { Compatibility16DispatchOprom = 0x0005,
Compatibility16GetTableAddress = 0x0006,
Compatibility16SetKeyboardLeds = 0x0007,
- Compatibility16InstallPciHandler = 0x0008,
+ Compatibility16InstallPciHandler = 0x0008
} EFI_COMPATIBILITY_FUNCTIONS;
//
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h index 027d247..c177882 100644 --- a/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h +++ b/EdkCompatibilityPkg/Foundation/Include/Ebc/TianoBind.h @@ -23,7 +23,7 @@ Abstract: #ifndef _TIANO_BIND_H_
#define _TIANO_BIND_H_
-#include "EfiBind.h"
+#include <EfiBind.h>
#define EFI_DXE_ENTRY_POINT(InitFunction)
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h b/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h index 305bfea..63191fe 100644 --- a/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h +++ b/EdkCompatibilityPkg/Foundation/Include/EfiCommon.h @@ -20,7 +20,7 @@ Abstract: #ifndef _EFI_COMMON_H_
#define _EFI_COMMON_H_
-#include "EfiBind.h"
+#include <EfiBind.h>
#include "EfiTypes.h"
#include "EfiStdArg.h"
#include "EfiError.h"
diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h b/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h index 0ff2252..623069e 100644 --- a/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h +++ b/EdkCompatibilityPkg/Foundation/Include/EfiPxe.h @@ -33,7 +33,11 @@ Abstract: // #define PXE_NETWORK_ORDER 1 // network order
//
#define PXE_UINT64_SUPPORT 1 // UINT64 supported
-// #define PXE_NO_UINT64_SUPPORT 1 // UINT64 not supported
+#if PXE_UINT64_SUPPORT == 0
+#define PXE_NO_UINT64_SUPPORT 1
+#else
+#define PXE_NO_UINT64_SUPPORT 0
+#endif
//
#define PXE_BUSTYPE(a, b, c, d) \
( \
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h index edf599a..60699c1 100644 --- a/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h +++ b/EdkCompatibilityPkg/Foundation/Include/Ia32/TianoBind.h @@ -23,7 +23,7 @@ Abstract: #ifndef _TIANO_BIND_H_
#define _TIANO_BIND_H_
-#include "EfiBind.h"
+#include <EfiBind.h>
#ifdef EFI_DEBUG
diff --git a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h index f3858ed..7ec33a1 100644 --- a/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h +++ b/EdkCompatibilityPkg/Foundation/Include/IndustryStandard/usb.h @@ -160,7 +160,7 @@ enum { //
//Use 200 ms to increase the error handling response time
//
- EFI_USB_INTERRUPT_DELAY = 2000000,
+ EFI_USB_INTERRUPT_DELAY = 2000000
};
diff --git a/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h index dc51e1d..de84156 100644 --- a/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h +++ b/EdkCompatibilityPkg/Foundation/Include/Ipf/TianoBind.h @@ -23,7 +23,7 @@ Abstract: #ifndef _TIANO_BIND_H_
#define _TIANO_BIND_H_
-#include "EfiBind.h"
+#include <EfiBind.h>
#define EFI_DXE_ENTRY_POINT(InitFunction)
diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h index 349d79c..52a2239 100644 --- a/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h +++ b/EdkCompatibilityPkg/Foundation/Include/X64/EfiBind.h @@ -37,6 +37,38 @@ Abstract: //
#pragma pack()
+#if __INTEL_COMPILER
+//
+// Disable ICC's warning: trailing comma is nonstandard
+//
+//#pragma warning ( disable : 271 )
+
+//
+// Disable ICC's warning: extra ";" ignored
+//
+#pragma warning ( disable : 424 )
+
+//
+// Disable ICC's warning: : variable "foo" was set but never used
+//
+#pragma warning ( disable : 593 )
+
+//
+// Disable ICC's remark #1418: external function definition with no prior declaration.
+// This is legal ANSI C code so we disable the remark that is turned on with /W4
+//
+#pragma warning ( disable : 1418 )
+
+
+//
+// Disable ICC's remark #1419: external declaration in primary source file
+// This is legal ANSI C code so we disable the remark that is turned on with /W4
+//
+#pragma warning ( disable : 1419 )
+
+#endif
+
+
#if _MSC_EXTENSIONS
//
@@ -89,7 +121,7 @@ Abstract: #endif
-#if (__STDC_VERSION__ < 199901L)
+#if !defined(__GNUC__) && (__STDC_VERSION__ < 199901L)
//
// No ANSI C 2000 stdint.h integer width declarations, so define equivalents
//
diff --git a/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h b/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h index 45fe211..006755c 100644 --- a/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h +++ b/EdkCompatibilityPkg/Foundation/Include/X64/TianoBind.h @@ -23,7 +23,7 @@ Abstract: #ifndef _TIANO_BIND_H_
#define _TIANO_BIND_H_
-#include "EfiBind.h"
+#include <EfiBind.h>
#define EFI_DXE_ENTRY_POINT(InitFunction)
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c index 44370a5..996421d 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c +++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c @@ -119,6 +119,8 @@ Returns: UINT8 *Destination;
UINTN Index;
BOOLEAN Finished;
+ UINTN SizeofLanguage;
+ UINTN SizeofString;
StringPack = (EFI_HII_STRING_PACK *) StringBuffer;
Finished = FALSE;
@@ -239,14 +241,16 @@ Returns: //
// Pointing to a new string pack location
//
+ SizeofLanguage = EfiStrSize (Language);
+ SizeofString = EfiStrSize (String);
StringPackBuffer->Header.Length = (UINT32)
(
sizeof (EFI_HII_STRING_PACK) -
sizeof (EFI_STRING) +
sizeof (RELOFST) +
sizeof (RELOFST) +
- EfiStrSize (Language) +
- EfiStrSize (String)
+ SizeofLanguage +
+ SizeofString
);
StringPackBuffer->Header.Type = EFI_HII_STRING;
StringPackBuffer->LanguageNameString = (UINT16) ((UINTN) &PackDestination[3] - (UINTN) StringPackBuffer);
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrVariable.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrVariable.c index 1340daf..ef23d6f 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrVariable.c +++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrVariable.c @@ -471,11 +471,15 @@ Returns: {
EFI_STATUS Status;
CHAR16 *NameSuffixed;
+ UINTN NameLength;
+ UINTN SuffixLength;
//
// enough to concatenate both strings.
//
- NameSuffixed = EfiLibAllocateZeroPool ((EfiStrLen (Name) + EfiStrLen (Suffix) + 1) * sizeof (CHAR16));
+ NameLength = EfiStrLen (Name);
+ SuffixLength = EfiStrLen (Suffix);
+ NameSuffixed = EfiLibAllocateZeroPool ((NameLength + SuffixLength + 1) * sizeof (CHAR16));
EfiStrCpy (NameSuffixed, Name);
EfiStrCat (NameSuffixed, Suffix);
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c index abee531..222ca27 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c +++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c @@ -118,7 +118,7 @@ UpdateFormPackageData ( EfiCopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER));
IfrOpHdr = (EFI_IFR_OP_HEADER *)((UINT8 *) Package + sizeof (EFI_HII_PACKAGE_HEADER));
Offset = sizeof (EFI_HII_PACKAGE_HEADER);
- GetFormSet = (FormSetGuid == NULL) ? TRUE : FALSE;
+ GetFormSet = (BOOLEAN)((FormSetGuid == NULL) ? TRUE : FALSE);
GetForm = FALSE;
Updated = FALSE;
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrOpCodeCreation.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrOpCodeCreation.c index 3729fa2..5646326 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrOpCodeCreation.c +++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrOpCodeCreation.c @@ -32,7 +32,7 @@ IsValidQuestionFlags ( IN UINT8 Flags
)
{
- return (Flags & (~QUESTION_FLAGS)) ? FALSE : TRUE;
+ return (BOOLEAN)((Flags & (~QUESTION_FLAGS)) ? FALSE : TRUE);
}
STATIC
@@ -41,7 +41,7 @@ IsValidValueType ( IN UINT8 Type
)
{
- return (Type <= EFI_IFR_TYPE_OTHER) ? TRUE : FALSE;
+ return (BOOLEAN)((Type <= EFI_IFR_TYPE_OTHER) ? TRUE : FALSE);
}
STATIC
@@ -67,7 +67,7 @@ IsValidCheckboxFlags ( IN UINT8 Flags
)
{
- return (Flags <= EFI_IFR_CHECKBOX_DEFAULT_MFG) ? TRUE : FALSE;
+ return (BOOLEAN)((Flags <= EFI_IFR_CHECKBOX_DEFAULT_MFG) ? TRUE : FALSE);
}
EFI_STATUS
@@ -302,7 +302,7 @@ CreateOneOfOptionOpCode ( OneOfOption.Option = OptionsList[Index].StringToken;
OneOfOption.Value = OptionsList[Index].Value;
- OneOfOption.Flags = OptionsList[Index].Flags & (EFI_IFR_OPTION_DEFAULT | EFI_IFR_OPTION_DEFAULT_MFG);
+ OneOfOption.Flags = (UINT8)(OptionsList[Index].Flags & (EFI_IFR_OPTION_DEFAULT | EFI_IFR_OPTION_DEFAULT_MFG));
OneOfOption.Type = Type;
LocalBuffer = (UINT8 *) Data->Data + Data->Offset;
@@ -360,7 +360,7 @@ CreateOneOfOpCode ( EfiCopyMem (LocalBuffer, &OneOf, sizeof (EFI_IFR_ONE_OF));
Data->Offset += sizeof (EFI_IFR_ONE_OF);
- CreateOneOfOptionOpCode (OptionCount, OptionsList, (OneOfFlags & EFI_IFR_NUMERIC_SIZE), Data);
+ CreateOneOfOptionOpCode (OptionCount, OptionsList, (UINT8)(OneOfFlags & EFI_IFR_NUMERIC_SIZE), Data);
CreateEndOpCode (Data);
@@ -549,7 +549,7 @@ CreateNumericOpCode ( Data->Offset += sizeof (EFI_IFR_NUMERIC);
DefaultValue.u64 = Default;
- Status = CreateDefaultOpCode (&DefaultValue, (NumericFlags & EFI_IFR_NUMERIC_SIZE), Data);
+ Status = CreateDefaultOpCode (&DefaultValue, (UINT8)(NumericFlags & EFI_IFR_NUMERIC_SIZE), Data);
if (EFI_ERROR(Status)) {
return Status;
}
diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/Math.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/Math.c index 64e683e..ba00c8b 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/Math.c +++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/Math.c @@ -167,7 +167,7 @@ Returns: Operand >>= 1;
Bitpos++;
}
- return (Bitpos - 1);
+ return (UINT8)(Bitpos - 1);
}
diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/PostCode.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/PostCode.c index 31232be..69171ea 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/PostCode.c +++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/PostCode.c @@ -54,7 +54,7 @@ Returns: if (((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) ||
((CodeType & EFI_STATUS_CODE_TYPE_MASK)== EFI_ERROR_CODE)) {
*PostCode = (UINT8) (((Value & EFI_STATUS_CODE_CLASS_MASK) >> 24) << 5);
- *PostCode |= (UINT8) (((Value & EFI_STATUS_CODE_SUBCLASS_MASK) >> 16) & 0x1f);
+ *PostCode = (UINT8)(*PostCode | (((Value & EFI_STATUS_CODE_SUBCLASS_MASK) >> 16) & 0x1f));
return TRUE;
}
diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c index 4a9fca8..49328e6 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c +++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/ReportStatusCode.c @@ -196,7 +196,8 @@ Returns: // Make sure it will all fit in the passed in buffer
//
TotalSize = sizeof (EFI_STATUS_CODE_DATA) + sizeof (EFI_DEBUG_ASSERT_DATA);
- TotalSize += EfiAsciiStrLen (Filename) + EfiAsciiStrLen (Description);
+ TotalSize += EfiAsciiStrLen (Filename);
+ TotalSize += EfiAsciiStrLen (Description);
if (TotalSize > BufferSize) {
return EFI_BUFFER_TOO_SMALL;
}
diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c index 150f650..54523b2 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c +++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c @@ -593,7 +593,7 @@ HexStringToBuf ( } else {
Byte = Buf[Idx / 2];
Byte &= 0x0F;
- Byte |= Digit << 4;
+ Byte = (UINT8)(Byte | (Digit << 4));
}
Buf[Idx / 2] = Byte;
@@ -749,9 +749,11 @@ Returns: Sub = StrCharSet;
while ((*String != L'\0') && (*StrCharSet != L'\0')) {
- if (*String++ != *StrCharSet++) {
+ if (*String++ != *StrCharSet) {
String = ++Src;
StrCharSet = Sub;
+ } else {
+ StrCharSet++;
}
}
if (*StrCharSet == L'\0') {
@@ -788,9 +790,11 @@ Returns: Sub = StrCharSet;
while ((*String != '\0') && (*StrCharSet != '\0')) {
- if (*String++ != *StrCharSet++) {
+ if (*String++ != *StrCharSet) {
String = ++Src;
StrCharSet = Sub;
+ } else {
+ StrCharSet++;
}
}
if (*StrCharSet == '\0') {
diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Decompress.c b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Decompress.c index d35d946..efcda80 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Decompress.c +++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/Decompress.c @@ -762,8 +762,6 @@ Returns: (VOID) }
}
}
-
- return ;
}
EFI_STATUS
|