From 79d49e162ed753a4e233af0cce36f68e18a06c03 Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Thu, 2 Dec 2021 18:00:53 -0800 Subject: OvmfPkg: 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: Andrew Fish --- OvmfPkg/8259InterruptControllerDxe/8259.c | 14 ++++----- OvmfPkg/8259InterruptControllerDxe/8259.h | 14 ++++----- OvmfPkg/AcpiPlatformDxe/BootScript.c | 2 +- OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c | 3 +- OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c | 7 ++--- OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.h | 4 +-- OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c | 13 ++++---- OvmfPkg/Csm/Include/Protocol/LegacyBios.h | 10 +++---- OvmfPkg/Csm/Include/Protocol/LegacyBiosPlatform.h | 12 ++++---- OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h | 20 ++++++------- OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c | 35 +++++++++++----------- OvmfPkg/Include/Library/QemuFwCfgS3Lib.h | 4 +-- OvmfPkg/Include/Protocol/Legacy8259.h | 14 ++++----- OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c | 2 +- OvmfPkg/Library/LockBoxLib/LockBoxLib.c | 2 +- OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c | 2 +- OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c | 2 +- OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c | 2 +- .../DxeTcg2PhysicalPresenceLib.c | 2 +- OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c | 2 +- OvmfPkg/QemuRamfbDxe/QemuRamfb.c | 2 +- OvmfPkg/QemuVideoDxe/Gop.c | 4 +-- OvmfPkg/SmmControl2Dxe/SmiFeatures.c | 2 +- OvmfPkg/VirtioGpuDxe/Gop.c | 2 +- OvmfPkg/VirtioRngDxe/VirtioRng.c | 2 +- 25 files changed, 86 insertions(+), 92 deletions(-) diff --git a/OvmfPkg/8259InterruptControllerDxe/8259.c b/OvmfPkg/8259InterruptControllerDxe/8259.c index 1c2ac10..7d51ff2 100644 --- a/OvmfPkg/8259InterruptControllerDxe/8259.c +++ b/OvmfPkg/8259InterruptControllerDxe/8259.c @@ -230,9 +230,9 @@ EFI_STATUS EFIAPI Interrupt8259GetMask ( IN EFI_LEGACY_8259_PROTOCOL *This, - OUT UINT16 *LegacyMask, OPTIONAL - OUT UINT16 *LegacyEdgeLevel, OPTIONAL - OUT UINT16 *ProtectedMask, OPTIONAL + OUT UINT16 *LegacyMask OPTIONAL, + OUT UINT16 *LegacyEdgeLevel OPTIONAL, + OUT UINT16 *ProtectedMask OPTIONAL, OUT UINT16 *ProtectedEdgeLevel OPTIONAL ) { @@ -272,9 +272,9 @@ EFI_STATUS EFIAPI Interrupt8259SetMask ( IN EFI_LEGACY_8259_PROTOCOL *This, - IN UINT16 *LegacyMask, OPTIONAL - IN UINT16 *LegacyEdgeLevel, OPTIONAL - IN UINT16 *ProtectedMask, OPTIONAL + IN UINT16 *LegacyMask OPTIONAL, + IN UINT16 *LegacyEdgeLevel OPTIONAL, + IN UINT16 *ProtectedMask OPTIONAL, IN UINT16 *ProtectedEdgeLevel OPTIONAL ) { @@ -314,7 +314,7 @@ EFIAPI Interrupt8259SetMode ( IN EFI_LEGACY_8259_PROTOCOL *This, IN EFI_8259_MODE Mode, - IN UINT16 *Mask, OPTIONAL + IN UINT16 *Mask OPTIONAL, IN UINT16 *EdgeLevel OPTIONAL ) { diff --git a/OvmfPkg/8259InterruptControllerDxe/8259.h b/OvmfPkg/8259InterruptControllerDxe/8259.h index a9673f9..aac82e9 100644 --- a/OvmfPkg/8259InterruptControllerDxe/8259.h +++ b/OvmfPkg/8259InterruptControllerDxe/8259.h @@ -75,9 +75,9 @@ EFI_STATUS EFIAPI Interrupt8259GetMask ( IN EFI_LEGACY_8259_PROTOCOL *This, - OUT UINT16 *LegacyMask, OPTIONAL - OUT UINT16 *LegacyEdgeLevel, OPTIONAL - OUT UINT16 *ProtectedMask, OPTIONAL + OUT UINT16 *LegacyMask OPTIONAL, + OUT UINT16 *LegacyEdgeLevel OPTIONAL, + OUT UINT16 *ProtectedMask OPTIONAL, OUT UINT16 *ProtectedEdgeLevel OPTIONAL ); @@ -98,9 +98,9 @@ EFI_STATUS EFIAPI Interrupt8259SetMask ( IN EFI_LEGACY_8259_PROTOCOL *This, - IN UINT16 *LegacyMask, OPTIONAL - IN UINT16 *LegacyEdgeLevel, OPTIONAL - IN UINT16 *ProtectedMask, OPTIONAL + IN UINT16 *LegacyMask OPTIONAL, + IN UINT16 *LegacyEdgeLevel OPTIONAL, + IN UINT16 *ProtectedMask OPTIONAL, IN UINT16 *ProtectedEdgeLevel OPTIONAL ); @@ -121,7 +121,7 @@ EFIAPI Interrupt8259SetMode ( IN EFI_LEGACY_8259_PROTOCOL *This, IN EFI_8259_MODE Mode, - IN UINT16 *Mask, OPTIONAL + IN UINT16 *Mask OPTIONAL, IN UINT16 *EdgeLevel OPTIONAL ); diff --git a/OvmfPkg/AcpiPlatformDxe/BootScript.c b/OvmfPkg/AcpiPlatformDxe/BootScript.c index f2d1089..efcf2e3 100644 --- a/OvmfPkg/AcpiPlatformDxe/BootScript.c +++ b/OvmfPkg/AcpiPlatformDxe/BootScript.c @@ -190,7 +190,7 @@ STATIC VOID EFIAPI AppendFwCfgBootScript ( - IN OUT VOID *Context, OPTIONAL + IN OUT VOID *Context OPTIONAL, IN OUT VOID *ExternalScratchBuffer ) { diff --git a/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c b/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c index 672a67f..4eaf700 100644 --- a/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c +++ b/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c @@ -233,7 +233,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, @@ -390,4 +390,3 @@ Returns: { EmuGopDestructor (Context); } - diff --git a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c index 5a52298..24d945b 100644 --- a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c +++ b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c @@ -2249,7 +2249,7 @@ CopyVideoBuffer ( EFI_STATUS BiosVideoVbeBltWorker ( IN BIOS_VIDEO_DEV *BiosVideoPrivate, - 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, @@ -2518,7 +2518,7 @@ EFI_STATUS EFIAPI BiosVideoGraphicsOutputVbeBlt ( 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, @@ -2740,7 +2740,7 @@ EFI_STATUS EFIAPI BiosVideoGraphicsOutputVgaBlt ( 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, @@ -3286,4 +3286,3 @@ BiosVideoEntryPoint( NULL ); } - diff --git a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.h b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.h index d4fe154..fb4cc65 100644 --- a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.h +++ b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.h @@ -334,7 +334,7 @@ EFI_STATUS EFIAPI BiosVideoGraphicsOutputVbeBlt ( 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, @@ -377,7 +377,7 @@ EFI_STATUS EFIAPI BiosVideoGraphicsOutputVgaBlt ( 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, diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c b/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c index 96f9934..4bd6d70 100644 --- a/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c +++ b/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c @@ -616,9 +616,9 @@ PlatformHooks ( IN EFI_LEGACY_BIOS_PLATFORM_PROTOCOL *This, IN EFI_GET_PLATFORM_HOOK_MODE Mode, IN UINT16 Type, - OUT EFI_HANDLE DeviceHandle, OPTIONAL - IN OUT UINTN *Shadowaddress, OPTIONAL - IN EFI_COMPATIBILITY16_TABLE *Compatibility16Table, OPTIONAL + OUT EFI_HANDLE DeviceHandle OPTIONAL, + IN OUT UINTN *Shadowaddress OPTIONAL, + IN EFI_COMPATIBILITY16_TABLE *Compatibility16Table OPTIONAL, OUT VOID **AdditionalData OPTIONAL ) { @@ -674,9 +674,9 @@ GetRoutingTable ( IN EFI_LEGACY_BIOS_PLATFORM_PROTOCOL *This, OUT VOID **RoutingTable, OUT UINTN *RoutingTableEntries, - OUT VOID **LocalPirqTable, OPTIONAL - OUT UINTN *PirqTableSize, OPTIONAL - OUT VOID **LocalIrqPriorityTable, OPTIONAL + OUT VOID **LocalPirqTable OPTIONAL, + OUT UINTN *PirqTableSize OPTIONAL, + OUT VOID **LocalIrqPriorityTable OPTIONAL, OUT UINTN *IrqPriorityTableEntries OPTIONAL ) { @@ -1057,4 +1057,3 @@ LegacyBiosPlatformInstall ( ); return Status; } - diff --git a/OvmfPkg/Csm/Include/Protocol/LegacyBios.h b/OvmfPkg/Csm/Include/Protocol/LegacyBios.h index cb320b6..443f0c1 100644 --- a/OvmfPkg/Csm/Include/Protocol/LegacyBios.h +++ b/OvmfPkg/Csm/Include/Protocol/LegacyBios.h @@ -1200,8 +1200,8 @@ EFI_STATUS (EFIAPI *EFI_LEGACY_BIOS_CHECK_ROM)( IN EFI_LEGACY_BIOS_PROTOCOL *This, IN EFI_HANDLE PciHandle, - OUT VOID **RomImage, OPTIONAL - OUT UINTN *RomSize, OPTIONAL + OUT VOID **RomImage OPTIONAL, + OUT UINTN *RomSize OPTIONAL, OUT UINTN *Flags ); @@ -1239,9 +1239,9 @@ EFI_STATUS IN EFI_HANDLE PciHandle, IN VOID **RomImage, OUT UINTN *Flags, - OUT UINT8 *DiskStart, OPTIONAL - OUT UINT8 *DiskEnd, OPTIONAL - OUT VOID **RomShadowAddress, OPTIONAL + OUT UINT8 *DiskStart OPTIONAL, + OUT UINT8 *DiskEnd OPTIONAL, + OUT VOID **RomShadowAddress OPTIONAL, OUT UINT32 *ShadowedRomSize OPTIONAL ); diff --git a/OvmfPkg/Csm/Include/Protocol/LegacyBiosPlatform.h b/OvmfPkg/Csm/Include/Protocol/LegacyBiosPlatform.h index 607ef35..37f5d91 100644 --- a/OvmfPkg/Csm/Include/Protocol/LegacyBiosPlatform.h +++ b/OvmfPkg/Csm/Include/Protocol/LegacyBiosPlatform.h @@ -629,9 +629,9 @@ EFI_STATUS IN EFI_LEGACY_BIOS_PLATFORM_PROTOCOL *This, IN EFI_GET_PLATFORM_HOOK_MODE Mode, IN UINT16 Type, - IN EFI_HANDLE DeviceHandle, OPTIONAL - IN OUT UINTN *ShadowAddress, OPTIONAL - IN EFI_COMPATIBILITY16_TABLE *Compatibility16Table, OPTIONAL + IN EFI_HANDLE DeviceHandle OPTIONAL, + IN OUT UINTN *ShadowAddress OPTIONAL, + IN EFI_COMPATIBILITY16_TABLE *Compatibility16Table OPTIONAL, OUT VOID **AdditionalData OPTIONAL ); @@ -660,9 +660,9 @@ EFI_STATUS IN EFI_LEGACY_BIOS_PLATFORM_PROTOCOL *This, OUT VOID **RoutingTable, OUT UINTN *RoutingTableEntries, - OUT VOID **LocalPirqTable, OPTIONAL - OUT UINTN *PirqTableSize, OPTIONAL - OUT VOID **LocalIrqPriorityTable, OPTIONAL + OUT VOID **LocalPirqTable OPTIONAL, + OUT UINTN *PirqTableSize OPTIONAL, + OUT VOID **LocalIrqPriorityTable OPTIONAL, OUT UINTN *IrqPriorityTableEntries OPTIONAL ); diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h index 88ec93d..f437d0c 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h @@ -750,8 +750,8 @@ EFIAPI LegacyBiosCheckPciRom ( IN EFI_LEGACY_BIOS_PROTOCOL *This, IN EFI_HANDLE PciHandle, - OUT VOID **RomImage, OPTIONAL - OUT UINTN *RomSize, OPTIONAL + OUT VOID **RomImage OPTIONAL, + OUT UINTN *RomSize OPTIONAL, OUT UINTN *Flags ); @@ -838,9 +838,9 @@ LegacyBiosInstallPciRom ( IN EFI_HANDLE PciHandle, IN VOID **RomImage, OUT UINTN *Flags, - OUT UINT8 *DiskStart, OPTIONAL - OUT UINT8 *DiskEnd, OPTIONAL - OUT VOID **RomShadowAddress, OPTIONAL + OUT UINT8 *DiskStart OPTIONAL, + OUT UINT8 *DiskEnd OPTIONAL, + OUT VOID **RomShadowAddress OPTIONAL, OUT UINT32 *RomShadowedSize OPTIONAL ); @@ -1388,11 +1388,11 @@ EFI_STATUS LegacyBiosCheckPciRomEx ( IN EFI_LEGACY_BIOS_PROTOCOL *This, IN EFI_HANDLE PciHandle, - OUT VOID **RomImage, OPTIONAL - OUT UINTN *RomSize, OPTIONAL - OUT UINTN *RuntimeImageLength, OPTIONAL - OUT UINTN *Flags, OPTIONAL - OUT UINT8 *OpromRevision, OPTIONAL + OUT VOID **RomImage OPTIONAL, + OUT UINTN *RomSize OPTIONAL, + OUT UINTN *RuntimeImageLength OPTIONAL, + OUT UINTN *Flags OPTIONAL, + OUT UINT8 *OpromRevision OPTIONAL, OUT VOID **ConfigUtilityCodeHeader OPTIONAL ); diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c index 350cf3d..ea0df49 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c @@ -52,9 +52,9 @@ EDKII_IOMMU_PROTOCOL *mIoMmu; EFI_STATUS GetShadowedRomParameters ( IN EFI_HANDLE PciHandle, - OUT UINT8 *DiskStart, OPTIONAL - OUT UINT8 *DiskEnd, OPTIONAL - OUT VOID **RomShadowAddress, OPTIONAL + OUT UINT8 *DiskStart OPTIONAL, + OUT UINT8 *DiskEnd OPTIONAL, + OUT VOID **RomShadowAddress OPTIONAL, OUT UINTN *ShadowedSize OPTIONAL ) { @@ -276,8 +276,8 @@ GetPciLegacyRom ( IN UINT16 DeviceId, IN OUT VOID **Rom, IN OUT UINTN *ImageSize, - OUT UINTN *MaxRuntimeImageLength, OPTIONAL - OUT UINT8 *OpRomRevision, OPTIONAL + OUT UINTN *MaxRuntimeImageLength OPTIONAL, + OUT UINT8 *OpRomRevision OPTIONAL, OUT VOID **ConfigUtilityCodeHeader OPTIONAL ) { @@ -1814,8 +1814,8 @@ EFIAPI LegacyBiosCheckPciRom ( IN EFI_LEGACY_BIOS_PROTOCOL *This, IN EFI_HANDLE PciHandle, - OUT VOID **RomImage, OPTIONAL - OUT UINTN *RomSize, OPTIONAL + OUT VOID **RomImage OPTIONAL, + OUT UINTN *RomSize OPTIONAL, OUT UINTN *Flags ) { @@ -1856,11 +1856,11 @@ EFI_STATUS LegacyBiosCheckPciRomEx ( IN EFI_LEGACY_BIOS_PROTOCOL *This, IN EFI_HANDLE PciHandle, - OUT VOID **RomImage, OPTIONAL - OUT UINTN *RomSize, OPTIONAL - OUT UINTN *RuntimeImageLength, OPTIONAL - OUT UINTN *Flags, OPTIONAL - OUT UINT8 *OpromRevision, OPTIONAL + OUT VOID **RomImage OPTIONAL, + OUT UINTN *RomSize OPTIONAL, + OUT UINTN *RuntimeImageLength OPTIONAL, + OUT UINTN *Flags OPTIONAL, + OUT UINT8 *OpromRevision OPTIONAL, OUT VOID **ConfigUtilityCodeHeader OPTIONAL ) { @@ -2256,8 +2256,8 @@ LegacyBiosInstallRom ( IN VOID *RomImage, IN UINTN ImageSize, IN OUT UINTN *RuntimeImageLength, - OUT UINT8 *DiskStart, OPTIONAL - OUT UINT8 *DiskEnd, OPTIONAL + OUT UINT8 *DiskStart OPTIONAL, + OUT UINT8 *DiskEnd OPTIONAL, OUT VOID **RomShadowAddress OPTIONAL ) { @@ -2791,9 +2791,9 @@ LegacyBiosInstallPciRom ( IN EFI_HANDLE PciHandle, IN VOID **RomImage, OUT UINTN *Flags, - OUT UINT8 *DiskStart, OPTIONAL - OUT UINT8 *DiskEnd, OPTIONAL - OUT VOID **RomShadowAddress, OPTIONAL + OUT UINT8 *DiskStart OPTIONAL, + OUT UINT8 *DiskEnd OPTIONAL, + OUT VOID **RomShadowAddress OPTIONAL, OUT UINT32 *RomShadowedSize OPTIONAL ) { @@ -3080,4 +3080,3 @@ LegacyBiosInstallPciRom ( mVgaInstallationInProgress = FALSE; return Status; } - diff --git a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h index 446b960..4103659 100644 --- a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h +++ b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h @@ -87,7 +87,7 @@ QemuFwCfgS3Enabled ( **/ typedef VOID (EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION) ( - IN OUT VOID *Context, OPTIONAL + IN OUT VOID *Context OPTIONAL, IN OUT VOID *ScratchBuffer ); @@ -153,7 +153,7 @@ RETURN_STATUS EFIAPI QemuFwCfgS3CallWhenBootScriptReady ( IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback, - IN OUT VOID *Context, OPTIONAL + IN OUT VOID *Context OPTIONAL, IN UINTN ScratchBufferSize ); diff --git a/OvmfPkg/Include/Protocol/Legacy8259.h b/OvmfPkg/Include/Protocol/Legacy8259.h index 7fde1c8..6dc7226 100644 --- a/OvmfPkg/Include/Protocol/Legacy8259.h +++ b/OvmfPkg/Include/Protocol/Legacy8259.h @@ -88,9 +88,9 @@ typedef EFI_STATUS (EFIAPI *EFI_LEGACY_8259_GET_MASK)( IN EFI_LEGACY_8259_PROTOCOL *This, - OUT UINT16 *LegacyMask, OPTIONAL - OUT UINT16 *LegacyEdgeLevel, OPTIONAL - OUT UINT16 *ProtectedMask, OPTIONAL + OUT UINT16 *LegacyMask OPTIONAL, + OUT UINT16 *LegacyEdgeLevel OPTIONAL, + OUT UINT16 *ProtectedMask OPTIONAL, OUT UINT16 *ProtectedEdgeLevel OPTIONAL ); @@ -114,9 +114,9 @@ typedef EFI_STATUS (EFIAPI *EFI_LEGACY_8259_SET_MASK)( IN EFI_LEGACY_8259_PROTOCOL *This, - IN UINT16 *LegacyMask, OPTIONAL - IN UINT16 *LegacyEdgeLevel, OPTIONAL - IN UINT16 *ProtectedMask, OPTIONAL + IN UINT16 *LegacyMask OPTIONAL, + IN UINT16 *LegacyEdgeLevel OPTIONAL, + IN UINT16 *ProtectedMask OPTIONAL, IN UINT16 *ProtectedEdgeLevel OPTIONAL ); @@ -143,7 +143,7 @@ EFI_STATUS (EFIAPI *EFI_LEGACY_8259_SET_MODE)( IN EFI_LEGACY_8259_PROTOCOL *This, IN EFI_8259_MODE Mode, - IN UINT16 *Mask, OPTIONAL + IN UINT16 *Mask OPTIONAL, IN UINT16 *EdgeLevel OPTIONAL ); diff --git a/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c index 2ed1bae..3d73111 100644 --- a/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c +++ b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c @@ -158,7 +158,7 @@ GetPerformanceCounter ( UINT64 EFIAPI GetPerformanceCounterProperties ( - OUT UINT64 *StartValue, OPTIONAL + OUT UINT64 *StartValue OPTIONAL, OUT UINT64 *EndValue OPTIONAL ) { diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c index 1f36b5c..95ab433 100644 --- a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c +++ b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c @@ -291,7 +291,7 @@ RETURN_STATUS EFIAPI RestoreLockBox ( IN GUID *Guid, - IN VOID *Buffer, OPTIONAL + IN VOID *Buffer OPTIONAL, IN OUT UINTN *Length OPTIONAL ) { diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c index c44d675..aad359d 100644 --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c @@ -96,7 +96,7 @@ RETURN_STATUS EFIAPI QemuFwCfgS3CallWhenBootScriptReady ( IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback, - IN OUT VOID *Context, OPTIONAL + IN OUT VOID *Context OPTIONAL, IN UINTN ScratchBufferSize ) { diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c index 3b3ecbc..4dcf4b1 100644 --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c @@ -137,7 +137,7 @@ RETURN_STATUS EFIAPI QemuFwCfgS3CallWhenBootScriptReady ( IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback, - IN OUT VOID *Context, OPTIONAL + IN OUT VOID *Context OPTIONAL, IN UINTN ScratchBufferSize ) { diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c index 0d055ca..bf1accd 100644 --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c @@ -72,7 +72,7 @@ RETURN_STATUS EFIAPI QemuFwCfgS3CallWhenBootScriptReady ( IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback, - IN OUT VOID *Context, OPTIONAL + IN OUT VOID *Context OPTIONAL, IN UINTN ScratchBufferSize ) { diff --git a/OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.c b/OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.c index 33a470f..80aad5a 100644 --- a/OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.c +++ b/OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.c @@ -278,7 +278,7 @@ Tpm2CommandChangeEps ( STATIC UINT32 Tcg2ExecutePhysicalPresence ( - IN TPM2B_AUTH *PlatformAuth, OPTIONAL + IN TPM2B_AUTH *PlatformAuth OPTIONAL, IN UINT32 CommandCode, IN UINT32 CommandParameter ) diff --git a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c index fd05ee5..62e42d6 100644 --- a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c +++ b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c @@ -489,7 +489,7 @@ InitializeRootHpc ( IN EFI_PCI_HOT_PLUG_INIT_PROTOCOL *This, IN EFI_DEVICE_PATH_PROTOCOL *HpcDevicePath, IN UINT64 HpcPciAddress, - IN EFI_EVENT Event, OPTIONAL + IN EFI_EVENT Event OPTIONAL, OUT EFI_HPC_STATE *HpcState ) { diff --git a/OvmfPkg/QemuRamfbDxe/QemuRamfb.c b/OvmfPkg/QemuRamfbDxe/QemuRamfb.c index 0d49d8b..881315f 100644 --- a/OvmfPkg/QemuRamfbDxe/QemuRamfb.c +++ b/OvmfPkg/QemuRamfbDxe/QemuRamfb.c @@ -185,7 +185,7 @@ EFI_STATUS EFIAPI QemuRamfbGraphicsOutputBlt ( 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, diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c index a44917e..6b0a11e 100644 --- a/OvmfPkg/QemuVideoDxe/Gop.c +++ b/OvmfPkg/QemuVideoDxe/Gop.c @@ -239,7 +239,7 @@ EFI_STATUS EFIAPI QemuVideoGraphicsOutputBlt ( 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, @@ -413,5 +413,3 @@ Returns: return EFI_SUCCESS; } - - diff --git a/OvmfPkg/SmmControl2Dxe/SmiFeatures.c b/OvmfPkg/SmmControl2Dxe/SmiFeatures.c index bd0653e..e7e74a8 100644 --- a/OvmfPkg/SmmControl2Dxe/SmiFeatures.c +++ b/OvmfPkg/SmmControl2Dxe/SmiFeatures.c @@ -203,7 +203,7 @@ STATIC VOID EFIAPI AppendFwCfgBootScript ( - IN OUT VOID *Context, OPTIONAL + IN OUT VOID *Context OPTIONAL, IN OUT VOID *ExternalScratchBuffer ) { diff --git a/OvmfPkg/VirtioGpuDxe/Gop.c b/OvmfPkg/VirtioGpuDxe/Gop.c index 0b2659d..3f0570e 100644 --- a/OvmfPkg/VirtioGpuDxe/Gop.c +++ b/OvmfPkg/VirtioGpuDxe/Gop.c @@ -438,7 +438,7 @@ EFI_STATUS EFIAPI GopBlt ( 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, diff --git a/OvmfPkg/VirtioRngDxe/VirtioRng.c b/OvmfPkg/VirtioRngDxe/VirtioRng.c index 4e2b710..9525abd 100644 --- a/OvmfPkg/VirtioRngDxe/VirtioRng.c +++ b/OvmfPkg/VirtioRngDxe/VirtioRng.c @@ -122,7 +122,7 @@ EFI_STATUS EFIAPI VirtioRngGetRNG ( IN EFI_RNG_PROTOCOL *This, - IN EFI_RNG_ALGORITHM *RNGAlgorithm, OPTIONAL + IN EFI_RNG_ALGORITHM *RNGAlgorithm OPTIONAL, IN UINTN RNGValueLength, OUT UINT8 *RNGValue ) -- cgit v1.1