From 4cb43192bd4a7b7eee05f5c33233459843636edb Mon Sep 17 00:00:00 2001 From: jljusten Date: Thu, 24 Apr 2008 16:21:53 +0000 Subject: Fix various warnings with the Intel C compiler. EfiBind.h: * Adding ignores for certain warnings with the Intel C compiler. (Partially merged from MdePkg.) EfiPxe.h: * Make sure PXE_NO_UINT64_SUPPORT is defined Decompress.c: * Removed 'unreachable' return statement. EdkCompatibilityPkg/**: (all other files) * Remove trailing comma from last value in enum. * Include instead of "EfiBind.h", or for some reason __STDC_VERSION__ is not defined. * Introduce more explicit function call ordering by storing results in local variables before using in a calculation. * Add some additional casting for BOOLEAN & UINT8 following calculations which change the type to 'int'. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5123 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Guid/DataHubRecords/DataHubSubClassMemory.h | 4 ++-- .../Guid/DataHubRecords/DataHubSubClassMisc.h | 26 +++++++++++----------- .../Foundation/Framework/Include/TianoSpecError.h | 2 +- .../Foundation/Framework/Ppi/Reset/Reset.h | 2 +- .../Framework/Protocol/LegacyBios/LegacyBios.h | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'EdkCompatibilityPkg/Foundation/Framework') diff --git a/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h b/EdkCompatibilityPkg/Foundation/Framework/Guid/DataHubRecords/DataHubSubClassMemory.h index 54e7b44377..2ee545af5a 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 77519d67a7..d2956ec130 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 4836462ff7..4a7445f3ba 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 #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 88f7b83de6..79b671de33 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 b273fb683f..ef9dae4f0f 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; // -- cgit v1.2.3