sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FmpDevicePkg: Change OPTIONAL keyword usage style

Browse Source 
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: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Michael D Kinney
2021-12-02 18:00:45 -08:00
committed by mergify[bot]
parent c69fc80c80
commit 9c721071d3
7 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FmpDevicePkg/Include/Library/FmpDependencyCheckLib.h
View File

@ -36,7 +36,7 @@ EFIAPI
CheckFmpDependency ( CheckFmpDependency (
IN EFI_GUID ImageTypeId, IN EFI_GUID ImageTypeId,
IN UINT32 Version, IN UINT32 Version,
IN EFI_FIRMWARE_IMAGE_DEP *Dependencies, OPTIONAL IN EFI_FIRMWARE_IMAGE_DEP *Dependencies OPTIONAL,
IN UINT32 DependenciesSize, IN UINT32 DependenciesSize,
OUT UINT32 *LastAttemptStatus OPTIONAL OUT UINT32 *LastAttemptStatus OPTIONAL
); );

2
FmpDevicePkg/Include/Library/FmpDependencyLib.h
View File

@ -96,7 +96,7 @@ EFIAPI
EvaluateDependency ( EvaluateDependency (
IN EFI_FIRMWARE_IMAGE_DEP *Dependencies, IN EFI_FIRMWARE_IMAGE_DEP *Dependencies,
IN UINTN DependenciesSize, IN UINTN DependenciesSize,
IN FMP_DEPEX_CHECK_VERSION_DATA *FmpVersions, OPTIONAL IN FMP_DEPEX_CHECK_VERSION_DATA *FmpVersions OPTIONAL,
IN UINTN FmpVersionsCount, IN UINTN FmpVersionsCount,
OUT UINT32 *LastAttemptStatus OPTIONAL OUT UINT32 *LastAttemptStatus OPTIONAL
); );

8
FmpDevicePkg/Include/Library/FmpDeviceLib.h
View File

@ -504,8 +504,8 @@ EFIAPI
FmpDeviceSetImage ( FmpDeviceSetImage (
IN CONST VOID *Image, IN CONST VOID *Image,
IN UINTN ImageSize, IN UINTN ImageSize,
IN CONST VOID *VendorCode, OPTIONAL IN CONST VOID *VendorCode OPTIONAL,
IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress, OPTIONAL IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress OPTIONAL,
IN UINT32 CapsuleFwVersion, IN UINT32 CapsuleFwVersion,
OUT CHAR16 **AbortReason OUT CHAR16 **AbortReason
); );
@ -578,8 +578,8 @@ EFIAPI
FmpDeviceSetImageWithStatus ( FmpDeviceSetImageWithStatus (
IN CONST VOID *Image, IN CONST VOID *Image,
IN UINTN ImageSize, IN UINTN ImageSize,
IN CONST VOID *VendorCode, OPTIONAL IN CONST VOID *VendorCode OPTIONAL,
IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress, OPTIONAL IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress OPTIONAL,
IN UINT32 CapsuleFwVersion, IN UINT32 CapsuleFwVersion,
OUT CHAR16 **AbortReason, OUT CHAR16 **AbortReason,
OUT UINT32 *LastAttemptStatus OUT UINT32 *LastAttemptStatus

2
FmpDevicePkg/Library/FmpDependencyCheckLib/FmpDependencyCheckLib.c
View File

@ -42,7 +42,7 @@ EFIAPI
CheckFmpDependency ( CheckFmpDependency (
IN EFI_GUID ImageTypeId, IN EFI_GUID ImageTypeId,
IN UINT32 Version, IN UINT32 Version,
IN EFI_FIRMWARE_IMAGE_DEP *Dependencies, OPTIONAL IN EFI_FIRMWARE_IMAGE_DEP *Dependencies OPTIONAL,
IN UINT32 DependenciesSize, IN UINT32 DependenciesSize,
OUT UINT32 *LastAttemptStatus OPTIONAL OUT UINT32 *LastAttemptStatus OPTIONAL
) )

2
FmpDevicePkg/Library/FmpDependencyCheckLibNull/FmpDependencyCheckLibNull.c
View File

@ -31,7 +31,7 @@ EFIAPI
CheckFmpDependency ( CheckFmpDependency (
IN EFI_GUID ImageTypeId, IN EFI_GUID ImageTypeId,
IN UINT32 Version, IN UINT32 Version,
IN EFI_FIRMWARE_IMAGE_DEP *Dependencies, OPTIONAL IN EFI_FIRMWARE_IMAGE_DEP *Dependencies OPTIONAL,
IN UINT32 DependenciesSize, IN UINT32 DependenciesSize,
OUT UINT32 *LastAttemptStatus OPTIONAL OUT UINT32 *LastAttemptStatus OPTIONAL
) )

3
FmpDevicePkg/Library/FmpDependencyLib/FmpDependencyLib.c
View File

@ -220,7 +220,7 @@ EFIAPI
EvaluateDependency ( EvaluateDependency (
IN EFI_FIRMWARE_IMAGE_DEP *Dependencies, IN EFI_FIRMWARE_IMAGE_DEP *Dependencies,
IN UINTN DependenciesSize, IN UINTN DependenciesSize,
IN FMP_DEPEX_CHECK_VERSION_DATA *FmpVersions, OPTIONAL IN FMP_DEPEX_CHECK_VERSION_DATA *FmpVersions OPTIONAL,
IN UINTN FmpVersionsCount, IN UINTN FmpVersionsCount,
OUT UINT32 *LastAttemptStatus OPTIONAL OUT UINT32 *LastAttemptStatus OPTIONAL
) )
@ -610,4 +610,3 @@ GetImageDependency (
return NULL; return NULL;
} }

8
FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c
View File

@ -519,8 +519,8 @@ EFIAPI
FmpDeviceSetImage ( FmpDeviceSetImage (
IN CONST VOID *Image, IN CONST VOID *Image,
IN UINTN ImageSize, IN UINTN ImageSize,
IN CONST VOID *VendorCode, OPTIONAL IN CONST VOID *VendorCode OPTIONAL,
IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress, OPTIONAL IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress OPTIONAL,
IN UINT32 CapsuleFwVersion, IN UINT32 CapsuleFwVersion,
OUT CHAR16 **AbortReason OUT CHAR16 **AbortReason
) )
@ -606,8 +606,8 @@ EFIAPI
FmpDeviceSetImageWithStatus ( FmpDeviceSetImageWithStatus (
IN CONST VOID *Image, IN CONST VOID *Image,
IN UINTN ImageSize, IN UINTN ImageSize,
IN CONST VOID *VendorCode, OPTIONAL IN CONST VOID *VendorCode OPTIONAL,
IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress, OPTIONAL IN EFI_FIRMWARE_MANAGEMENT_UPDATE_IMAGE_PROGRESS Progress OPTIONAL,
IN UINT32 CapsuleFwVersion, IN UINT32 CapsuleFwVersion,
OUT CHAR16 **AbortReason, OUT CHAR16 **AbortReason,
OUT UINT32 *LastAttemptStatus OUT UINT32 *LastAttemptStatus