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>

diff --git a/OvmfPkg/8259InterruptControllerDxe/8259.c b/OvmfPkg/8259InterruptControllerDxe/8259.c
index 1c2ac1039d403389a00962b903b7b9d375e95724..7d51ff259f8cb7dd758ef69d1bee0421cf598ebd 100644 (file)
--- a/OvmfPkg/8259InterruptControllerDxe/8259.c
+++ b/OvmfPkg/8259InterruptControllerDxe/8259.c
@@ -230,9 +230,9 @@ EFI_STATUS
 EFIAPI\r
 Interrupt8259GetMask (\r
   IN  EFI_LEGACY_8259_PROTOCOL  *This,\r
-  OUT UINT16                    *LegacyMask, OPTIONAL\r
-  OUT UINT16                    *LegacyEdgeLevel, OPTIONAL\r
-  OUT UINT16                    *ProtectedMask, OPTIONAL\r
+  OUT UINT16                    *LegacyMask  OPTIONAL,\r
+  OUT UINT16                    *LegacyEdgeLevel  OPTIONAL,\r
+  OUT UINT16                    *ProtectedMask  OPTIONAL,\r
   OUT UINT16                    *ProtectedEdgeLevel OPTIONAL\r
   )\r
 {\r
@@ -272,9 +272,9 @@ EFI_STATUS
 EFIAPI\r
 Interrupt8259SetMask (\r
   IN EFI_LEGACY_8259_PROTOCOL  *This,\r
-  IN UINT16                    *LegacyMask, OPTIONAL\r
-  IN UINT16                    *LegacyEdgeLevel, OPTIONAL\r
-  IN UINT16                    *ProtectedMask, OPTIONAL\r
+  IN UINT16                    *LegacyMask  OPTIONAL,\r
+  IN UINT16                    *LegacyEdgeLevel  OPTIONAL,\r
+  IN UINT16                    *ProtectedMask  OPTIONAL,\r
   IN UINT16                    *ProtectedEdgeLevel OPTIONAL\r
   )\r
 {\r
@@ -314,7 +314,7 @@ EFIAPI
 Interrupt8259SetMode (\r
   IN EFI_LEGACY_8259_PROTOCOL  *This,\r
   IN EFI_8259_MODE             Mode,\r
-  IN UINT16                    *Mask, OPTIONAL\r
+  IN UINT16                    *Mask  OPTIONAL,\r
   IN UINT16                    *EdgeLevel OPTIONAL\r
   )\r
 {\r

diff --git a/OvmfPkg/8259InterruptControllerDxe/8259.h b/OvmfPkg/8259InterruptControllerDxe/8259.h
index a9673f9c875506812e4fbf4d4acfe5e81748bb8b..aac82e92e795b7e120733fa33ddebc7d27f00e12 100644 (file)
--- a/OvmfPkg/8259InterruptControllerDxe/8259.h
+++ b/OvmfPkg/8259InterruptControllerDxe/8259.h
@@ -75,9 +75,9 @@ EFI_STATUS
 EFIAPI\r
 Interrupt8259GetMask (\r
   IN  EFI_LEGACY_8259_PROTOCOL  *This,\r
-  OUT UINT16                    *LegacyMask, OPTIONAL\r
-  OUT UINT16                    *LegacyEdgeLevel, OPTIONAL\r
-  OUT UINT16                    *ProtectedMask, OPTIONAL\r
+  OUT UINT16                    *LegacyMask  OPTIONAL,\r
+  OUT UINT16                    *LegacyEdgeLevel  OPTIONAL,\r
+  OUT UINT16                    *ProtectedMask  OPTIONAL,\r
   OUT UINT16                    *ProtectedEdgeLevel OPTIONAL\r
   );\r
 \r
@@ -98,9 +98,9 @@ EFI_STATUS
 EFIAPI\r
 Interrupt8259SetMask (\r
   IN EFI_LEGACY_8259_PROTOCOL  *This,\r
-  IN UINT16                    *LegacyMask, OPTIONAL\r
-  IN UINT16                    *LegacyEdgeLevel, OPTIONAL\r
-  IN UINT16                    *ProtectedMask, OPTIONAL\r
+  IN UINT16                    *LegacyMask  OPTIONAL,\r
+  IN UINT16                    *LegacyEdgeLevel  OPTIONAL,\r
+  IN UINT16                    *ProtectedMask  OPTIONAL,\r
   IN UINT16                    *ProtectedEdgeLevel OPTIONAL\r
   );\r
 \r
@@ -121,7 +121,7 @@ EFIAPI
 Interrupt8259SetMode (\r
   IN EFI_LEGACY_8259_PROTOCOL  *This,\r
   IN EFI_8259_MODE             Mode,\r
-  IN UINT16                    *Mask, OPTIONAL\r
+  IN UINT16                    *Mask  OPTIONAL,\r
   IN UINT16                    *EdgeLevel OPTIONAL\r
   );\r
 \r

diff --git a/OvmfPkg/AcpiPlatformDxe/BootScript.c b/OvmfPkg/AcpiPlatformDxe/BootScript.c
index f2d1089e91ce31301e6b4522810a4ae3f17a59b5..efcf2e3ba59c7374a26ae91b1cd135986c2fe052 100644 (file)
--- a/OvmfPkg/AcpiPlatformDxe/BootScript.c
+++ b/OvmfPkg/AcpiPlatformDxe/BootScript.c
@@ -190,7 +190,7 @@ STATIC
 VOID\r
 EFIAPI\r
 AppendFwCfgBootScript (\r
-  IN OUT VOID *Context,              OPTIONAL\r
+  IN OUT VOID *Context               OPTIONAL,\r
   IN OUT VOID *ExternalScratchBuffer\r
   )\r
 {\r

diff --git a/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c b/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c
index 672a67fbe15b1f7305429709ea46172916e28a49..4eaf7001b49d00caca083298cd666127398078b8 100644 (file)
--- a/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c
+++ b/OvmfPkg/Bhyve/BhyveRfbDxe/GopScreen.c
@@ -233,7 +233,7 @@ EFI_STATUS
 EFIAPI\r
 EmuGopBlt (\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL            *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL           *BltBuffer,   OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL           *BltBuffer    OPTIONAL,\r
   IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION       BltOperation,\r
   IN  UINTN                                   SourceX,\r
   IN  UINTN                                   SourceY,\r
@@ -390,4 +390,3 @@ Returns:
 {\r
   EmuGopDestructor (Context);\r
 }\r
-\r

diff --git a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c
index 5a52298983e5f818c44364830041001a49a15e91..24d945b2eb74f9101dcd348062332019ad1bcd0c 100644 (file)
--- a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c
+++ b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c
@@ -2249,7 +2249,7 @@ CopyVideoBuffer (
 EFI_STATUS\r
 BiosVideoVbeBltWorker (\r
   IN  BIOS_VIDEO_DEV                     *BiosVideoPrivate,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer, OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer  OPTIONAL,\r
   IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION  BltOperation,\r
   IN  UINTN                              SourceX,\r
   IN  UINTN                              SourceY,\r
@@ -2518,7 +2518,7 @@ EFI_STATUS
 EFIAPI\r
 BiosVideoGraphicsOutputVbeBlt (\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer, OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer  OPTIONAL,\r
   IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION  BltOperation,\r
   IN  UINTN                              SourceX,\r
   IN  UINTN                              SourceY,\r
@@ -2740,7 +2740,7 @@ EFI_STATUS
 EFIAPI\r
 BiosVideoGraphicsOutputVgaBlt (\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer, OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer  OPTIONAL,\r
   IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION  BltOperation,\r
   IN  UINTN                              SourceX,\r
   IN  UINTN                              SourceY,\r
@@ -3286,4 +3286,3 @@ BiosVideoEntryPoint(
                 NULL\r
                 );\r
 }\r
-\r

diff --git a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.h b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.h
index d4fe15428bf0a5428ed3f448b58c06aa28611b1f..fb4cc65fd924f41881a92c0bac8539928f40eb50 100644 (file)
--- a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.h
+++ b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.h
@@ -334,7 +334,7 @@ EFI_STATUS
 EFIAPI\r
 BiosVideoGraphicsOutputVbeBlt (\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer, OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer  OPTIONAL,\r
   IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION  BltOperation,\r
   IN  UINTN                              SourceX,\r
   IN  UINTN                              SourceY,\r
@@ -377,7 +377,7 @@ EFI_STATUS
 EFIAPI\r
 BiosVideoGraphicsOutputVgaBlt (\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL       *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer, OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL      *BltBuffer  OPTIONAL,\r
   IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION  BltOperation,\r
   IN  UINTN                              SourceX,\r
   IN  UINTN                              SourceY,\r

diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c b/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c
index 96f9934b2086454f39108d2e7a37d1e7b5b7ea51..4bd6d70a1a65ee6339da9b02850393730be48fe5 100644 (file)
--- a/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c
+++ b/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c
@@ -616,9 +616,9 @@ PlatformHooks (
   IN       EFI_LEGACY_BIOS_PLATFORM_PROTOCOL     *This,\r
   IN       EFI_GET_PLATFORM_HOOK_MODE            Mode,\r
   IN       UINT16                                Type,\r
-     OUT   EFI_HANDLE                            DeviceHandle, OPTIONAL\r
-  IN OUT   UINTN                                 *Shadowaddress, OPTIONAL\r
-  IN       EFI_COMPATIBILITY16_TABLE             *Compatibility16Table, OPTIONAL\r
+     OUT   EFI_HANDLE                            DeviceHandle  OPTIONAL,\r
+  IN OUT   UINTN                                 *Shadowaddress  OPTIONAL,\r
+  IN       EFI_COMPATIBILITY16_TABLE             *Compatibility16Table  OPTIONAL,\r
      OUT   VOID                                  **AdditionalData OPTIONAL\r
   )\r
 {\r
@@ -674,9 +674,9 @@ GetRoutingTable (
   IN  EFI_LEGACY_BIOS_PLATFORM_PROTOCOL           *This,\r
   OUT VOID                                        **RoutingTable,\r
   OUT UINTN                                       *RoutingTableEntries,\r
-  OUT VOID                                        **LocalPirqTable, OPTIONAL\r
-  OUT UINTN                                       *PirqTableSize, OPTIONAL\r
-  OUT VOID                                        **LocalIrqPriorityTable, OPTIONAL\r
+  OUT VOID                                        **LocalPirqTable  OPTIONAL,\r
+  OUT UINTN                                       *PirqTableSize  OPTIONAL,\r
+  OUT VOID                                        **LocalIrqPriorityTable  OPTIONAL,\r
   OUT UINTN                                       *IrqPriorityTableEntries OPTIONAL\r
   )\r
 {\r
@@ -1057,4 +1057,3 @@ LegacyBiosPlatformInstall (
                   );\r
   return Status;\r
 }\r
-\r

diff --git a/OvmfPkg/Csm/Include/Protocol/LegacyBios.h b/OvmfPkg/Csm/Include/Protocol/LegacyBios.h
index cb320b601733e6369d62184bcd78803617c43ab3..443f0c11a435c653cb0ce21ad5b9d5a7b7863fc9 100644 (file)
--- 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)(\r
   IN  EFI_LEGACY_BIOS_PROTOCOL  *This,\r
   IN  EFI_HANDLE                PciHandle,\r
-  OUT VOID                      **RomImage, OPTIONAL\r
-  OUT UINTN                     *RomSize, OPTIONAL\r
+  OUT VOID                      **RomImage  OPTIONAL,\r
+  OUT UINTN                     *RomSize  OPTIONAL,\r
   OUT UINTN                     *Flags\r
   );\r
 \r
@@ -1239,9 +1239,9 @@ EFI_STATUS
   IN  EFI_HANDLE                PciHandle,\r
   IN  VOID                      **RomImage,\r
   OUT UINTN                     *Flags,\r
-  OUT UINT8                     *DiskStart, OPTIONAL\r
-  OUT UINT8                     *DiskEnd, OPTIONAL\r
-  OUT VOID                      **RomShadowAddress, OPTIONAL\r
+  OUT UINT8                     *DiskStart  OPTIONAL,\r
+  OUT UINT8                     *DiskEnd  OPTIONAL,\r
+  OUT VOID                      **RomShadowAddress  OPTIONAL,\r
   OUT UINT32                    *ShadowedRomSize OPTIONAL\r
   );\r
 \r

diff --git a/OvmfPkg/Csm/Include/Protocol/LegacyBiosPlatform.h b/OvmfPkg/Csm/Include/Protocol/LegacyBiosPlatform.h
index 607ef358f0b06da0f4e38480b7485aaf374ae702..37f5d9178bce64c4c5f717341550186d5a6bee69 100644 (file)
--- 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,\r
   IN EFI_GET_PLATFORM_HOOK_MODE          Mode,\r
   IN UINT16                              Type,\r
-  IN  EFI_HANDLE                         DeviceHandle, OPTIONAL\r
-  IN  OUT UINTN                          *ShadowAddress, OPTIONAL\r
-  IN  EFI_COMPATIBILITY16_TABLE          *Compatibility16Table, OPTIONAL\r
+  IN  EFI_HANDLE                         DeviceHandle  OPTIONAL,\r
+  IN  OUT UINTN                          *ShadowAddress  OPTIONAL,\r
+  IN  EFI_COMPATIBILITY16_TABLE          *Compatibility16Table  OPTIONAL,\r
   OUT  VOID                               **AdditionalData OPTIONAL\r
   );\r
 \r
@@ -660,9 +660,9 @@ EFI_STATUS
   IN EFI_LEGACY_BIOS_PLATFORM_PROTOCOL   *This,\r
   OUT VOID                               **RoutingTable,\r
   OUT UINTN                              *RoutingTableEntries,\r
-  OUT VOID                               **LocalPirqTable, OPTIONAL\r
-  OUT UINTN                              *PirqTableSize, OPTIONAL\r
-  OUT VOID                               **LocalIrqPriorityTable, OPTIONAL\r
+  OUT VOID                               **LocalPirqTable  OPTIONAL,\r
+  OUT UINTN                              *PirqTableSize  OPTIONAL,\r
+  OUT VOID                               **LocalIrqPriorityTable  OPTIONAL,\r
   OUT UINTN                              *IrqPriorityTableEntries OPTIONAL\r
   );\r
 \r

diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h
index 88ec93d428bf233dfd7c9dcff9ca88dc3fc04d9e..f437d0cc424607ce7f5b451c025bde23ea36e673 100644 (file)
--- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h
+++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosInterface.h
@@ -750,8 +750,8 @@ EFIAPI
 LegacyBiosCheckPciRom (\r
   IN  EFI_LEGACY_BIOS_PROTOCOL          *This,\r
   IN  EFI_HANDLE                        PciHandle,\r
-  OUT VOID                              **RomImage, OPTIONAL\r
-  OUT UINTN                             *RomSize, OPTIONAL\r
+  OUT VOID                              **RomImage  OPTIONAL,\r
+  OUT UINTN                             *RomSize  OPTIONAL,\r
   OUT UINTN                             *Flags\r
   );\r
 \r
@@ -838,9 +838,9 @@ LegacyBiosInstallPciRom (
   IN  EFI_HANDLE                        PciHandle,\r
   IN  VOID                              **RomImage,\r
   OUT UINTN                             *Flags,\r
-  OUT UINT8                             *DiskStart, OPTIONAL\r
-  OUT UINT8                             *DiskEnd, OPTIONAL\r
-  OUT VOID                              **RomShadowAddress, OPTIONAL\r
+  OUT UINT8                             *DiskStart  OPTIONAL,\r
+  OUT UINT8                             *DiskEnd  OPTIONAL,\r
+  OUT VOID                              **RomShadowAddress  OPTIONAL,\r
   OUT UINT32                            *RomShadowedSize OPTIONAL\r
   );\r
 \r
@@ -1388,11 +1388,11 @@ EFI_STATUS
 LegacyBiosCheckPciRomEx (\r
   IN EFI_LEGACY_BIOS_PROTOCOL           *This,\r
   IN  EFI_HANDLE                        PciHandle,\r
-  OUT VOID                              **RomImage, OPTIONAL\r
-  OUT UINTN                             *RomSize, OPTIONAL\r
-  OUT UINTN                             *RuntimeImageLength, OPTIONAL\r
-  OUT UINTN                             *Flags, OPTIONAL\r
-  OUT UINT8                             *OpromRevision, OPTIONAL\r
+  OUT VOID                              **RomImage  OPTIONAL,\r
+  OUT UINTN                             *RomSize  OPTIONAL,\r
+  OUT UINTN                             *RuntimeImageLength  OPTIONAL,\r
+  OUT UINTN                             *Flags  OPTIONAL,\r
+  OUT UINT8                             *OpromRevision  OPTIONAL,\r
   OUT VOID                              **ConfigUtilityCodeHeader OPTIONAL\r
   );\r
 \r

diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c
index 350cf3dd0b3a6d787f9b1530a9b7591cbe0faa1f..ea0df4972b9849eced36d0bddf4d63ded257b344 100644 (file)
--- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c
+++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c
@@ -52,9 +52,9 @@ EDKII_IOMMU_PROTOCOL                *mIoMmu;
 EFI_STATUS\r
 GetShadowedRomParameters (\r
   IN EFI_HANDLE                         PciHandle,\r
-  OUT UINT8                             *DiskStart,         OPTIONAL\r
-  OUT UINT8                             *DiskEnd,           OPTIONAL\r
-  OUT VOID                              **RomShadowAddress, OPTIONAL\r
+  OUT UINT8                             *DiskStart          OPTIONAL,\r
+  OUT UINT8                             *DiskEnd            OPTIONAL,\r
+  OUT VOID                              **RomShadowAddress  OPTIONAL,\r
   OUT UINTN                             *ShadowedSize       OPTIONAL\r
   )\r
 {\r
@@ -276,8 +276,8 @@ GetPciLegacyRom (
   IN     UINT16 DeviceId,\r
   IN OUT VOID   **Rom,\r
   IN OUT UINTN  *ImageSize,\r
-  OUT    UINTN  *MaxRuntimeImageLength,   OPTIONAL\r
-  OUT    UINT8  *OpRomRevision,           OPTIONAL\r
+  OUT    UINTN  *MaxRuntimeImageLength    OPTIONAL,\r
+  OUT    UINT8  *OpRomRevision            OPTIONAL,\r
   OUT    VOID   **ConfigUtilityCodeHeader OPTIONAL\r
   )\r
 {\r
@@ -1814,8 +1814,8 @@ EFIAPI
 LegacyBiosCheckPciRom (\r
   IN EFI_LEGACY_BIOS_PROTOCOL           *This,\r
   IN  EFI_HANDLE                        PciHandle,\r
-  OUT VOID                              **RomImage, OPTIONAL\r
-  OUT UINTN                             *RomSize, OPTIONAL\r
+  OUT VOID                              **RomImage  OPTIONAL,\r
+  OUT UINTN                             *RomSize  OPTIONAL,\r
   OUT UINTN                             *Flags\r
   )\r
 {\r
@@ -1856,11 +1856,11 @@ EFI_STATUS
 LegacyBiosCheckPciRomEx (\r
   IN EFI_LEGACY_BIOS_PROTOCOL           *This,\r
   IN  EFI_HANDLE                        PciHandle,\r
-  OUT VOID                              **RomImage, OPTIONAL\r
-  OUT UINTN                             *RomSize, OPTIONAL\r
-  OUT UINTN                             *RuntimeImageLength, OPTIONAL\r
-  OUT UINTN                             *Flags, OPTIONAL\r
-  OUT UINT8                             *OpromRevision, OPTIONAL\r
+  OUT VOID                              **RomImage  OPTIONAL,\r
+  OUT UINTN                             *RomSize  OPTIONAL,\r
+  OUT UINTN                             *RuntimeImageLength  OPTIONAL,\r
+  OUT UINTN                             *Flags  OPTIONAL,\r
+  OUT UINT8                             *OpromRevision  OPTIONAL,\r
   OUT VOID                              **ConfigUtilityCodeHeader OPTIONAL\r
   )\r
 {\r
@@ -2256,8 +2256,8 @@ LegacyBiosInstallRom (
   IN VOID                               *RomImage,\r
   IN UINTN                              ImageSize,\r
   IN OUT UINTN                          *RuntimeImageLength,\r
-  OUT UINT8                             *DiskStart, OPTIONAL\r
-  OUT UINT8                             *DiskEnd, OPTIONAL\r
+  OUT UINT8                             *DiskStart  OPTIONAL,\r
+  OUT UINT8                             *DiskEnd  OPTIONAL,\r
   OUT VOID                              **RomShadowAddress OPTIONAL\r
   )\r
 {\r
@@ -2791,9 +2791,9 @@ LegacyBiosInstallPciRom (
   IN  EFI_HANDLE                        PciHandle,\r
   IN  VOID                              **RomImage,\r
   OUT UINTN                             *Flags,\r
-  OUT UINT8                             *DiskStart, OPTIONAL\r
-  OUT UINT8                             *DiskEnd, OPTIONAL\r
-  OUT VOID                              **RomShadowAddress, OPTIONAL\r
+  OUT UINT8                             *DiskStart  OPTIONAL,\r
+  OUT UINT8                             *DiskEnd  OPTIONAL,\r
+  OUT VOID                              **RomShadowAddress  OPTIONAL,\r
   OUT UINT32                            *RomShadowedSize OPTIONAL\r
   )\r
 {\r
@@ -3080,4 +3080,3 @@ LegacyBiosInstallPciRom (
   mVgaInstallationInProgress = FALSE;\r
   return Status;\r
 }\r
-\r

diff --git a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
index 446b960249c4818ac78ac10f271e45cc3afe7aeb..4103659282b41d13e2f1bd46a724058bd4cd42ca 100644 (file)
--- a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
+++ b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
@@ -87,7 +87,7 @@ QemuFwCfgS3Enabled (
 **/\r
 typedef\r
 VOID (EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION) (\r
-  IN OUT VOID *Context,      OPTIONAL\r
+  IN OUT VOID *Context       OPTIONAL,\r
   IN OUT VOID *ScratchBuffer\r
   );\r
 \r
@@ -153,7 +153,7 @@ RETURN_STATUS
 EFIAPI\r
 QemuFwCfgS3CallWhenBootScriptReady (\r
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
-  IN OUT VOID                                 *Context,          OPTIONAL\r
+  IN OUT VOID                                 *Context           OPTIONAL,\r
   IN     UINTN                                ScratchBufferSize\r
   );\r
 \r

diff --git a/OvmfPkg/Include/Protocol/Legacy8259.h b/OvmfPkg/Include/Protocol/Legacy8259.h
index 7fde1c8537295d4b28f845f745e687317136b875..6dc7226ece2bf5feccb9df5272673a68bd0d7435 100644 (file)
--- a/OvmfPkg/Include/Protocol/Legacy8259.h
+++ b/OvmfPkg/Include/Protocol/Legacy8259.h
@@ -88,9 +88,9 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_LEGACY_8259_GET_MASK)(\r
   IN EFI_LEGACY_8259_PROTOCOL           *This,\r
-  OUT UINT16                            *LegacyMask, OPTIONAL\r
-  OUT UINT16                            *LegacyEdgeLevel, OPTIONAL\r
-  OUT UINT16                            *ProtectedMask, OPTIONAL\r
+  OUT UINT16                            *LegacyMask  OPTIONAL,\r
+  OUT UINT16                            *LegacyEdgeLevel  OPTIONAL,\r
+  OUT UINT16                            *ProtectedMask  OPTIONAL,\r
   OUT UINT16                            *ProtectedEdgeLevel OPTIONAL\r
   );\r
 \r
@@ -114,9 +114,9 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_LEGACY_8259_SET_MASK)(\r
   IN EFI_LEGACY_8259_PROTOCOL           *This,\r
-  IN  UINT16                            *LegacyMask, OPTIONAL\r
-  IN  UINT16                            *LegacyEdgeLevel, OPTIONAL\r
-  IN  UINT16                            *ProtectedMask, OPTIONAL\r
+  IN  UINT16                            *LegacyMask  OPTIONAL,\r
+  IN  UINT16                            *LegacyEdgeLevel  OPTIONAL,\r
+  IN  UINT16                            *ProtectedMask  OPTIONAL,\r
   IN  UINT16                            *ProtectedEdgeLevel OPTIONAL\r
   );\r
 \r
@@ -143,7 +143,7 @@ EFI_STATUS
 (EFIAPI *EFI_LEGACY_8259_SET_MODE)(\r
   IN EFI_LEGACY_8259_PROTOCOL         *This,\r
   IN  EFI_8259_MODE                   Mode,\r
-  IN  UINT16                          *Mask, OPTIONAL\r
+  IN  UINT16                          *Mask  OPTIONAL,\r
   IN  UINT16                          *EdgeLevel OPTIONAL\r
   );\r
 \r

diff --git a/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c
index 2ed1baeebb1fc2845fb13e009c12b9d3f822553c..3d73111ced9a1e3b74138ce4fc1428356248746a 100644 (file)
--- a/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c
+++ b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c
@@ -158,7 +158,7 @@ GetPerformanceCounter (
 UINT64\r
 EFIAPI\r
 GetPerformanceCounterProperties (\r
-  OUT      UINT64                    *StartValue,  OPTIONAL\r
+  OUT      UINT64                    *StartValue   OPTIONAL,\r
   OUT      UINT64                    *EndValue     OPTIONAL\r
   )\r
 {\r

diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
index 1f36b5cc06b54097d605c5739e75582f42ca9a62..95ab4332e7e8f7a0534cafa9477f93e2fd1c0230 100644 (file)
--- a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
+++ b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
@@ -291,7 +291,7 @@ RETURN_STATUS
 EFIAPI\r
 RestoreLockBox (\r
   IN  GUID                        *Guid,\r
-  IN  VOID                        *Buffer, OPTIONAL\r
+  IN  VOID                        *Buffer  OPTIONAL,\r
   IN  OUT UINTN                   *Length  OPTIONAL\r
   )\r
 {\r

diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
index c44d675807cbd2d4c73b9cafe2d369ace5f4a22a..aad359d83d0f2d50037b61d51d6caebe16adff4f 100644 (file)
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Base.c
@@ -96,7 +96,7 @@ RETURN_STATUS
 EFIAPI\r
 QemuFwCfgS3CallWhenBootScriptReady (\r
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
-  IN OUT VOID                                 *Context,          OPTIONAL\r
+  IN OUT VOID                                 *Context           OPTIONAL,\r
   IN     UINTN                                ScratchBufferSize\r
   )\r
 {\r

diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c
index 3b3ecbc18f9a579e5bcf6d3ad2c909ce8916cab7..4dcf4b1298863ee462299ef0fc6337a1cf6038e1 100644 (file)
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c
@@ -137,7 +137,7 @@ RETURN_STATUS
 EFIAPI\r
 QemuFwCfgS3CallWhenBootScriptReady (\r
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
-  IN OUT VOID                                 *Context,          OPTIONAL\r
+  IN OUT VOID                                 *Context           OPTIONAL,\r
   IN     UINTN                                ScratchBufferSize\r
   )\r
 {\r

diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c
index 0d055cacbd91227c6d98d71b0ec746c8855c2bc2..bf1accd9466ff0cc2124a65ab709e7982f075b70 100644 (file)
--- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c
+++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Pei.c
@@ -72,7 +72,7 @@ RETURN_STATUS
 EFIAPI\r
 QemuFwCfgS3CallWhenBootScriptReady (\r
   IN     FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,\r
-  IN OUT VOID                                 *Context,          OPTIONAL\r
+  IN OUT VOID                                 *Context           OPTIONAL,\r
   IN     UINTN                                ScratchBufferSize\r
   )\r
 {\r

diff --git a/OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.c b/OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.c
index 33a470f6d8ba8ab9dd3c40690f4858fb6ebe106f..80aad5a3735a998d0ea2aff57132f87cfcaa7b97 100644 (file)
--- a/OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.c
+++ b/OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.c
@@ -278,7 +278,7 @@ Tpm2CommandChangeEps (
 STATIC\r
 UINT32\r
 Tcg2ExecutePhysicalPresence (\r
-  IN      TPM2B_AUTH                       *PlatformAuth,  OPTIONAL\r
+  IN      TPM2B_AUTH                       *PlatformAuth   OPTIONAL,\r
   IN      UINT32                           CommandCode,\r
   IN      UINT32                           CommandParameter\r
   )\r

diff --git a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
index fd05ee5c2c1bd236570c5d0f686c94e8a5c10106..62e42d6771f9c96e5829787afb277912b1b99040 100644 (file)
--- a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
+++ b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
@@ -489,7 +489,7 @@ InitializeRootHpc (
   IN  EFI_PCI_HOT_PLUG_INIT_PROTOCOL *This,\r
   IN  EFI_DEVICE_PATH_PROTOCOL       *HpcDevicePath,\r
   IN  UINT64                         HpcPciAddress,\r
-  IN  EFI_EVENT                      Event, OPTIONAL\r
+  IN  EFI_EVENT                      Event  OPTIONAL,\r
   OUT EFI_HPC_STATE                  *HpcState\r
   )\r
 {\r

diff --git a/OvmfPkg/QemuRamfbDxe/QemuRamfb.c b/OvmfPkg/QemuRamfbDxe/QemuRamfb.c
index 0d49d8bbab0384267ebce83c4d66feb29a8e0727..881315f42d91185abb678b82f41d4ffad2223321 100644 (file)
--- a/OvmfPkg/QemuRamfbDxe/QemuRamfb.c
+++ b/OvmfPkg/QemuRamfbDxe/QemuRamfb.c
@@ -185,7 +185,7 @@ EFI_STATUS
 EFIAPI\r
 QemuRamfbGraphicsOutputBlt (\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL          *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL         *BltBuffer, OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL         *BltBuffer  OPTIONAL,\r
   IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION     BltOperation,\r
   IN  UINTN                                 SourceX,\r
   IN  UINTN                                 SourceY,\r

diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c
index a44917eb6b623f79cddca919d7ae49776b9f9ea6..6b0a11ec1218102928a86f5d542b77df49841195 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Gop.c
+++ b/OvmfPkg/QemuVideoDxe/Gop.c
@@ -239,7 +239,7 @@ EFI_STATUS
 EFIAPI\r
 QemuVideoGraphicsOutputBlt (\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL          *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL         *BltBuffer, OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL         *BltBuffer  OPTIONAL,\r
   IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION     BltOperation,\r
   IN  UINTN                                 SourceX,\r
   IN  UINTN                                 SourceY,\r
@@ -413,5 +413,3 @@ Returns:
 \r
   return EFI_SUCCESS;\r
 }\r
-\r
-\r

diff --git a/OvmfPkg/SmmControl2Dxe/SmiFeatures.c b/OvmfPkg/SmmControl2Dxe/SmiFeatures.c
index bd0653e6b13f43ff64d3a3f03cd1df45d2394473..e7e74a80e1ae43188faa285ffc4c8d63b5ff7188 100644 (file)
--- a/OvmfPkg/SmmControl2Dxe/SmiFeatures.c
+++ b/OvmfPkg/SmmControl2Dxe/SmiFeatures.c
@@ -203,7 +203,7 @@ STATIC
 VOID\r
 EFIAPI\r
 AppendFwCfgBootScript (\r
-  IN OUT VOID *Context,              OPTIONAL\r
+  IN OUT VOID *Context               OPTIONAL,\r
   IN OUT VOID *ExternalScratchBuffer\r
   )\r
 {\r

diff --git a/OvmfPkg/VirtioGpuDxe/Gop.c b/OvmfPkg/VirtioGpuDxe/Gop.c
index 0b2659d1d2b9be3727f2f2963f82b7ba49944c46..3f0570eaad0ece1342c934357169851d04b1c4bf 100644 (file)
--- a/OvmfPkg/VirtioGpuDxe/Gop.c
+++ b/OvmfPkg/VirtioGpuDxe/Gop.c
@@ -438,7 +438,7 @@ EFI_STATUS
 EFIAPI\r
 GopBlt (\r
   IN  EFI_GRAPHICS_OUTPUT_PROTOCOL      *This,\r
-  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL     *BltBuffer,   OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL     *BltBuffer    OPTIONAL,\r
   IN  EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation,\r
   IN  UINTN                             SourceX,\r
   IN  UINTN                             SourceY,\r

diff --git a/OvmfPkg/VirtioRngDxe/VirtioRng.c b/OvmfPkg/VirtioRngDxe/VirtioRng.c
index 4e2b710f9e491207cdb796e6b540e9f08db2de16..9525abdabe790bd610f7bfd4056a22de7dca039f 100644 (file)
--- a/OvmfPkg/VirtioRngDxe/VirtioRng.c
+++ b/OvmfPkg/VirtioRngDxe/VirtioRng.c
@@ -122,7 +122,7 @@ EFI_STATUS
 EFIAPI\r
 VirtioRngGetRNG (\r
   IN EFI_RNG_PROTOCOL            *This,\r
-  IN EFI_RNG_ALGORITHM           *RNGAlgorithm, OPTIONAL\r
+  IN EFI_RNG_ALGORITHM           *RNGAlgorithm  OPTIONAL,\r
   IN UINTN                       RNGValueLength,\r
   OUT UINT8                      *RNGValue\r
   )\r