From e00e1d46940a267d6fbe92be4ed2e547b4e946dc Mon Sep 17 00:00:00 2001 From: vanjeff Date: Thu, 4 Sep 2008 09:44:58 +0000 Subject: [PATCH] clean up the un-suitable ';' location when declaring the functions. The regular is ")[ ]++^p;" git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5821 6f19259b-4bc3-4df7-8a09-765794883524 --- .../DeviceIoToPciRootBridgeIoThunk.c | 36 ++++------- .../FrameworkHiiToUefiHiiThunk/ConfigAccess.h | 15 ++--- .../FrameworkHiiToUefiHiiThunk/HiiDatabase.h | 63 +++++++------------ .../FrameworkHiiToUefiHiiThunk/HiiHandle.h | 3 +- .../OpcodeCreation.h | 36 ++++------- .../UefiIfrDefault.h | 6 +- .../UefiIfrParser.h | 9 +-- .../UefiIfrParserCommon.h | 6 +- .../UefiIfrParserExpression.h | 15 ++--- .../UefiIfrParserExpressionInternal.h | 6 +- .../FrameworkHiiToUefiHiiThunk/Utility.h | 42 +++++-------- .../FvFileLoaderToLoadFileThunk.c | 3 +- .../Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.c | 18 ++---- .../Compatibility/UcToUc2Thunk/UcToUc2Thunk.c | 18 ++---- .../Foundation/Cpu/Pentium/Include/CpuIA32.h | 36 ++++------- .../SimpleTextInputEx/SimpleTextInputEx.h | 3 +- .../Foundation/Library/CompilerStub/memcpy.c | 3 +- .../Foundation/Library/CompilerStub/memset.c | 3 +- .../Library/Dxe/Include/EfiHobLib.h | 3 +- .../Dxe/UefiEfiIfrSupportLib/UefiIfrLibrary.h | 3 +- .../Library/EdkIIGlueDxeRuntimeDriverLib.h | 3 +- .../Include/Library/EdkIIGlueEdkDxeSalLib.h | 9 +-- .../Include/Library/EdkIIGlueHiiLib.h | 3 +- .../Include/Library/EdkIIGlueHobLib.h | 48 +++++--------- .../Include/Library/EdkIIGluePeCoffLib.h | 15 ++--- .../Library/EdkIIGlueResourcePublicationLib.h | 3 +- .../Include/Library/EdkIIGlueSmbusLib.h | 36 ++++------- .../Library/Pei/Include/MemoryStatusCodeLib.h | 6 +- .../Library/Pei/Include/SimpleCpuIoLib.h | 30 +++------ .../Pei/MemoryStatusCode/MemoryStatusCode.h | 3 +- .../MonoStatusCode/Pei/MonoStatusCode.h | 18 ++---- .../BsSerialStatusCode/BsSerialStatusCode.h | 6 +- .../Lib/Include/BsDataHubStatusCodeLib.h | 6 +- .../Lib/Include/BsSerialStatusCodeLib.h | 6 +- .../Lib/Include/RtLedStatusCodeLib.h | 6 +- .../Lib/Include/RtMemoryStatusCodeLib.h | 9 +-- .../Lib/Include/RtPlatformStatusCodeLib.h | 6 +- .../Lib/Include/RtPort80StatusCodeLib.h | 3 +- .../Sample/Tools/Source/Common/CommonLib.h | 36 ++++------- .../Sample/Tools/Source/Common/Compress.h | 6 +- .../Sample/Tools/Source/Common/Crc32.h | 3 +- .../Source/Common/EfiCustomizedCompress.h | 12 ++-- .../Tools/Source/Common/EfiUtilityMsgs.h | 27 +++----- .../Sample/Tools/Source/Common/FvLib.h | 33 ++++------ .../Sample/Tools/Source/Common/MyAlloc.h | 12 ++-- .../Sample/Tools/Source/Common/ParseInf.h | 21 +++---- .../Tools/Source/Common/SimpleFileParsing.h | 42 +++++-------- .../Tools/Source/GenFvImage/GenFvImageLib.h | 9 +-- .../Source/GenFvImage/GenFvImageLibInternal.h | 3 +- .../Sample/Tools/Source/GuidChk/CommonUtils.h | 3 +- .../Sample/Tools/Source/GuidChk/FileSearch.h | 21 +++---- .../Sample/Tools/Source/GuidChk/UtilsMsgs.h | 27 +++----- .../Sample/Tools/Source/ProcessDsc/DscFile.h | 21 +++---- .../Tools/Source/ProcessDsc/Exceptions.h | 15 ++--- .../Sample/Tools/Source/ProcessDsc/FWVolume.h | 18 ++---- .../Sample/Tools/Source/StrGather/StringDB.h | 42 +++++-------- .../Tools/Source/UefiStrGather/StringDB.h | 48 +++++--------- 57 files changed, 314 insertions(+), 628 deletions(-) diff --git a/EdkCompatibilityPkg/Compatibility/DeviceIoToPciRootBridgeIoThunk/DeviceIoToPciRootBridgeIoThunk.c b/EdkCompatibilityPkg/Compatibility/DeviceIoToPciRootBridgeIoThunk/DeviceIoToPciRootBridgeIoThunk.c index 3c8c2a58f6..24acfb3b67 100644 --- a/EdkCompatibilityPkg/Compatibility/DeviceIoToPciRootBridgeIoThunk/DeviceIoToPciRootBridgeIoThunk.c +++ b/EdkCompatibilityPkg/Compatibility/DeviceIoToPciRootBridgeIoThunk/DeviceIoToPciRootBridgeIoThunk.c @@ -61,8 +61,7 @@ DeviceIoMemRead ( IN UINT64 Address, IN UINTN Count, IN OUT VOID *Buffer - ) -; + ); /** @@ -89,8 +88,7 @@ DeviceIoMemWrite ( IN UINT64 Address, IN UINTN Count, IN OUT VOID *Buffer - ) -; + ); /** Perform reading I/O space of device. @@ -116,8 +114,7 @@ DeviceIoIoRead ( IN UINT64 Address, IN UINTN Count, IN OUT VOID *Buffer - ) -; + ); /** Perform writing I/O space of device. @@ -143,8 +140,7 @@ DeviceIoIoWrite ( IN UINT64 Address, IN UINTN Count, IN OUT VOID *Buffer - ) -; + ); /** Perform reading PCI configuration space of device @@ -170,8 +166,7 @@ DeviceIoPciRead ( IN UINT64 Address, IN UINTN Count, IN OUT VOID *Buffer - ) -; + ); /** Perform writing PCI configuration space of device. @@ -197,8 +192,7 @@ DeviceIoPciWrite ( IN UINT64 Address, IN UINTN Count, IN OUT VOID *Buffer - ) -; + ); /** Provides an EFI Device Path for a PCI device with the given PCI configuration space address. @@ -224,8 +218,7 @@ DeviceIoPciDevicePath ( IN EFI_DEVICE_IO_PROTOCOL *This, IN UINT64 Address, IN OUT EFI_DEVICE_PATH_PROTOCOL **PciDevicePath - ) -; + ); /** Provides the device-specific addresses needed to access system memory. @@ -260,8 +253,7 @@ DeviceIoMap ( IN OUT UINTN *NumberOfBytes, OUT EFI_PHYSICAL_ADDRESS *DeviceAddress, OUT VOID **Mapping - ) -; + ); /** Completes the Map() operation and releases any corresponding resources. @@ -279,8 +271,7 @@ EFIAPI DeviceIoUnmap ( IN EFI_DEVICE_IO_PROTOCOL *This, IN VOID *Mapping - ) -; + ); /** Allocates pages that are suitable for an EFIBusMasterCommonBuffer mapping. @@ -308,8 +299,7 @@ DeviceIoAllocateBuffer ( IN EFI_MEMORY_TYPE MemoryType, IN UINTN Pages, IN OUT EFI_PHYSICAL_ADDRESS *PhysicalAddress - ) -; + ); /** Flushes any posted write data to the device. @@ -325,8 +315,7 @@ EFI_STATUS EFIAPI DeviceIoFlush ( IN EFI_DEVICE_IO_PROTOCOL *This - ) -; + ); /** Frees pages that were allocated with AllocateBuffer(). @@ -348,8 +337,7 @@ DeviceIoFreeBuffer ( IN EFI_DEVICE_IO_PROTOCOL *This, IN UINTN Pages, IN EFI_PHYSICAL_ADDRESS HostAddress - ) -; + ); #define DEVICE_IO_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('D', 'e', 'I', 'O') diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.h index fb728074d1..c26f456620 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.h +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.h @@ -35,14 +35,12 @@ EFI_STATUS InstallDefaultConfigAccessProtocol ( IN CONST EFI_HII_PACKAGES *Packages, IN OUT HII_THUNK_CONTEXT *ThunkContext - ) -; + ); VOID UninstallDefaultConfigAccessProtocol ( IN HII_THUNK_CONTEXT *ThunkContext - ) -; + ); /** @@ -74,8 +72,7 @@ ThunkExtractConfig ( IN CONST EFI_STRING Request, OUT EFI_STRING *Progress, OUT EFI_STRING *Results - ) -; + ); /** @@ -100,8 +97,7 @@ ThunkRouteConfig ( IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This, IN CONST EFI_STRING Configuration, OUT EFI_STRING *Progress - ) -; + ); /** Wrap the EFI_HII_CONFIG_ACCESS_PROTOCOL.CallBack to EFI_FORM_CALLBACK_PROTOCOL.Callback. Therefor, @@ -137,8 +133,7 @@ ThunkCallback ( IN UINT8 Type, IN EFI_IFR_TYPE_VALUE *Value, OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h index e165d74855..2fc2be81a4 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.h @@ -237,16 +237,14 @@ HiiNewPack ( IN EFI_HII_PROTOCOL *This, IN EFI_HII_PACKAGES *PackageList, OUT FRAMEWORK_EFI_HII_HANDLE *Handle - ) -; + ); EFI_STATUS EFIAPI HiiRemovePack ( IN EFI_HII_PROTOCOL *This, IN FRAMEWORK_EFI_HII_HANDLE Handle - ) -; + ); EFI_STATUS EFIAPI @@ -254,8 +252,7 @@ HiiFindHandles ( IN EFI_HII_PROTOCOL *This, IN OUT UINT16 *HandleBufferLength, OUT FRAMEWORK_EFI_HII_HANDLE *Handle - ) -; + ); EFI_STATUS EFIAPI @@ -264,8 +261,7 @@ HiiExportDatabase ( IN FRAMEWORK_EFI_HII_HANDLE Handle, IN OUT UINTN *BufferSize, OUT VOID *Buffer - ) -; + ); EFI_STATUS EFIAPI @@ -276,8 +272,7 @@ HiiGetGlyph ( OUT UINT8 **GlyphBuffer, OUT UINT16 *BitWidth, IN OUT UINT32 *InternalStatus - ) -; + ); EFI_STATUS EFIAPI @@ -290,8 +285,7 @@ HiiGlyphToBlt ( IN UINTN Width, IN UINTN Height, IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer - ) -; + ); EFI_STATUS EFIAPI @@ -301,8 +295,7 @@ HiiNewString ( IN FRAMEWORK_EFI_HII_HANDLE Handle, IN OUT STRING_REF *Reference, IN CHAR16 *NewString - ) -; + ); EFI_STATUS EFIAPI @@ -314,16 +307,14 @@ HiiGetString ( IN CHAR16 *LanguageString, IN OUT UINTN *BufferLength, OUT EFI_STRING StringBuffer - ) -; + ); EFI_STATUS EFIAPI HiiResetStrings ( IN EFI_HII_PROTOCOL *This, IN FRAMEWORK_EFI_HII_HANDLE Handle - ) -; + ); EFI_STATUS EFIAPI @@ -332,8 +323,7 @@ HiiTestString ( IN CHAR16 *StringToTest, IN OUT UINT32 *FirstMissing, OUT UINT32 *GlyphBufferSize - ) -; + ); EFI_STATUS EFIAPI @@ -341,8 +331,7 @@ HiiGetPrimaryLanguages ( IN EFI_HII_PROTOCOL *This, IN FRAMEWORK_EFI_HII_HANDLE Handle, OUT EFI_STRING *LanguageString - ) -; + ); EFI_STATUS EFIAPI @@ -351,8 +340,7 @@ HiiGetSecondaryLanguages ( IN FRAMEWORK_EFI_HII_HANDLE Handle, IN CHAR16 *PrimaryLanguage, OUT EFI_STRING *LanguageString - ) -; + ); EFI_STATUS EFIAPI @@ -365,8 +353,7 @@ HiiGetLine ( IN CHAR16 *LanguageString, IN OUT UINT16 *BufferLength, OUT EFI_STRING StringBuffer - ) -; + ); EFI_STATUS EFIAPI @@ -376,8 +363,7 @@ HiiGetForms ( IN EFI_FORM_ID FormId, IN OUT UINTN *BufferLength, OUT UINT8 *Buffer - ) -; + ); EFI_STATUS EFIAPI @@ -386,8 +372,7 @@ HiiGetDefaultImage ( IN FRAMEWORK_EFI_HII_HANDLE Handle, IN UINTN DefaultMask, OUT EFI_HII_VARIABLE_PACK_LIST **VariablePackList - ) -; + ); EFI_STATUS EFIAPI @@ -397,8 +382,7 @@ HiiUpdateForm ( IN EFI_FORM_LABEL Label, IN BOOLEAN AddData, IN FRAMEWORK_EFI_HII_UPDATE_DATA *Data - ) -; + ); EFI_STATUS EFIAPI @@ -406,8 +390,7 @@ HiiGetKeyboardLayout ( IN EFI_HII_PROTOCOL *This, OUT UINT16 *DescriptorCount, OUT FRAMEWORK_EFI_KEY_DESCRIPTOR *Descriptor - ) -; + ); EFI_STATUS EFIAPI @@ -421,8 +404,7 @@ ThunkSendForm ( IN UINT8 *NvMapOverride, OPTIONAL IN FRAMEWORK_EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL OUT BOOLEAN *ResetRequired OPTIONAL - ) -; + ); EFI_STATUS EFIAPI @@ -434,8 +416,7 @@ ThunkCreatePopUp ( OUT EFI_INPUT_KEY *KeyValue, IN CHAR16 *String, ... - ) -; + ); EFI_STATUS EFIAPI @@ -445,8 +426,7 @@ RemovePackNotify ( IN CONST EFI_HII_PACKAGE_HEADER *Package, IN EFI_HII_HANDLE Handle, IN EFI_HII_DATABASE_NOTIFY_TYPE NotifyType - ) -; + ); EFI_STATUS EFIAPI @@ -456,8 +436,7 @@ NewOrAddPackNotify ( IN CONST EFI_HII_PACKAGE_HEADER *Package, IN EFI_HII_HANDLE Handle, IN EFI_HII_DATABASE_NOTIFY_TYPE NotifyType - ) -; + ); #include "Utility.h" #include "ConfigAccess.h" diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h index 78612795b5..ed2b186b7d 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.h @@ -22,8 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. VOID InitHiiHandleDatabase ( VOID - ) -; + ); EFI_STATUS AllocateHiiHandle ( diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.h index 0c662399ab..c56947539d 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.h +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.h @@ -19,38 +19,33 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. EFI_STATUS UCreateEndOfOpcode ( OUT EFI_HII_UPDATE_DATA *UefiData - ) -; + ); EFI_STATUS F2UCreateSubtitleOpCode ( IN CONST FRAMEWORK_EFI_IFR_SUBTITLE *FwOpcode, OUT EFI_HII_UPDATE_DATA *UefiData - ) -; + ); EFI_STATUS F2UCreateTextOpCode ( IN CONST FRAMEWORK_EFI_IFR_TEXT *FwOpcode, OUT EFI_HII_UPDATE_DATA *UefiData - ) -; + ); EFI_STATUS F2UCreateGotoOpCode ( IN CONST FRAMEWORK_EFI_IFR_REF *FwOpcode, OUT EFI_HII_UPDATE_DATA *UefiData - ) -; + ); EFI_STATUS F2UCreateOneOfOptionOpCode ( IN CONST FRAMEWORK_EFI_IFR_ONE_OF_OPTION *FwOpcode, IN UINTN Width, OUT EFI_HII_UPDATE_DATA *UefiData - ) -; + ); EFI_STATUS F2UCreateOneOfOpCode ( @@ -60,8 +55,7 @@ F2UCreateOneOfOpCode ( OUT EFI_HII_UPDATE_DATA *UefiData, OUT FRAMEWORK_EFI_IFR_OP_HEADER **NextFwOpcode, OUT UINTN *DataCount - ) -; + ); EFI_STATUS F2UCreateOrderedListOpCode ( @@ -71,8 +65,7 @@ F2UCreateOrderedListOpCode ( OUT EFI_HII_UPDATE_DATA *UefiData, OUT FRAMEWORK_EFI_IFR_OP_HEADER **NextFwOpcode, OUT UINTN *DataCount - ) -; + ); EFI_STATUS @@ -81,8 +74,7 @@ F2UCreateCheckBoxOpCode ( IN UINT16 VarStoreId, IN CONST FRAMEWORK_EFI_IFR_CHECKBOX *FwOpcode, OUT EFI_HII_UPDATE_DATA *UefiData - ) -; + ); EFI_STATUS @@ -91,8 +83,7 @@ F2UCreateNumericOpCode ( IN UINT16 VarStoreId, IN CONST FRAMEWORK_EFI_IFR_NUMERIC *FwOpcode, OUT EFI_HII_UPDATE_DATA *UefiData - ) -; + ); EFI_STATUS @@ -101,16 +92,14 @@ F2UCreateStringOpCode ( IN UINT16 VarStoreId, IN CONST FRAMEWORK_EFI_IFR_STRING *FwOpcode, OUT EFI_HII_UPDATE_DATA *UefiData - ) -; + ); EFI_STATUS F2UCreateBannerOpCode ( IN CONST FRAMEWORK_EFI_IFR_BANNER *FwOpcode, OUT EFI_HII_UPDATE_DATA *UefiData - ) -; + ); EFI_STATUS FwUpdateDataToUefiUpdateData ( @@ -118,7 +107,6 @@ FwUpdateDataToUefiUpdateData ( IN CONST FRAMEWORK_EFI_HII_UPDATE_DATA *Data, IN BOOLEAN AddData, OUT EFI_HII_UPDATE_DATA **UefiData - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h index 9bb4063b60..020c5e5cbc 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.h @@ -74,8 +74,7 @@ UefiDefaultsToFwDefaults ( IN LIST_ENTRY *UefiIfrDefaults, IN UINTN DefaultMask, OUT EFI_HII_VARIABLE_PACK_LIST **VariablePackList - ) -; + ); /** Free up all buffer allocated for the link list of UEFI_IFR_BUFFER_STORAGE_NODE. @@ -92,8 +91,7 @@ UefiDefaultsToFwDefaults ( VOID FreeDefaultList ( IN LIST_ENTRY *UefiIfrDefaults - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.h index 840c724289..cfc12035cc 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.h +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.h @@ -295,20 +295,17 @@ EvaluateExpression ( IN FORM_BROWSER_FORMSET *FormSet, IN FORM_BROWSER_FORM *Form, IN OUT FORM_EXPRESSION *Expression - ) -; + ); EFI_STATUS ParseOpCodes ( IN FORM_BROWSER_FORMSET *FormSet - ) -; + ); VOID DestroyFormSet ( IN OUT FORM_BROWSER_FORMSET *FormSet - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserCommon.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserCommon.h index 8c45ee5ab3..2f7876099c 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserCommon.h +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserCommon.h @@ -37,8 +37,7 @@ CHAR16 * GetToken ( IN EFI_STRING_ID Token, IN EFI_HII_HANDLE HiiHandle - ) -; + ); /** Create a new string in HII Package List. @@ -54,8 +53,7 @@ EFI_STRING_ID NewString ( IN CHAR16 *String, IN EFI_HII_HANDLE HiiHandle - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpression.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpression.h index c4ed930ea2..c55277ff13 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpression.h +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpression.h @@ -27,8 +27,7 @@ VOID ResetScopeStack ( VOID - ) -; + ); /** Push an Operand onto the Stack @@ -43,8 +42,7 @@ ResetScopeStack ( EFI_STATUS PushScope ( IN UINT8 Operand - ) -; + ); /** @@ -60,8 +58,7 @@ PushScope ( EFI_STATUS PopScope ( OUT UINT8 *Operand - ) -; + ); /** Zero extend integer/boolean/date/time to UINT64 for comparing. @@ -74,8 +71,7 @@ PopScope ( VOID ExtendValueToU64 ( IN EFI_HII_VALUE *Value - ) -; + ); /** Compare two Hii value. @@ -95,7 +91,6 @@ CompareHiiValue ( IN EFI_HII_VALUE *Value1, IN EFI_HII_VALUE *Value2, IN EFI_HII_HANDLE HiiHandle OPTIONAL - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpressionInternal.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpressionInternal.h index fea10aafd5..a77902c812 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpressionInternal.h +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParserExpressionInternal.h @@ -27,16 +27,14 @@ IdToQuestion ( IN FORM_BROWSER_FORMSET *FormSet, IN FORM_BROWSER_FORM *Form, IN UINT16 QuestionId - ) -; + ); FORM_EXPRESSION * IdToExpression ( IN FORM_BROWSER_FORM *Form, IN UINT8 RuleId - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.h index f2785a2438..0a45144cf8 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.h +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.h @@ -31,94 +31,80 @@ EFI_HII_HANDLE FwHiiHandleToUefiHiiHandle ( IN CONST HII_THUNK_PRIVATE_DATA *Private, IN FRAMEWORK_EFI_HII_HANDLE FwHiiHandle - ) -; + ); HII_THUNK_CONTEXT * FwHiiHandleToThunkContext ( IN CONST HII_THUNK_PRIVATE_DATA *Private, IN FRAMEWORK_EFI_HII_HANDLE FwHiiHandle - ) -; + ); HII_THUNK_CONTEXT * UefiHiiHandleToThunkContext ( IN CONST HII_THUNK_PRIVATE_DATA *Private, IN EFI_HII_HANDLE UefiHiiHandle - ) -; + ); EFI_HII_HANDLE * TagGuidToUefiHiiHandle ( IN CONST HII_THUNK_PRIVATE_DATA *Private, IN CONST EFI_GUID *Guid - ) -; + ); HII_THUNK_CONTEXT * CreateThunkContextForUefiHiiHandle ( IN EFI_HII_HANDLE UefiHiiHandle - ) -; + ); VOID DestroyThunkContextForUefiHiiHandle ( IN HII_THUNK_PRIVATE_DATA *Private, IN EFI_HII_HANDLE UefiHiiHandle - ) -; + ); UINTN GetPackageCountByType ( IN CONST EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader, IN UINT8 PackageType - ) -; + ); EFI_STATUS CreateQuestionIdMap ( IN OUT HII_THUNK_CONTEXT *ThunkContext - ) -; + ); VOID GetAttributesOfFirstFormSet ( IN OUT HII_THUNK_CONTEXT *ThunkContext - ) -; + ); LIST_ENTRY * GetMapEntryListHead ( IN CONST HII_THUNK_CONTEXT *ThunkContext, IN UINT16 VarStoreId - ) -; + ); HII_THUNK_CONTEXT * CreateThunkContext ( IN HII_THUNK_PRIVATE_DATA *Private, IN UINTN StringPackageCount, IN UINTN IfrPackageCount - ) -; + ); VOID DestroyThunkContext ( IN HII_THUNK_CONTEXT *ThunkContext - ) -; + ); VOID DestroyQuestionIdMap ( IN LIST_ENTRY *QuestionIdMapListHead - ) -; + ); VOID DestoryOneOfOptionMap ( IN LIST_ENTRY *OneOfOptionMapListHead - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.c b/EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.c index 35621cdc6d..5f09a8d21b 100644 --- a/EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.c +++ b/EdkCompatibilityPkg/Compatibility/FvFileLoaderToLoadFileThunk/FvFileLoaderToLoadFileThunk.c @@ -50,8 +50,7 @@ FrameworkLoadFile ( OUT EFI_PHYSICAL_ADDRESS *ImageAddress, OUT UINT64 *ImageSize, OUT EFI_PHYSICAL_ADDRESS *EntryPoint - ) -; + ); EFI_PEI_FV_FILE_LOADER_PPI mLoadFilePpi = { FrameworkLoadFile diff --git a/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.c b/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.c index a9d82e6754..4b2e30a623 100644 --- a/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.c +++ b/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.c @@ -52,8 +52,7 @@ StriColl ( IN EFI_UNICODE_COLLATION_PROTOCOL *This, IN CHAR16 *Str1, IN CHAR16 *Str2 - ) -; + ); /** Converts all the Unicode characters in a Null-terminated Unicode string to @@ -68,8 +67,7 @@ EFIAPI StrLwr ( IN EFI_UNICODE_COLLATION_PROTOCOL *This, IN OUT CHAR16 *Str - ) -; + ); /** Converts all the Unicode characters in a Null-terminated Unicode string to upper @@ -84,8 +82,7 @@ EFIAPI StrUpr ( IN EFI_UNICODE_COLLATION_PROTOCOL *This, IN OUT CHAR16 *Str - ) -; + ); /** Performs a case-insensitive comparison of a Null-terminated Unicode @@ -105,8 +102,7 @@ MetaiMatch ( IN EFI_UNICODE_COLLATION_PROTOCOL *This, IN CHAR16 *String, IN CHAR16 *Pattern - ) -; + ); /** Converts an 8.3 FAT file name in an OEM character set to a Null-terminated @@ -127,8 +123,7 @@ FatToStr ( IN UINTN FatSize, IN CHAR8 *Fat, OUT CHAR16 *String - ) -; + ); /** Converts a Null-terminated Unicode string to legal characters in a FAT @@ -152,8 +147,7 @@ StrToFat ( IN CHAR16 *String, IN UINTN FatSize, OUT CHAR8 *Fat - ) -; + ); #define UC2_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('_', 'U', 'C', '2') diff --git a/EdkCompatibilityPkg/Compatibility/UcToUc2Thunk/UcToUc2Thunk.c b/EdkCompatibilityPkg/Compatibility/UcToUc2Thunk/UcToUc2Thunk.c index de4290ccf1..025027cc1c 100644 --- a/EdkCompatibilityPkg/Compatibility/UcToUc2Thunk/UcToUc2Thunk.c +++ b/EdkCompatibilityPkg/Compatibility/UcToUc2Thunk/UcToUc2Thunk.c @@ -52,8 +52,7 @@ StriColl ( IN EFI_UNICODE_COLLATION_PROTOCOL *This, IN CHAR16 *Str1, IN CHAR16 *Str2 - ) -; + ); /** Converts all the Unicode characters in a Null-terminated Unicode string to @@ -68,8 +67,7 @@ EFIAPI StrLwr ( IN EFI_UNICODE_COLLATION_PROTOCOL *This, IN OUT CHAR16 *Str - ) -; + ); /** Converts all the Unicode characters in a Null-terminated Unicode string to upper @@ -84,8 +82,7 @@ EFIAPI StrUpr ( IN EFI_UNICODE_COLLATION_PROTOCOL *This, IN OUT CHAR16 *Str - ) -; + ); /** Performs a case-insensitive comparison of a Null-terminated Unicode @@ -105,8 +102,7 @@ MetaiMatch ( IN EFI_UNICODE_COLLATION_PROTOCOL *This, IN CHAR16 *String, IN CHAR16 *Pattern - ) -; + ); /** Converts an 8.3 FAT file name in an OEM character set to a Null-terminated @@ -127,8 +123,7 @@ FatToStr ( IN UINTN FatSize, IN CHAR8 *Fat, OUT CHAR16 *String - ) -; + ); /** Converts a Null-terminated Unicode string to legal characters in a FAT @@ -152,8 +147,7 @@ StrToFat ( IN CHAR16 *String, IN UINTN FatSize, OUT CHAR8 *Fat - ) -; + ); #define UC_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('_', 'U', 'C', '_') diff --git a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h index a7fe8b0005..2b7d0a6999 100644 --- a/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h +++ b/EdkCompatibilityPkg/Foundation/Cpu/Pentium/Include/CpuIA32.h @@ -142,8 +142,7 @@ VOID IA32API EfiHalt ( VOID - ) -; + ); /*++ Routine Description: @@ -157,8 +156,7 @@ VOID IA32API EfiWbinvd ( VOID - ) -; + ); /*++ Routine Description: @@ -172,8 +170,7 @@ VOID IA32API EfiInvd ( VOID - ) -; + ); /*++ Routine Description: @@ -188,8 +185,7 @@ IA32API EfiCpuid ( IN UINT32 RegisterInEax, OUT EFI_CPUID_REGISTER *Regs - ) -; + ); /*++ Routine Description: @@ -226,8 +222,7 @@ UINT64 IA32API EfiReadMsr ( IN UINT32 Index - ) -; + ); /*++ Routine Description: @@ -243,8 +238,7 @@ IA32API EfiWriteMsr ( IN UINT32 Index, IN UINT64 Value - ) -; + ); /*++ Routine Description: @@ -259,8 +253,7 @@ UINT64 IA32API EfiReadTsc ( VOID - ) -; + ); /*++ Routine Description: @@ -274,8 +267,7 @@ VOID IA32API EfiDisableCache ( VOID - ) -; + ); /*++ Routine Description: @@ -289,8 +281,7 @@ VOID IA32API EfiEnableCache ( VOID - ) -; + ); /*++ Routine Description: @@ -304,8 +295,7 @@ UINT32 IA32API EfiGetEflags ( VOID - ) -; + ); /*++ Routine Description: @@ -319,8 +309,7 @@ VOID IA32API EfiDisableInterrupts ( VOID - ) -; + ); /*++ Routine Description: @@ -334,8 +323,7 @@ VOID IA32API EfiEnableInterrupts ( VOID - ) -; + ); /*++ Routine Description: diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h index f6f19978a6..29768b6cbe 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h @@ -111,8 +111,7 @@ typedef EFI_STATUS (EFIAPI *EFI_KEY_NOTIFY_FUNCTION) ( IN EFI_KEY_DATA *KeyData - ) -; + ); typedef EFI_STATUS diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c index 69c45e1583..7439e31405 100644 --- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c +++ b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memcpy.c @@ -32,8 +32,7 @@ memcpy ( OUT VOID *Dest, IN const VOID *Src, IN UINTN Count - ) -; + ); #ifdef _MSC_EXTENSIONS #pragma intrinsic(memcpy) diff --git a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c index a51ea10a98..3dc442253f 100644 --- a/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c +++ b/EdkCompatibilityPkg/Foundation/Library/CompilerStub/memset.c @@ -31,8 +31,7 @@ memset ( OUT VOID *Dest, IN UINTN Char, IN UINTN Count - ) -; + ); #ifdef _MSC_EXTENSIONS #pragma intrinsic(memset) diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiHobLib.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiHobLib.h index cbf1c8d250..09aae87117 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiHobLib.h +++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Include/EfiHobLib.h @@ -215,8 +215,7 @@ GetNextFirmwareVolume2Hob ( OUT EFI_PHYSICAL_ADDRESS *BaseAddress, OUT UINT64 *Length, OUT EFI_GUID *FileName - ) -; + ); #endif EFI_STATUS diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrLibrary.h b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrLibrary.h index 4ad79520c5..8b2507224f 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrLibrary.h +++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrLibrary.h @@ -280,8 +280,7 @@ CreateOneOfOptionOpCode ( IN IFR_OPTION *OptionsList, IN UINT8 Type, IN OUT EFI_HII_UPDATE_DATA *Data - ) -; + ); EFI_STATUS CreateOneOfOpCode ( diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDxeRuntimeDriverLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDxeRuntimeDriverLib.h index 0db9ee55f4..b1b299a134 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDxeRuntimeDriverLib.h +++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueDxeRuntimeDriverLib.h @@ -168,8 +168,7 @@ EfiGetVariable ( OUT UINT32 *Attributes, IN OUT UINTN *DataSize, OUT VOID *Data - ) -; + ); /** Enumerates variable's name. diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueEdkDxeSalLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueEdkDxeSalLib.h index b88c919bbb..d10c4c202e 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueEdkDxeSalLib.h +++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueEdkDxeSalLib.h @@ -122,23 +122,20 @@ EFIAPI SetEsalVirtualEntryPoint ( IN UINT64 EntryPoint, IN UINT64 Gp - ) -; + ); SAL_RETURN_REGS EFIAPI SetEsalPhysicalEntryPoint ( IN UINT64 EntryPoint, IN UINT64 Gp - ) -; + ); SAL_RETURN_REGS EFIAPI GetEsalEntryPoint ( VOID - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHiiLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHiiLib.h index 47444e2044..76aab31165 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHiiLib.h +++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHiiLib.h @@ -47,8 +47,7 @@ GluePreparePackages ( IN UINTN NumberOfPackages, IN CONST EFI_GUID *Guid OPTIONAL, ... - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHobLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHobLib.h index 187c5dad4c..53aa7b0639 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHobLib.h +++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueHobLib.h @@ -43,8 +43,7 @@ VOID * EFIAPI GetHobList ( VOID - ) -; + ); /** Returns the next instance of a HOB type from the starting HOB. @@ -67,8 +66,7 @@ EFIAPI GetNextHob ( IN UINT16 Type, IN CONST VOID *HobStart - ) -; + ); /** Returns the first instance of a HOB type among the whole HOB list. @@ -85,8 +83,7 @@ VOID * EFIAPI GetFirstHob ( IN UINT16 Type - ) -; + ); /** This function searches the first instance of a HOB from the starting HOB pointer. @@ -112,8 +109,7 @@ EFIAPI GlueGetNextGuidHob ( IN CONST EFI_GUID *Guid, IN CONST VOID *HobStart - ) -; + ); /** This function searches the first instance of a HOB among the whole HOB list. @@ -133,8 +129,7 @@ VOID * EFIAPI GlueGetFirstGuidHob ( IN CONST EFI_GUID *Guid - ) -; + ); /** Get the Boot Mode from the HOB list. @@ -151,8 +146,7 @@ EFI_BOOT_MODE EFIAPI GetBootModeHob ( VOID - ) -; + ); /** Builds a HOB for a loaded PE32 module. @@ -176,8 +170,7 @@ GlueBuildModuleHob ( IN EFI_PHYSICAL_ADDRESS MemoryAllocationModule, IN UINT64 ModuleLength, IN EFI_PHYSICAL_ADDRESS EntryPoint - ) -; + ); /** Builds a HOB that describes a chunk of system memory. @@ -200,8 +193,7 @@ BuildResourceDescriptorHob ( IN EFI_RESOURCE_ATTRIBUTE_TYPE ResourceAttribute, IN EFI_PHYSICAL_ADDRESS PhysicalStart, IN UINT64 NumberOfBytes - ) -; + ); /** Builds a GUID HOB with a certain data length. @@ -226,8 +218,7 @@ EFIAPI BuildGuidHob ( IN CONST EFI_GUID *Guid, IN UINTN DataLength - ) -; + ); /** Copies a data buffer to a newly-built HOB. @@ -255,8 +246,7 @@ BuildGuidDataHob ( IN CONST EFI_GUID *Guid, IN VOID *Data, IN UINTN DataLength - ) -; + ); /** Builds a Firmware Volume HOB. @@ -275,8 +265,7 @@ EFIAPI BuildFvHob ( IN EFI_PHYSICAL_ADDRESS BaseAddress, IN UINT64 Length - ) -; + ); /** Builds a Capsule Volume HOB. @@ -295,8 +284,7 @@ EFIAPI BuildCvHob ( IN EFI_PHYSICAL_ADDRESS BaseAddress, IN UINT64 Length - ) -; + ); /** Builds a HOB for the CPU. @@ -315,8 +303,7 @@ EFIAPI BuildCpuHob ( IN UINT8 SizeOfMemorySpace, IN UINT8 SizeOfIoSpace - ) -; + ); /** Builds a HOB for the Stack. @@ -335,8 +322,7 @@ EFIAPI BuildStackHob ( IN EFI_PHYSICAL_ADDRESS BaseAddress, IN UINT64 Length - ) -; + ); /** Builds a HOB for the BSP store. @@ -357,8 +343,7 @@ BuildBspStoreHob ( IN EFI_PHYSICAL_ADDRESS BaseAddress, IN UINT64 Length, IN EFI_MEMORY_TYPE MemoryType - ) -; + ); /** Builds a HOB for the memory allocation. @@ -379,7 +364,6 @@ GlueBuildMemoryAllocationHob ( IN EFI_PHYSICAL_ADDRESS BaseAddress, IN UINT64 Length, IN EFI_MEMORY_TYPE MemoryType - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGluePeCoffLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGluePeCoffLib.h index 4ac6659462..10f0e0f022 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGluePeCoffLib.h +++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGluePeCoffLib.h @@ -114,8 +114,7 @@ RETURN_STATUS EFIAPI GluePeCoffLoaderGetImageInfo ( IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext - ) -; + ); /** Applies relocation fixups to a PE/COFF image that was loaded with PeCoffLoaderLoadImage(). @@ -141,8 +140,7 @@ RETURN_STATUS EFIAPI GluePeCoffLoaderRelocateImage ( IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext - ) -; + ); /** Loads a PE/COFF image into memory. @@ -171,8 +169,7 @@ RETURN_STATUS EFIAPI GluePeCoffLoaderLoadImage ( IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext - ) -; + ); /** @@ -194,8 +191,7 @@ PeCoffLoaderImageReadFromMemory ( IN UINTN FileOffset, IN OUT UINTN *ReadSize, OUT VOID *Buffer - ) -; + ); /** @@ -219,8 +215,7 @@ PeCoffLoaderRelocateImageForRuntime ( IN PHYSICAL_ADDRESS VirtImageBase, IN UINTN ImageSize, IN VOID *RelocationData - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueResourcePublicationLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueResourcePublicationLib.h index f2ea2fd9fe..45c0aa24a2 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueResourcePublicationLib.h +++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueResourcePublicationLib.h @@ -44,7 +44,6 @@ EFIAPI PublishSystemMemory ( IN PHYSICAL_ADDRESS MemoryBegin, IN UINT64 MemoryLength - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueSmbusLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueSmbusLib.h index 3ae42e60a4..6a54afc138 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueSmbusLib.h +++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueSmbusLib.h @@ -71,8 +71,7 @@ EFIAPI SmBusQuickRead ( IN UINTN SmBusAddress, OUT RETURN_STATUS *Status OPTIONAL - ) -; + ); /** Executes an SMBUS quick write command. @@ -96,8 +95,7 @@ EFIAPI SmBusQuickWrite ( IN UINTN SmBusAddress, OUT RETURN_STATUS *Status OPTIONAL - ) -; + ); /** Executes an SMBUS receive byte command. @@ -123,8 +121,7 @@ EFIAPI SmBusReceiveByte ( IN UINTN SmBusAddress, OUT RETURN_STATUS *Status OPTIONAL - ) -; + ); /** Executes an SMBUS send byte command. @@ -152,8 +149,7 @@ SmBusSendByte ( IN UINTN SmBusAddress, IN UINT8 Value, OUT RETURN_STATUS *Status OPTIONAL - ) -; + ); /** Executes an SMBUS read data byte command. @@ -178,8 +174,7 @@ EFIAPI SmBusReadDataByte ( IN UINTN SmBusAddress, OUT RETURN_STATUS *Status OPTIONAL - ) -; + ); /** Executes an SMBUS write data byte command. @@ -207,8 +202,7 @@ SmBusWriteDataByte ( IN UINTN SmBusAddress, IN UINT8 Value, OUT RETURN_STATUS *Status OPTIONAL - ) -; + ); /** Executes an SMBUS read data word command. @@ -233,8 +227,7 @@ EFIAPI SmBusReadDataWord ( IN UINTN SmBusAddress, OUT RETURN_STATUS *Status OPTIONAL - ) -; + ); /** Executes an SMBUS write data word command. @@ -262,8 +255,7 @@ SmBusWriteDataWord ( IN UINTN SmBusAddress, IN UINT16 Value, OUT RETURN_STATUS *Status OPTIONAL - ) -; + ); /** Executes an SMBUS process call command. @@ -291,8 +283,7 @@ SmBusProcessCall ( IN UINTN SmBusAddress, IN UINT16 Value, OUT RETURN_STATUS *Status OPTIONAL - ) -; + ); /** Executes an SMBUS read block command. @@ -323,8 +314,7 @@ SmBusReadBlock ( IN UINTN SmBusAddress, OUT VOID *Buffer, OUT RETURN_STATUS *Status OPTIONAL - ) -; + ); /** Executes an SMBUS write block command. @@ -353,8 +343,7 @@ SmBusWriteBlock ( IN UINTN SmBusAddress, OUT VOID *Buffer, OUT RETURN_STATUS *Status OPTIONAL - ) -; + ); /** Executes an SMBUS block process call command. @@ -387,8 +376,7 @@ SmBusBlockProcessCall ( IN VOID *WriteBuffer, OUT VOID *ReadBuffer, OUT RETURN_STATUS *Status OPTIONAL - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/MemoryStatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/MemoryStatusCodeLib.h index b2ed83b1aa..e954cf8cca 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/MemoryStatusCodeLib.h +++ b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/MemoryStatusCodeLib.h @@ -40,8 +40,7 @@ VOID MemoryInitializeStatusCode ( IN EFI_FFS_FILE_HEADER *FfsHeader, IN EFI_PEI_SERVICES **PeiServices - ) -; + ); // // Status code reporting function @@ -54,7 +53,6 @@ MemoryReportStatusCode ( IN UINT32 Instance, IN EFI_GUID * CallerId, IN EFI_STATUS_CODE_DATA * Data OPTIONAL - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/SimpleCpuIoLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/SimpleCpuIoLib.h index ca666def6a..4172ddabf9 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/SimpleCpuIoLib.h +++ b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/Include/SimpleCpuIoLib.h @@ -28,66 +28,56 @@ Abstract: UINT8 IoRead8 ( IN UINT64 Address - ) -; + ); UINT16 IoRead16 ( IN UINT64 Address - ) -; + ); UINT32 IoRead32 ( IN UINT64 Address - ) -; + ); VOID IoWrite8 ( IN UINT64 Address, IN UINT8 Data - ) -; + ); VOID IoWrite16 ( IN UINT64 Address, IN UINT16 Data - ) -; + ); VOID IoWrite32 ( IN UINT64 Address, IN UINT32 Data - ) -; + ); UINT32 MemRead32 ( IN UINT64 Address - ) -; + ); UINT64 MemRead64 ( IN UINT64 Address - ) -; + ); VOID MemWrite32 ( IN UINT64 Address, IN UINT32 Data - ) -; + ); VOID MemWrite64 ( IN UINT64 Address, IN UINT64 Data - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.h b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.h index b6660b0452..cdba078541 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.h +++ b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Library/Pei/MemoryStatusCode/MemoryStatusCode.h @@ -97,7 +97,6 @@ LoadImageCallback ( IN EFI_PEI_SERVICES **PeiServices, IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor, IN VOID *Ppi - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Pei/MonoStatusCode.h b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Pei/MonoStatusCode.h index 7ff3140fa6..f8cc2fb0bd 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Pei/MonoStatusCode.h +++ b/EdkCompatibilityPkg/Sample/Platform/Generic/MonoStatusCode/Pei/MonoStatusCode.h @@ -67,8 +67,7 @@ EFIAPI InstallMonoStatusCode ( IN EFI_FFS_FILE_HEADER *FfsHeader, IN EFI_PEI_SERVICES **PeiServices - ) -; + ); // // This is the platform function to initialize the listeners desired by the @@ -78,8 +77,7 @@ VOID PlatformInitializeStatusCode ( IN EFI_FFS_FILE_HEADER *FfsHeader, IN EFI_PEI_SERVICES **PeiServices - ) -; + ); // // This is the platform function that calls all of the listeners desired by the @@ -94,8 +92,7 @@ PlatformReportStatusCode ( IN UINT32 Instance, IN EFI_GUID * CallerId, IN EFI_STATUS_CODE_DATA * Data OPTIONAL - ) -; + ); // // Platform independent function Declarations @@ -108,8 +105,7 @@ EFIAPI InitializeMonoStatusCode ( IN EFI_FFS_FILE_HEADER *FfsHeader, IN EFI_PEI_SERVICES **PeiServices - ) -; + ); // // Convert a DXE status code call into a PEI status code call. @@ -122,8 +118,7 @@ TranslateDxeStatusCodeToPeiStatusCode ( IN UINT32 Instance, IN EFI_GUID * CallerId, IN EFI_STATUS_CODE_DATA * Data OPTIONAL - ) -; + ); // // Publish a HOB that contains the listener to be used by DXE. @@ -132,7 +127,6 @@ EFI_STATUS EFIAPI InitializeDxeReportStatusCode ( IN EFI_PEI_SERVICES **PeiServices - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.h index 63165471b1..fabb9a2060 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.h +++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/BsSerialStatusCode/BsSerialStatusCode.h @@ -78,13 +78,11 @@ extern UINT8 gBreakSet; VOID DebugSerialPrint ( IN UINT8 *OutputString - ) -; + ); VOID DebugSerialWrite ( IN UINT8 Character - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsDataHubStatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsDataHubStatusCodeLib.h index c15ac01e51..181617d39b 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsDataHubStatusCodeLib.h +++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsDataHubStatusCodeLib.h @@ -35,8 +35,7 @@ EFIAPI BsDataHubInitializeStatusCode ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable - ) -; + ); // // Status code reporting function @@ -49,7 +48,6 @@ BsDataHubReportStatusCode ( IN UINT32 Instance, IN EFI_GUID * CallerId, IN EFI_STATUS_CODE_DATA * Data OPTIONAL - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsSerialStatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsSerialStatusCodeLib.h index 761f0da27d..c0b7a72899 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsSerialStatusCodeLib.h +++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/BsSerialStatusCodeLib.h @@ -35,8 +35,7 @@ EFIAPI BsSerialInitializeStatusCode ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable - ) -; + ); // // Status code reporting function @@ -49,7 +48,6 @@ BsSerialReportStatusCode ( IN UINT32 Instance, IN EFI_GUID * CallerId, IN EFI_STATUS_CODE_DATA * Data OPTIONAL - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtLedStatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtLedStatusCodeLib.h index 378d5dce8c..6a9ec87c9b 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtLedStatusCodeLib.h +++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtLedStatusCodeLib.h @@ -31,8 +31,7 @@ VOID RtLedInitializeStatusCode ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable - ) -; + ); // // Status code reporting function @@ -44,6 +43,5 @@ RtLedReportStatusCode ( IN UINT32 Instance, IN EFI_GUID * CallerId, IN EFI_STATUS_CODE_DATA * Data OPTIONAL - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtMemoryStatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtMemoryStatusCodeLib.h index 24a74f3357..1937791051 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtMemoryStatusCodeLib.h +++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtMemoryStatusCodeLib.h @@ -35,8 +35,7 @@ EFIAPI RtMemoryInitializeStatusCode ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable - ) -; + ); // // Status code reporting function @@ -49,8 +48,7 @@ RtMemoryReportStatusCode ( IN UINT32 Instance, IN EFI_GUID * CallerId, IN EFI_STATUS_CODE_DATA * Data OPTIONAL - ) -; + ); // // Playback all prior status codes to a listener @@ -69,7 +67,6 @@ VOID EFIAPI PlaybackStatusCodes ( IN PLATFORM_REPORT_STATUS_CODE ReportStatusCode - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPlatformStatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPlatformStatusCodeLib.h index 22f02b763a..6c94d83e81 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPlatformStatusCodeLib.h +++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPlatformStatusCodeLib.h @@ -36,8 +36,7 @@ EFIAPI RtPlatformInitializeStatusCode ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable - ) -; + ); // // Status code reporting function @@ -50,7 +49,6 @@ RtPlatformReportStatusCode ( IN UINT32 Instance, IN EFI_GUID * CallerId, IN EFI_STATUS_CODE_DATA * Data OPTIONAL - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPort80StatusCodeLib.h b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPort80StatusCodeLib.h index 854de9b443..978939c615 100644 --- a/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPort80StatusCodeLib.h +++ b/EdkCompatibilityPkg/Sample/Platform/Generic/RuntimeDxe/StatusCode/Lib/Include/RtPort80StatusCodeLib.h @@ -38,7 +38,6 @@ RtPort80ReportStatusCode ( IN UINT32 Instance, IN EFI_GUID * CallerId, IN EFI_STATUS_CODE_DATA * Data OPTIONAL - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.h index f36856e5fb..44bc53e91c 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/CommonLib.h @@ -32,80 +32,69 @@ VOID PeiZeroMem ( IN VOID *Buffer, IN UINTN Size - ) -; + ); VOID PeiCopyMem ( IN VOID *Destination, IN VOID *Source, IN UINTN Length - ) -; + ); VOID ZeroMem ( IN VOID *Buffer, IN UINTN Size - ) -; + ); VOID CopyMem ( IN VOID *Destination, IN VOID *Source, IN UINTN Length - ) -; + ); INTN CompareGuid ( IN EFI_GUID *Guid1, IN EFI_GUID *Guid2 - ) -; + ); EFI_STATUS GetFileImage ( IN CHAR8 *InputFileName, OUT CHAR8 **InputFileImage, OUT UINT32 *BytesRead - ) -; + ); UINT8 CalculateChecksum8 ( IN UINT8 *Buffer, IN UINTN Size - ) -; + ); UINT8 CalculateSum8 ( IN UINT8 *Buffer, IN UINTN Size - ) -; + ); UINT16 CalculateChecksum16 ( IN UINT16 *Buffer, IN UINTN Size - ) -; + ); UINT16 CalculateSum16 ( IN UINT16 *Buffer, IN UINTN Size - ) -; + ); EFI_STATUS PrintGuid ( IN EFI_GUID *Guid - ) -; + ); #define PRINTED_GUID_BUFFER_SIZE 37 // including null-termination EFI_STATUS @@ -114,7 +103,6 @@ PrintGuidToBuffer ( IN OUT UINT8 *Buffer, IN UINT32 BufferLen, IN BOOLEAN Uppercase - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Compress.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Compress.h index 43535936a6..f0e0ecb6cf 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Compress.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Compress.h @@ -36,8 +36,7 @@ TianoCompress ( IN UINT32 SrcSize, IN UINT8 *DstBuffer, IN OUT UINT32 *DstSize - ) -; + ); /*++ @@ -52,8 +51,7 @@ EfiCompress ( IN UINT32 SrcSize, IN UINT8 *DstBuffer, IN OUT UINT32 *DstSize - ) -; + ); /*++ diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.h index 170711a677..c2d062d256 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/Crc32.h @@ -26,8 +26,7 @@ CalculateCrc32 ( IN UINT8 *Data, IN UINTN DataSize, IN OUT UINT32 *CrcOut - ) -; + ); /*++ diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCustomizedCompress.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCustomizedCompress.h index d1fa22066e..2a7b8d1569 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCustomizedCompress.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiCustomizedCompress.h @@ -24,8 +24,7 @@ Abstract: EFI_STATUS SetCustomizedCompressionType ( IN CHAR8 *Type - ) -; + ); /*++ @@ -49,8 +48,7 @@ CustomizedGetInfo ( IN UINT32 SrcSize, OUT UINT32 *DstSize, OUT UINT32 *ScratchSize - ) -; + ); /*++ @@ -79,8 +77,7 @@ CustomizedDecompress ( IN UINT32 DstSize, IN OUT VOID *Scratch, IN UINT32 ScratchSize - ) -; + ); /*++ @@ -110,8 +107,7 @@ CustomizedCompress ( IN UINT32 SrcSize, IN UINT8 *DstBuffer, IN OUT UINT32 *DstSize - ) -; + ); /*++ diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.h index 2da1fe58f6..65b1c7f9c2 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/EfiUtilityMsgs.h @@ -53,8 +53,7 @@ GetUtilityStatus ( void SetUtilityName ( INT8 *ProgramName - ) -; + ); void Error ( @@ -64,8 +63,7 @@ Error ( INT8 *OffendingText, INT8 *MsgFmt, ... - ) -; + ); void Warning ( @@ -75,8 +73,7 @@ Warning ( INT8 *OffendingText, INT8 *MsgFmt, ... - ) -; + ); void DebugMsg ( @@ -86,21 +83,18 @@ DebugMsg ( INT8 *OffendingText, INT8 *MsgFmt, ... - ) -; + ); void SetDebugMsgMask ( UINT32 MsgMask - ) -; + ); void ParserSetPosition ( INT8 *SourceFileName, UINT32 LineNum - ) -; + ); void ParserError ( @@ -108,8 +102,7 @@ ParserError ( INT8 *OffendingText, INT8 *MsgFmt, ... - ) -; + ); void ParserWarning ( @@ -117,16 +110,14 @@ ParserWarning ( INT8 *OffendingText, INT8 *MsgFmt, ... - ) -; + ); void SetPrintLimits ( UINT32 NumErrors, UINT32 NumWarnings, UINT32 NumWarningsPlusErrors - ) -; + ); #ifdef __cplusplus } diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.h index 4b7ef0a332..88c40cdbcb 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/FvLib.h @@ -34,37 +34,32 @@ EFI_STATUS InitializeFvLib ( IN VOID *Fv, IN UINT32 FvLength - ) -; + ); EFI_STATUS GetFvHeader ( OUT EFI_FIRMWARE_VOLUME_HEADER **FvHeader, OUT UINT32 *FvLength - ) -; + ); EFI_STATUS GetNextFile ( IN EFI_FFS_FILE_HEADER *CurrentFile, OUT EFI_FFS_FILE_HEADER **NextFile - ) -; + ); EFI_STATUS GetFileByName ( IN EFI_GUID *FileName, OUT EFI_FFS_FILE_HEADER **File - ) -; + ); EFI_STATUS GetFileByType ( IN EFI_FV_FILETYPE FileType, IN UINTN Instance, OUT EFI_FFS_FILE_HEADER **File - ) -; + ); EFI_STATUS GetSectionByType ( @@ -72,22 +67,19 @@ GetSectionByType ( IN EFI_SECTION_TYPE SectionType, IN UINTN Instance, OUT EFI_FILE_SECTION_POINTER *Section - ) -; + ); // // will not parse compressed sections // EFI_STATUS VerifyFv ( IN EFI_FIRMWARE_VOLUME_HEADER *FvHeader - ) -; + ); EFI_STATUS VerifyFfsFile ( IN EFI_FFS_FILE_HEADER *FfsHeader - ) -; + ); /*++ @@ -109,8 +101,7 @@ Returns: UINT32 GetLength ( UINT8 *ThreeByteLength - ) -; + ); /*++ @@ -130,8 +121,7 @@ Returns: EFI_STATUS GetErasePolarity ( OUT BOOLEAN *ErasePolarity - ) -; + ); /*++ @@ -154,8 +144,7 @@ UINT8 GetFileState ( IN BOOLEAN ErasePolarity, IN EFI_FFS_FILE_HEADER *FfsHeader - ) -; + ); /*++ diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.h index 2d195c2561..5cfb4e0cab 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/MyAlloc.h @@ -89,8 +89,7 @@ MyCheck ( BOOLEAN Final, UINT8 File[], UINTN Line - ) -; + ); // // *++ // Description: @@ -121,8 +120,7 @@ MyAlloc ( UINTN Size, UINT8 File[], UINTN Line - ) -; + ); // // *++ // Description: @@ -153,8 +151,7 @@ MyRealloc ( UINTN Size, UINT8 File[], UINTN Line - ) -; + ); // // *++ // Description: @@ -185,8 +182,7 @@ MyFree ( VOID *Ptr, UINT8 File[], UINTN Line - ) -; + ); // // *++ // Description: diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.h index 0b4fec7a1f..32b94bc69f 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/ParseInf.h @@ -43,8 +43,7 @@ ReadLine ( IN MEMORY_FILE *InputFile, IN OUT CHAR8 *InputBuffer, IN UINT32 MaxLength - ) -; + ); /*++ @@ -73,8 +72,7 @@ BOOLEAN FindSection ( IN MEMORY_FILE *InputFile, IN CHAR8 *Section - ) -; + ); /*++ @@ -101,8 +99,7 @@ FindToken ( IN CHAR8 *Token, IN UINTN Instance, OUT CHAR8 *Value - ) -; + ); /*++ @@ -131,8 +128,7 @@ EFI_STATUS StringToGuid ( IN CHAR8 *AsciiGuidBuffer, OUT EFI_GUID *GuidBuffer - ) -; + ); /*++ @@ -157,8 +153,7 @@ AsciiStringToUint64 ( IN CONST CHAR8 *AsciiString, IN BOOLEAN IsHex, OUT UINT64 *ReturnValue - ) -; + ); /*++ @@ -185,8 +180,7 @@ CHAR8 * ReadLineInStream ( IN FILE *InputFile, IN OUT CHAR8 *InputBuffer - ) -; + ); /*++ @@ -209,8 +203,7 @@ BOOLEAN FindSectionInStream ( IN FILE *InputFile, IN CHAR8 *Section - ) -; + ); /*++ diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.h b/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.h index ee59a6d8d4..67e4fdf37b 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/Common/SimpleFileParsing.h @@ -27,40 +27,34 @@ Abstract: STATUS SFPInit ( VOID - ) -; + ); STATUS SFPOpenFile ( char *FileName - ) -; + ); BOOLEAN SFPIsKeyword ( T_CHAR *Str - ) -; + ); BOOLEAN SFPIsToken ( T_CHAR *Str - ) -; + ); BOOLEAN SFPGetNextToken ( T_CHAR *Str, unsigned int Len - ) -; + ); BOOLEAN SFPGetGuidToken ( T_CHAR *Str, UINT32 Len - ) -; + ); #define PARSE_GUID_STYLE_5_FIELDS 0 @@ -68,51 +62,43 @@ BOOLEAN SFPGetGuid ( int GuidStyle, EFI_GUID *Value - ) -; + ); BOOLEAN SFPSkipToToken ( T_CHAR *Str - ) -; + ); BOOLEAN SFPGetNumber ( unsigned int *Value - ) -; + ); BOOLEAN SFPGetQuotedString ( T_CHAR *Str, int Length - ) -; + ); BOOLEAN SFPIsEOF ( VOID - ) -; + ); STATUS SFPCloseFile ( VOID - ) -; + ); unsigned int SFPGetLineNumber ( VOID - ) -; + ); T_CHAR * SFPGetFileName ( VOID - ) -; + ); #endif // #ifndef _SIMPLE_FILE_PARSING_H_ diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.h b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.h index d275ffbc3a..2670ed5cce 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLib.h @@ -62,8 +62,7 @@ GenerateFvImage ( OUT UINT8 **SymImage, OUT UINTN *SymImageSize, OUT CHAR8 **SymFileName - ) -; + ); /*++ @@ -94,8 +93,7 @@ EFI_STATUS UpdatePeiCoreEntryInFit ( IN FIT_TABLE *FitTablePtr, IN UINT64 PeiCorePhysicalAddress - ) -; + ); /*++ @@ -118,8 +116,7 @@ Returns: VOID UpdateFitCheckSum ( IN FIT_TABLE *FitTablePtr - ) -; + ); /*++ diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLibInternal.h b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLibInternal.h index 505188b495..5bc541ca88 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLibInternal.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/GenFvImage/GenFvImageLibInternal.h @@ -206,7 +206,6 @@ EFI_STATUS ParseFvInf ( IN MEMORY_FILE *InfFile, IN FV_INFO *FvInfo - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/CommonUtils.h b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/CommonUtils.h index f7a331e5d7..648f20f252 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/CommonUtils.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/CommonUtils.h @@ -51,7 +51,6 @@ typedef struct _STRING_LIST { int CreateGuidList ( INT8 *OutFileName - ) -; + ); #endif // #ifndef _COMMON_UTILS_H_ diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.h b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.h index bc40265366..81fd8672d3 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/FileSearch.h @@ -64,45 +64,38 @@ typedef struct { STATUS FileSearchInit ( FILE_SEARCH_DATA *FSData - ) -; + ); STATUS FileSearchDestroy ( FILE_SEARCH_DATA *FSData - ) -; + ); STATUS FileSearchStart ( FILE_SEARCH_DATA *FSData, char *FileMask, UINT32 SearchFlags - ) -; + ); STATUS FileSearchFindNext ( FILE_SEARCH_DATA *FSData - ) -; + ); STATUS FileSearchExcludeDirs ( FILE_SEARCH_DATA *FSData, STRING_LIST *StrList - ) -; + ); STATUS FileSearchExcludeExtensions ( FILE_SEARCH_DATA *FSData, STRING_LIST *StrList - ) -; + ); STATUS FileSearchExcludeFiles ( FILE_SEARCH_DATA *FSData, STRING_LIST *StrList - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.h b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.h index 5f6c7010b4..f808ab03a9 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/GuidChk/UtilsMsgs.h @@ -25,8 +25,7 @@ Abstract: STATUS GetUtilityStatus ( VOID - ) -; + ); // // If someone prints an error message and didn't specify a source file name, @@ -36,8 +35,7 @@ GetUtilityStatus ( VOID SetUtilityName ( INT8 *ProgramName - ) -; + ); void Error ( @@ -47,8 +45,7 @@ Error ( INT8 *OffendingText, INT8 *MsgFmt, ... - ) -; + ); void Warning ( @@ -58,8 +55,7 @@ Warning ( INT8 *OffendingText, INT8 *MsgFmt, ... - ) -; + ); void DebugMsg ( @@ -69,21 +65,18 @@ DebugMsg ( INT8 *OffendingText, INT8 *MsgFmt, ... - ) -; + ); void SetDebugMsgMask ( UINT32 MsgMask - ) -; + ); void ParserSetPosition ( INT8 *SourceFileName, UINT32 LineNum - ) -; + ); void ParserError ( @@ -91,8 +84,7 @@ ParserError ( INT8 *OffendingText, INT8 *MsgFmt, ... - ) -; + ); void ParserWarning ( @@ -100,7 +92,6 @@ ParserWarning ( INT8 *OffendingText, INT8 *MsgFmt, ... - ) -; + ); #endif diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.h b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.h index 4dcad547ec..0ed7128d88 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/DscFile.h @@ -70,40 +70,33 @@ int DSCFileSetFile ( DSC_FILE *DSC, char *FileName - ) -; + ); SECTION * DSCFileFindSection ( DSC_FILE *DSC, char *Name - ) -; + ); int DSCFileSavePosition ( DSC_FILE *DSC - ) -; + ); int DSCFileRestorePosition ( DSC_FILE *DSC - ) -; + ); char * DSCFileGetLine ( DSC_FILE *DSC, char *Line, int LineLen - ) -; + ); int DSCFileInit ( DSC_FILE *DSC - ) -; + ); int DSCFileDestroy ( DSC_FILE *DSC - ) -; + ); #endif // ifndef _DSC_FILE_H_ diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.h b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.h index 1425d4387a..625d1e13e4 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/Exceptions.h @@ -31,27 +31,22 @@ Abstract: int InitExceptions ( VOID - ) -; + ); int TryException ( VOID - ) -; + ); char * CatchException ( VOID - ) -; + ); int ExceptionThrown ( VOID - ) -; + ); int ThrowException ( char *EMsg - ) -; + ); #endif // ifndef _EXCEPTIONS_H_ diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.h b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.h index 4a7af36e73..f42f97777e 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/ProcessDsc/FWVolume.h @@ -31,13 +31,11 @@ Abstract: void CFVConstructor ( VOID - ) -; + ); void CFVDestructor ( VOID - ) -; + ); int CFVAddFVFile ( @@ -50,27 +48,23 @@ CFVAddFVFile ( char *Apriori, char *BaseName, char *Guid - ) -; + ); int CFVSetXRefFileName ( char *FileName - ) -; + ); int CFVWriteInfFiles ( DSC_FILE *DSC, FILE *MakeFptr - ) -; + ); int NonFFSFVWriteInfFiles ( DSC_FILE *DSC, char *FileName - ) -; + ); #endif // ifndef _FW_VOLUME_H_ diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.h b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.h index 4dc05a3642..66494c8eee 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/StrGather/StringDB.h @@ -28,13 +28,11 @@ Abstract: void StringDBConstructor ( void - ) -; + ); void StringDBDestructor ( void - ) -; + ); STATUS StringDBAddString ( @@ -44,14 +42,12 @@ StringDBAddString ( WCHAR *String, BOOLEAN Format, UINT16 Flags - ) -; + ); STATUS StringDBSetScope ( WCHAR *Scope - ) -; + ); #define STRING_FLAGS_REFERENCED 0x0001 // if referenced somewhere #define STRING_FLAGS_UNDEFINED 0x0002 // if we added it for padding purposes @@ -65,38 +61,33 @@ StringDBAddStringIdentifier ( WCHAR *StringIdentifier, UINT16 *NewId, UINT16 Flags - ) -; + ); STATUS StringDBReadDatabase ( INT8 *DBFileName, BOOLEAN IgnoreIfNotExist, BOOLEAN Verbose - ) -; + ); STATUS StringDBWriteDatabase ( INT8 *DBFileName, BOOLEAN Verbose - ) -; + ); STATUS StringDBDumpDatabase ( INT8 *DBFileName, INT8 *OutputFileName, BOOLEAN Verbose - ) -; + ); STATUS StringDBAddLanguage ( WCHAR *LanguageName, WCHAR *PrintableLanguageName - ) -; + ); STATUS StringDBDumpCStrings ( @@ -104,33 +95,28 @@ StringDBDumpCStrings ( INT8 *BaseName, WCHAR_STRING_LIST *LanguagesOfInterest, WCHAR_MATCHING_STRING_LIST *IndirectionList - ) -; + ); STATUS StringDBDumpStringDefines ( INT8 *FileName, INT8 *BaseName - ) -; + ); STATUS StringDBSetCurrentLanguage ( WCHAR *LanguageName - ) -; + ); STATUS StringDBSetStringReferenced ( INT8 *StringIdentifierName, BOOLEAN IgnoreNotFound - ) -; + ); void StringDBFormatString ( WCHAR *String - ) -; + ); #endif // #ifndef _STRING_DB_H_ diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.h b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.h index 6b485c7c9e..3a5ad387bf 100644 --- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.h +++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.h @@ -134,13 +134,11 @@ typedef struct _SPkgBlkBuffer { void StringDBConstructor ( void - ) -; + ); void StringDBDestructor ( void - ) -; + ); STATUS StringDBAddString ( @@ -150,14 +148,12 @@ StringDBAddString ( WCHAR *String, BOOLEAN Format, UINT16 Flags - ) -; + ); STATUS StringDBSetScope ( WCHAR *Scope - ) -; + ); #define STRING_FLAGS_REFERENCED 0x0001 // if referenced somewhere #define STRING_FLAGS_UNDEFINED 0x0002 // if we added it for padding purposes @@ -171,84 +167,72 @@ StringDBAddStringIdentifier ( WCHAR *StringIdentifier, UINT16 *NewId, UINT16 Flags - ) -; + ); STATUS StringDBReadDatabase ( INT8 *DBFileName, BOOLEAN IgnoreIfNotExist, BOOLEAN Verbose - ) -; + ); STATUS StringDBWriteDatabase ( INT8 *DBFileName, BOOLEAN Verbose - ) -; + ); STATUS StringDBDumpDatabase ( INT8 *DBFileName, INT8 *OutputFileName, BOOLEAN Verbose - ) -; + ); STATUS StringDBAddLanguage ( WCHAR *LanguageName, WCHAR *PrintableLanguageName, WCHAR *SecondaryLanguageList - ) -; + ); STATUS StringDBAddSecondaryLanguage ( WCHAR *LanguageName, WCHAR *SecondaryLanguageList - ) -; + ); STATUS StringDBDumpCStrings ( INT8 *BaseName, INT8 *FileName - ) -; + ); STATUS StringDBDumpStringDefines ( INT8 *FileName, INT8 *BaseName - ) -; + ); STATUS StringDBSetCurrentLanguage ( WCHAR *LanguageName - ) -; + ); STATUS StringDBSetStringReferenced ( INT8 *StringIdentifierName, BOOLEAN IgnoreNotFound - ) -; + ); void StringDBFormatString ( WCHAR *String - ) -; + ); LANGUAGE_LIST * StringDBFindLanguageList ( WCHAR *LanguageName - ) -; + ); #endif // #ifndef _STRING_DB_H_ -- 2.39.2