From c69fc80c8040d783e54e8707eaf375625706ad59 Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Thu, 2 Dec 2021 18:00:42 -0800 Subject: EmulatorPkg: Change OPTIONAL keyword usage style REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3760 Update all use of ', OPTIONAL' to ' OPTIONAL,' for function params. Cc: Andrew Fish Cc: Leif Lindholm Cc: Michael Kubacki Signed-off-by: Michael D Kinney Reviewed-by: Ray Ni --- EmulatorPkg/EmuGopDxe/GopScreen.c | 3 +-- EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c | 2 +- EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c | 2 +- EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c | 2 +- EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c | 5 ++--- EmulatorPkg/Unix/Host/Host.h | 4 ++-- EmulatorPkg/Unix/Host/Ia32/SwitchStack.c | 7 ++----- EmulatorPkg/Win/Host/WinHost.c | 2 +- 8 files changed, 11 insertions(+), 16 deletions(-) diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/GopScreen.c index cbbb0db07f..05fd236151 100644 --- a/EmulatorPkg/EmuGopDxe/GopScreen.c +++ b/EmulatorPkg/EmuGopDxe/GopScreen.c @@ -184,7 +184,7 @@ EFI_STATUS EFIAPI EmuGopBlt ( IN EFI_GRAPHICS_OUTPUT_PROTOCOL *This, - IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer, OPTIONAL + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, IN UINTN SourceX, IN UINTN SourceY, @@ -407,4 +407,3 @@ Returns: { EmuGopDestructor (Context); } - diff --git a/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c b/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c index ab0de143c4..513a5aaa7c 100644 --- a/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c +++ b/EmulatorPkg/Library/DxeCoreTimerLib/DxeCoreTimerLib.c @@ -105,7 +105,7 @@ GetPerformanceCounter ( UINT64 EFIAPI GetPerformanceCounterProperties ( - OUT UINT64 *StartValue, OPTIONAL + OUT UINT64 *StartValue OPTIONAL, OUT UINT64 *EndValue OPTIONAL ) { diff --git a/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c b/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c index 9c3e97e680..4244a5d65c 100644 --- a/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c +++ b/EmulatorPkg/Library/DxeTimerLib/DxeTimerLib.c @@ -155,7 +155,7 @@ GetPerformanceCounter ( UINT64 EFIAPI GetPerformanceCounterProperties ( - OUT UINT64 *StartValue, OPTIONAL + OUT UINT64 *StartValue OPTIONAL, OUT UINT64 *EndValue OPTIONAL ) { diff --git a/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c b/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c index 132abb2c04..c71b166853 100644 --- a/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c +++ b/EmulatorPkg/Library/PeiTimerLib/PeiTimerLib.c @@ -136,7 +136,7 @@ GetPerformanceCounter ( UINT64 EFIAPI GetPerformanceCounterProperties ( - OUT UINT64 *StartValue, OPTIONAL + OUT UINT64 *StartValue OPTIONAL, OUT UINT64 *EndValue OPTIONAL ) { diff --git a/EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c b/EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c index af85efcef3..c1d10d7f68 100644 --- a/EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c +++ b/EmulatorPkg/Library/SecPeiServicesLib/PeiServicesLib.c @@ -548,14 +548,13 @@ PeiServicesFfsGetVolumeInfo ( VOID EFIAPI PeiServicesInstallFvInfoPpi ( - IN CONST EFI_GUID *FvFormat, OPTIONAL + IN CONST EFI_GUID *FvFormat OPTIONAL, IN CONST VOID *FvInfo, IN UINT32 FvInfoSize, - IN CONST EFI_GUID *ParentFvName, OPTIONAL + IN CONST EFI_GUID *ParentFvName OPTIONAL, IN CONST EFI_GUID *ParentFileName OPTIONAL ) { ASSERT (FALSE); return; } - diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h index 9791cf8c37..a372ecaadb 100644 --- a/EmulatorPkg/Unix/Host/Host.h +++ b/EmulatorPkg/Unix/Host/Host.h @@ -300,8 +300,8 @@ SecPeCoffLoaderUnloadImageExtraAction ( VOID PeiSwitchStacks ( IN SWITCH_STACK_ENTRY_POINT EntryPoint, - IN VOID *Context1, OPTIONAL - IN VOID *Context2, OPTIONAL + IN VOID *Context1 OPTIONAL, + IN VOID *Context2 OPTIONAL, IN VOID *NewStack ); diff --git a/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c b/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c index d9f7470c06..0184de2894 100644 --- a/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c +++ b/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c @@ -34,8 +34,8 @@ VOID EFIAPI PeiSwitchStacks ( IN SWITCH_STACK_ENTRY_POINT EntryPoint, - IN VOID *Context1, OPTIONAL - IN VOID *Context2, OPTIONAL + IN VOID *Context1 OPTIONAL, + IN VOID *Context2 OPTIONAL, IN VOID *NewStack ) { @@ -63,6 +63,3 @@ PeiSwitchStacks ( // ASSERT (FALSE); } - - - diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c index 876cb8d4be..ffd1b9944d 100644 --- a/EmulatorPkg/Win/Host/WinHost.c +++ b/EmulatorPkg/Win/Host/WinHost.c @@ -247,7 +247,7 @@ EfiSystemMemoryRange ( EFI_STATUS WinNtOpenFile ( - IN CHAR16 *FileName, OPTIONAL + IN CHAR16 *FileName OPTIONAL, IN UINT32 MapSize, IN DWORD CreationDisposition, IN OUT VOID **BaseAddress, -- cgit v1.2.3