Skip to content

Commit

Permalink
FmpDevicePkg: Fix spelling errors
Browse files Browse the repository at this point in the history
https://bugzilla.tianocore.org/show_bug.cgi?id=2262

Cc: Liming Gao <[email protected]>
Cc: Michael D Kinney <[email protected]>
Signed-off-by: Michael D Kinney <[email protected]>
Reviewed-by: Philippe Mathieu-Daude <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
  • Loading branch information
spbrogan authored and mdkinney committed Oct 23, 2019
1 parent 5c7006c commit 95d2883
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@ CapsuleUpdatePolicyInitialize (
{
EFI_STATUS Status;

ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEdkiiCapuleUpdatePolicyProtocolGuid);
ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEdkiiCapsuleUpdatePolicyProtocolGuid);
Status = gBS->InstallMultipleProtocolInterfaces (
&mHandle,
&gEdkiiCapuleUpdatePolicyProtocolGuid, &mCapsuleUpdatePolicy,
&gEdkiiCapsuleUpdatePolicyProtocolGuid, &mCapsuleUpdatePolicy,
NULL
);
ASSERT_EFI_ERROR (Status);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
CapsuleUpdatePolicyLib

[Protocols]
gEdkiiCapuleUpdatePolicyProtocolGuid ## PRODUCES
gEdkiiCapsuleUpdatePolicyProtocolGuid ## PRODUCES

[Depex]
TRUE
Expand Down
4 changes: 2 additions & 2 deletions FmpDevicePkg/FmpDevicePkg.dec
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@

[Protocols.Common.Private]
## Capsule Update Policy Protocol
gEdkiiCapuleUpdatePolicyProtocolGuid = { 0x487784c5, 0x6299, 0x4ba6, { 0xb0, 0x96, 0x5c, 0xc5, 0x27, 0x7c, 0xf7, 0x57 } }
gEdkiiCapsuleUpdatePolicyProtocolGuid = { 0x487784c5, 0x6299, 0x4ba6, { 0xb0, 0x96, 0x5c, 0xc5, 0x27, 0x7c, 0xf7, 0x57 } }

[PcdsFeatureFlag]
## Indicates if the Firmware Management Protocol supports access to
# to a firmware storage device. If set to FALSE, then only GetImageInfo()
# is supported. This is used by FMP drivers that require the samllest
# is supported. This is used by FMP drivers that require the smallest
# possible Firmware Management Protocol implementation that supports
# advertising the updatable firmware device in the ESRT.<BR>
# TRUE - All Firmware Management Protocol services supported.<BR>
Expand Down
2 changes: 1 addition & 1 deletion FmpDevicePkg/FmpDevicePkg.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
[LibraryClasses.ARM, LibraryClasses.AARCH64]
#
# It is not possible to prevent the ARM compiler for generic intrinsic functions.
# This library provides the instrinsic functions generate by a given compiler.
# This library provides the intrinsic functions generate by a given compiler.
# [LibraryClasses.ARM, LibraryClasses.AARCH64] and NULL mean link this library
# into all ARM and AARCH64 images.
#
Expand Down
2 changes: 1 addition & 1 deletion FmpDevicePkg/FmpDevicePkg.uni
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#string STR_gFmpDevicePkgTokenSpaceGuid_PcdFmpDeviceStorageAccessEnable_PROMPT #language en-US "Firmware Device Storage Access Enabled."
#string STR_gFmpDevicePkgTokenSpaceGuid_PcdFmpDeviceStorageAccessEnable_HELP #language en-US "Indicates if the Firmware Management Protocol supports access to"
"to a firmware storage device. If set to FALSE, then only GetImageInfo()"
"is supported. This is used by FMP drivers that require the samllest"
"is supported. This is used by FMP drivers that require the smallest"
"possible Firmware Management Protocol implementation that supports"
"advertising the updatable firmware device in the ESRT.<BR>"
" TRUE - All Firmware Management Protocol services supported.<BR>"
Expand Down
12 changes: 6 additions & 6 deletions FmpDevicePkg/FmpDxe/FmpDxe.c
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ SetTheImage (
VOID *FmpHeader;
UINTN FmpPayloadSize;
UINT32 AllHeaderSize;
UINT32 IncommingFwVersion;
UINT32 IncomingFwVersion;
UINT32 LastAttemptStatus;
UINT32 Version;
UINT32 LowestSupportedVersion;
Expand All @@ -975,7 +975,7 @@ SetTheImage (
FmpHeader = NULL;
FmpPayloadSize = 0;
AllHeaderSize = 0;
IncommingFwVersion = 0;
IncomingFwVersion = 0;
LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_UNSUCCESSFUL;

if (!FeaturePcdGet (PcdFmpDeviceStorageAccessEnable)) {
Expand All @@ -996,7 +996,7 @@ SetTheImage (
//
// Set to 0 to clear any previous results.
//
SetLastAttemptVersionInVariable (Private, IncommingFwVersion);
SetLastAttemptVersionInVariable (Private, IncomingFwVersion);

//
// if we have locked the device, then skip the set operation.
Expand Down Expand Up @@ -1030,12 +1030,12 @@ SetTheImage (
Status = EFI_ABORTED;
goto cleanup;
}
Status = GetFmpPayloadHeaderVersion (FmpHeader, FmpPayloadSize, &IncommingFwVersion);
Status = GetFmpPayloadHeaderVersion (FmpHeader, FmpPayloadSize, &IncomingFwVersion);
if (!EFI_ERROR (Status)) {
//
// Set to actual value
//
SetLastAttemptVersionInVariable (Private, IncommingFwVersion);
SetLastAttemptVersionInVariable (Private, IncomingFwVersion);
}


Expand Down Expand Up @@ -1158,7 +1158,7 @@ SetTheImage (
ImageSize - AllHeaderSize,
VendorCode,
FmpDxeProgress,
IncommingFwVersion,
IncomingFwVersion,
AbortReason
);
if (EFI_ERROR (Status)) {
Expand Down
4 changes: 2 additions & 2 deletions FmpDevicePkg/Include/Library/FmpDeviceLib.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ RegisterFmpInstaller (
Protocol.
@retval EFI_SUCCESS The device is managed by a driver that follows the
UEFI Driver Model. FmpUinstaller must be called on
UEFI Driver Model. FmpUninstaller must be called on
each Driver Binding Stop().
@retval EFI_UNSUPPORTED The device is not managed by a driver that follows
the UEFI Driver Model.
Expand Down Expand Up @@ -321,7 +321,7 @@ FmpDeviceGetVersion (
device.
@retval EFI_SUCCESS The hardware instance for the current firmware
devide is returned in HardwareInstance.
device is returned in HardwareInstance.
@retval EFI_UNSUPPORTED The firmware device does not support a method to
report the hardware instance value.
@retval EFI_DEVICE_ERROR An error occurred attempting to retrieve the hardware
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ LookupCapsuleUpdatePolicyProtocol (
return TRUE;
}
Status = gBS->LocateProtocol (
&gEdkiiCapuleUpdatePolicyProtocolGuid,
&gEdkiiCapsuleUpdatePolicyProtocolGuid,
NULL,
(VOID **)&mCapsuleUpdatePolicy
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@
UefiBootServicesTableLib

[Protocols]
gEdkiiCapuleUpdatePolicyProtocolGuid ## CONSUMES
gEdkiiCapsuleUpdatePolicyProtocolGuid ## CONSUMES
4 changes: 2 additions & 2 deletions FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RegisterFmpInstaller (
Protocol.
@retval EFI_SUCCESS The device is managed by a driver that follows the
UEFI Driver Model. FmpUinstaller must be called on
UEFI Driver Model. FmpUninstaller must be called on
each Driver Binding Stop().
@retval EFI_UNSUPPORTED The device is not managed by a driver that follows
the UEFI Driver Model.
Expand Down Expand Up @@ -319,7 +319,7 @@ FmpDeviceGetVersion (
device.
@retval EFI_SUCCESS The hardware instance for the current firmware
devide is returned in HardwareInstance.
device is returned in HardwareInstance.
@retval EFI_UNSUPPORTED The firmware device does not support a method to
report the hardware instance value.
@retval EFI_DEVICE_ERROR An error occurred attempting to retrieve the hardware
Expand Down
2 changes: 1 addition & 1 deletion FmpDevicePkg/PrivateInclude/Protocol/CapsuleUpdatePolicy.h
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,6 @@ struct _EDKII_CAPSULE_UPDATE_POLICY_PROTOCOL {
EDKII_CAPSULE_UPDATE_POLICY_IS_FMP_DEVICE_AT_LOCK_EVENT_REQUIRED IsLockFmpDeviceAtLockEventGuidRequired;
};

extern EFI_GUID gEdkiiCapuleUpdatePolicyProtocolGuid;
extern EFI_GUID gEdkiiCapsuleUpdatePolicyProtocolGuid;

#endif

0 comments on commit 95d2883

Please sign in to comment.