diff options
author | Michael D Kinney <michael.d.kinney@intel.com> | 2021-12-02 18:00:53 -0800 |
---|---|---|
committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-12-07 17:24:28 +0000 |
commit | 79d49e162ed753a4e233af0cce36f68e18a06c03 (patch) | |
tree | 399b4b219661d3b00d7c96d0e36c36226a7fac62 /OvmfPkg/Csm | |
parent | 8874fa199dd7be550f20e3fc78861022eb826728 (diff) | |
download | edk2-79d49e162ed753a4e233af0cce36f68e18a06c03.tar.gz |
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 <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Andrew Fish <afish@apple.com>
Diffstat (limited to 'OvmfPkg/Csm')
-rw-r--r-- | OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c | 7 | ||||
-rw-r--r-- | OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.h | 4 | ||||
-rw-r--r-- | OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c | 13 | ||||
-rw-r--r-- | OvmfPkg/Csm/Include/Protocol/LegacyBios.h | 10 | ||||
-rw-r--r-- | OvmfPkg/Csm/Include/Protocol/LegacyBiosPlatform.h | 12 | ||||
-rw-r--r-- | OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h | 20 | ||||
-rw-r--r-- | OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c | 35 |
7 files changed, 49 insertions, 52 deletions
diff --git a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c index 5a52298983..24d945b2eb 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 d4fe15428b..fb4cc65fd9 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 96f9934b20..4bd6d70a1a 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 cb320b6017..443f0c11a4 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 607ef358f0..37f5d9178b 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 88ec93d428..f437d0cc42 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 350cf3dd0b..ea0df4972b 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;
}
-
|