.../CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c | 4 ++-- .../CapsuleUpdatePolicyDxe.inf | 2 +- FmpDevicePkg/FmpDevicePkg.dec | 4 ++-- FmpDevicePkg/FmpDevicePkg.dsc | 2 +- FmpDevicePkg/FmpDevicePkg.uni | 2 +- FmpDevicePkg/FmpDxe/FmpDxe.c | 12 ++++++------ FmpDevicePkg/Include/Library/FmpDeviceLib.h | 4 ++-- .../CapsuleUpdatePolicyLibOnProtocol.c | 2 +- .../CapsuleUpdatePolicyLibOnProtocol.inf | 2 +- FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c | 4 ++-- .../PrivateInclude/Protocol/CapsuleUpdatePolicy.h | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-)
From: Sean Brogan <sean.brogan@microsoft.com>
https://bugzilla.tianocore.org/show_bug.cgi?id=2262
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c | 4 ++--
.../CapsuleUpdatePolicyDxe.inf | 2 +-
FmpDevicePkg/FmpDevicePkg.dec | 4 ++--
FmpDevicePkg/FmpDevicePkg.dsc | 2 +-
FmpDevicePkg/FmpDevicePkg.uni | 2 +-
FmpDevicePkg/FmpDxe/FmpDxe.c | 12 ++++++------
FmpDevicePkg/Include/Library/FmpDeviceLib.h | 4 ++--
.../CapsuleUpdatePolicyLibOnProtocol.c | 2 +-
.../CapsuleUpdatePolicyLibOnProtocol.inf | 2 +-
FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c | 4 ++--
.../PrivateInclude/Protocol/CapsuleUpdatePolicy.h | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c b/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c
index d2571fd0e6..1035fd67dd 100644
--- a/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c
+++ b/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c
@@ -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);
diff --git a/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.inf b/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.inf
index d168780eb9..5ed7086b91 100644
--- a/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.inf
+++ b/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.inf
@@ -39,7 +39,7 @@ [LibraryClasses]
CapsuleUpdatePolicyLib
[Protocols]
- gEdkiiCapuleUpdatePolicyProtocolGuid ## PRODUCES
+ gEdkiiCapsuleUpdatePolicyProtocolGuid ## PRODUCES
[Depex]
TRUE
diff --git a/FmpDevicePkg/FmpDevicePkg.dec b/FmpDevicePkg/FmpDevicePkg.dec
index 8312b7cb22..55671878dd 100644
--- a/FmpDevicePkg/FmpDevicePkg.dec
+++ b/FmpDevicePkg/FmpDevicePkg.dec
@@ -50,12 +50,12 @@ [Guids]
[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>
diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc
index bf283b93ea..67b5aa7a32 100644
--- a/FmpDevicePkg/FmpDevicePkg.dsc
+++ b/FmpDevicePkg/FmpDevicePkg.dsc
@@ -60,7 +60,7 @@ [LibraryClasses]
[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.
#
diff --git a/FmpDevicePkg/FmpDevicePkg.uni b/FmpDevicePkg/FmpDevicePkg.uni
index 9e21130fae..263f88078b 100644
--- a/FmpDevicePkg/FmpDevicePkg.uni
+++ b/FmpDevicePkg/FmpDevicePkg.uni
@@ -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>"
diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.c b/FmpDevicePkg/FmpDxe/FmpDxe.c
index 3ca9d3526a..fe465af11e 100644
--- a/FmpDevicePkg/FmpDxe/FmpDxe.c
+++ b/FmpDevicePkg/FmpDxe/FmpDxe.c
@@ -963,7 +963,7 @@ SetTheImage (
VOID *FmpHeader;
UINTN FmpPayloadSize;
UINT32 AllHeaderSize;
- UINT32 IncommingFwVersion;
+ UINT32 IncomingFwVersion;
UINT32 LastAttemptStatus;
UINT32 Version;
UINT32 LowestSupportedVersion;
@@ -975,7 +975,7 @@ SetTheImage (
FmpHeader = NULL;
FmpPayloadSize = 0;
AllHeaderSize = 0;
- IncommingFwVersion = 0;
+ IncomingFwVersion = 0;
LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_UNSUCCESSFUL;
if (!FeaturePcdGet (PcdFmpDeviceStorageAccessEnable)) {
@@ -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.
@@ -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);
}
@@ -1158,7 +1158,7 @@ SetTheImage (
ImageSize - AllHeaderSize,
VendorCode,
FmpDxeProgress,
- IncommingFwVersion,
+ IncomingFwVersion,
AbortReason
);
if (EFI_ERROR (Status)) {
diff --git a/FmpDevicePkg/Include/Library/FmpDeviceLib.h b/FmpDevicePkg/Include/Library/FmpDeviceLib.h
index 1e498c13ce..9a89f5c2ee 100644
--- a/FmpDevicePkg/Include/Library/FmpDeviceLib.h
+++ b/FmpDevicePkg/Include/Library/FmpDeviceLib.h
@@ -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.
@@ -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
diff --git a/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.c b/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.c
index 2c7c37fa92..6f916888c7 100644
--- a/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.c
+++ b/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.c
@@ -37,7 +37,7 @@ LookupCapsuleUpdatePolicyProtocol (
return TRUE;
}
Status = gBS->LocateProtocol (
- &gEdkiiCapuleUpdatePolicyProtocolGuid,
+ &gEdkiiCapsuleUpdatePolicyProtocolGuid,
NULL,
(VOID **)&mCapsuleUpdatePolicy
);
diff --git a/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.inf b/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.inf
index 042daaabce..a56b836d22 100644
--- a/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.inf
+++ b/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.inf
@@ -37,4 +37,4 @@ [LibraryClasses]
UefiBootServicesTableLib
[Protocols]
- gEdkiiCapuleUpdatePolicyProtocolGuid ## CONSUMES
+ gEdkiiCapsuleUpdatePolicyProtocolGuid ## CONSUMES
diff --git a/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c b/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c
index fd219cb70b..316de12e91 100644
--- a/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c
+++ b/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c
@@ -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.
@@ -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
diff --git a/FmpDevicePkg/PrivateInclude/Protocol/CapsuleUpdatePolicy.h b/FmpDevicePkg/PrivateInclude/Protocol/CapsuleUpdatePolicy.h
index 871f0a1854..4f7d917295 100644
--- a/FmpDevicePkg/PrivateInclude/Protocol/CapsuleUpdatePolicy.h
+++ b/FmpDevicePkg/PrivateInclude/Protocol/CapsuleUpdatePolicy.h
@@ -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
--
2.21.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#49245): https://edk2.groups.io/g/devel/message/49245
Mute This Topic: https://groups.io/mt/35103493/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
On 10/18/19 10:24 PM, Michael D Kinney wrote:
> From: Sean Brogan <sean.brogan@microsoft.com>
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=2262
>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c | 4 ++--
> .../CapsuleUpdatePolicyDxe.inf | 2 +-
> FmpDevicePkg/FmpDevicePkg.dec | 4 ++--
> FmpDevicePkg/FmpDevicePkg.dsc | 2 +-
> FmpDevicePkg/FmpDevicePkg.uni | 2 +-
> FmpDevicePkg/FmpDxe/FmpDxe.c | 12 ++++++------
> FmpDevicePkg/Include/Library/FmpDeviceLib.h | 4 ++--
> .../CapsuleUpdatePolicyLibOnProtocol.c | 2 +-
> .../CapsuleUpdatePolicyLibOnProtocol.inf | 2 +-
> FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c | 4 ++--
> .../PrivateInclude/Protocol/CapsuleUpdatePolicy.h | 2 +-
> 11 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c b/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c
> index d2571fd0e6..1035fd67dd 100644
> --- a/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c
> +++ b/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c
> @@ -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);
> diff --git a/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.inf b/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.inf
> index d168780eb9..5ed7086b91 100644
> --- a/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.inf
> +++ b/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.inf
> @@ -39,7 +39,7 @@ [LibraryClasses]
> CapsuleUpdatePolicyLib
>
> [Protocols]
> - gEdkiiCapuleUpdatePolicyProtocolGuid ## PRODUCES
> + gEdkiiCapsuleUpdatePolicyProtocolGuid ## PRODUCES
>
> [Depex]
> TRUE
> diff --git a/FmpDevicePkg/FmpDevicePkg.dec b/FmpDevicePkg/FmpDevicePkg.dec
> index 8312b7cb22..55671878dd 100644
> --- a/FmpDevicePkg/FmpDevicePkg.dec
> +++ b/FmpDevicePkg/FmpDevicePkg.dec
> @@ -50,12 +50,12 @@ [Guids]
>
> [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>
> diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc
> index bf283b93ea..67b5aa7a32 100644
> --- a/FmpDevicePkg/FmpDevicePkg.dsc
> +++ b/FmpDevicePkg/FmpDevicePkg.dsc
> @@ -60,7 +60,7 @@ [LibraryClasses]
> [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.
> #
> diff --git a/FmpDevicePkg/FmpDevicePkg.uni b/FmpDevicePkg/FmpDevicePkg.uni
> index 9e21130fae..263f88078b 100644
> --- a/FmpDevicePkg/FmpDevicePkg.uni
> +++ b/FmpDevicePkg/FmpDevicePkg.uni
> @@ -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>"
> diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.c b/FmpDevicePkg/FmpDxe/FmpDxe.c
> index 3ca9d3526a..fe465af11e 100644
> --- a/FmpDevicePkg/FmpDxe/FmpDxe.c
> +++ b/FmpDevicePkg/FmpDxe/FmpDxe.c
> @@ -963,7 +963,7 @@ SetTheImage (
> VOID *FmpHeader;
> UINTN FmpPayloadSize;
> UINT32 AllHeaderSize;
> - UINT32 IncommingFwVersion;
> + UINT32 IncomingFwVersion;
> UINT32 LastAttemptStatus;
> UINT32 Version;
> UINT32 LowestSupportedVersion;
> @@ -975,7 +975,7 @@ SetTheImage (
> FmpHeader = NULL;
> FmpPayloadSize = 0;
> AllHeaderSize = 0;
> - IncommingFwVersion = 0;
> + IncomingFwVersion = 0;
> LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_UNSUCCESSFUL;
>
> if (!FeaturePcdGet (PcdFmpDeviceStorageAccessEnable)) {
> @@ -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.
> @@ -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);
> }
>
>
> @@ -1158,7 +1158,7 @@ SetTheImage (
> ImageSize - AllHeaderSize,
> VendorCode,
> FmpDxeProgress,
> - IncommingFwVersion,
> + IncomingFwVersion,
> AbortReason
> );
> if (EFI_ERROR (Status)) {
> diff --git a/FmpDevicePkg/Include/Library/FmpDeviceLib.h b/FmpDevicePkg/Include/Library/FmpDeviceLib.h
> index 1e498c13ce..9a89f5c2ee 100644
> --- a/FmpDevicePkg/Include/Library/FmpDeviceLib.h
> +++ b/FmpDevicePkg/Include/Library/FmpDeviceLib.h
> @@ -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.
> @@ -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.
Nice.
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
> @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
> diff --git a/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.c b/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.c
> index 2c7c37fa92..6f916888c7 100644
> --- a/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.c
> +++ b/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.c
> @@ -37,7 +37,7 @@ LookupCapsuleUpdatePolicyProtocol (
> return TRUE;
> }
> Status = gBS->LocateProtocol (
> - &gEdkiiCapuleUpdatePolicyProtocolGuid,
> + &gEdkiiCapsuleUpdatePolicyProtocolGuid,
> NULL,
> (VOID **)&mCapsuleUpdatePolicy
> );
> diff --git a/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.inf b/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.inf
> index 042daaabce..a56b836d22 100644
> --- a/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.inf
> +++ b/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdatePolicyLibOnProtocol.inf
> @@ -37,4 +37,4 @@ [LibraryClasses]
> UefiBootServicesTableLib
>
> [Protocols]
> - gEdkiiCapuleUpdatePolicyProtocolGuid ## CONSUMES
> + gEdkiiCapsuleUpdatePolicyProtocolGuid ## CONSUMES
> diff --git a/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c b/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c
> index fd219cb70b..316de12e91 100644
> --- a/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c
> +++ b/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c
> @@ -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.
> @@ -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
> diff --git a/FmpDevicePkg/PrivateInclude/Protocol/CapsuleUpdatePolicy.h b/FmpDevicePkg/PrivateInclude/Protocol/CapsuleUpdatePolicy.h
> index 871f0a1854..4f7d917295 100644
> --- a/FmpDevicePkg/PrivateInclude/Protocol/CapsuleUpdatePolicy.h
> +++ b/FmpDevicePkg/PrivateInclude/Protocol/CapsuleUpdatePolicy.h
> @@ -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
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#49337): https://edk2.groups.io/g/devel/message/49337
Mute This Topic: https://groups.io/mt/35103493/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Liming Gao <liming.gao@intel.com>
>-----Original Message-----
>From: Philippe Mathieu-Daudé [mailto:philmd@redhat.com]
>Sent: Tuesday, October 22, 2019 8:44 PM
>To: devel@edk2.groups.io; Kinney, Michael D <michael.d.kinney@intel.com>
>Cc: Sean Brogan <sean.brogan@microsoft.com>; Gao, Liming
><liming.gao@intel.com>
>Subject: Re: [edk2-devel] [Patch] FmpDevicePkg: Fix spelling errors
>
>On 10/18/19 10:24 PM, Michael D Kinney wrote:
>> From: Sean Brogan <sean.brogan@microsoft.com>
>>
>> https://bugzilla.tianocore.org/show_bug.cgi?id=2262
>>
>> Cc: Liming Gao <liming.gao@intel.com>
>> Cc: Michael D Kinney <michael.d.kinney@intel.com>
>> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
>> ---
>> .../CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c | 4 ++--
>> .../CapsuleUpdatePolicyDxe.inf | 2 +-
>> FmpDevicePkg/FmpDevicePkg.dec | 4 ++--
>> FmpDevicePkg/FmpDevicePkg.dsc | 2 +-
>> FmpDevicePkg/FmpDevicePkg.uni | 2 +-
>> FmpDevicePkg/FmpDxe/FmpDxe.c | 12 ++++++------
>> FmpDevicePkg/Include/Library/FmpDeviceLib.h | 4 ++--
>> .../CapsuleUpdatePolicyLibOnProtocol.c | 2 +-
>> .../CapsuleUpdatePolicyLibOnProtocol.inf | 2 +-
>> FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c | 4 ++--
>> .../PrivateInclude/Protocol/CapsuleUpdatePolicy.h | 2 +-
>> 11 files changed, 20 insertions(+), 20 deletions(-)
>>
>> diff --git
>a/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c
>b/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c
>> index d2571fd0e6..1035fd67dd 100644
>> --- a/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c
>> +++ b/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.c
>> @@ -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);
>> diff --git
>a/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.inf
>b/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.inf
>> index d168780eb9..5ed7086b91 100644
>> --- a/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.inf
>> +++
>b/FmpDevicePkg/CapsuleUpdatePolicyDxe/CapsuleUpdatePolicyDxe.inf
>> @@ -39,7 +39,7 @@ [LibraryClasses]
>> CapsuleUpdatePolicyLib
>>
>> [Protocols]
>> - gEdkiiCapuleUpdatePolicyProtocolGuid ## PRODUCES
>> + gEdkiiCapsuleUpdatePolicyProtocolGuid ## PRODUCES
>>
>> [Depex]
>> TRUE
>> diff --git a/FmpDevicePkg/FmpDevicePkg.dec
>b/FmpDevicePkg/FmpDevicePkg.dec
>> index 8312b7cb22..55671878dd 100644
>> --- a/FmpDevicePkg/FmpDevicePkg.dec
>> +++ b/FmpDevicePkg/FmpDevicePkg.dec
>> @@ -50,12 +50,12 @@ [Guids]
>>
>> [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>
>> diff --git a/FmpDevicePkg/FmpDevicePkg.dsc
>b/FmpDevicePkg/FmpDevicePkg.dsc
>> index bf283b93ea..67b5aa7a32 100644
>> --- a/FmpDevicePkg/FmpDevicePkg.dsc
>> +++ b/FmpDevicePkg/FmpDevicePkg.dsc
>> @@ -60,7 +60,7 @@ [LibraryClasses]
>> [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.
>> #
>> diff --git a/FmpDevicePkg/FmpDevicePkg.uni
>b/FmpDevicePkg/FmpDevicePkg.uni
>> index 9e21130fae..263f88078b 100644
>> --- a/FmpDevicePkg/FmpDevicePkg.uni
>> +++ b/FmpDevicePkg/FmpDevicePkg.uni
>> @@ -19,7 +19,7 @@
>> #string
>STR_gFmpDevicePkgTokenSpaceGuid_PcdFmpDeviceStorageAccessEnable_P
>ROMPT #language en-US "Firmware Device Storage Access Enabled."
>> #string
>STR_gFmpDevicePkgTokenSpaceGuid_PcdFmpDeviceStorageAccessEnable_H
>ELP #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>"
>> diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.c
>b/FmpDevicePkg/FmpDxe/FmpDxe.c
>> index 3ca9d3526a..fe465af11e 100644
>> --- a/FmpDevicePkg/FmpDxe/FmpDxe.c
>> +++ b/FmpDevicePkg/FmpDxe/FmpDxe.c
>> @@ -963,7 +963,7 @@ SetTheImage (
>> VOID *FmpHeader;
>> UINTN FmpPayloadSize;
>> UINT32 AllHeaderSize;
>> - UINT32 IncommingFwVersion;
>> + UINT32 IncomingFwVersion;
>> UINT32 LastAttemptStatus;
>> UINT32 Version;
>> UINT32 LowestSupportedVersion;
>> @@ -975,7 +975,7 @@ SetTheImage (
>> FmpHeader = NULL;
>> FmpPayloadSize = 0;
>> AllHeaderSize = 0;
>> - IncommingFwVersion = 0;
>> + IncomingFwVersion = 0;
>> LastAttemptStatus = LAST_ATTEMPT_STATUS_ERROR_UNSUCCESSFUL;
>>
>> if (!FeaturePcdGet (PcdFmpDeviceStorageAccessEnable)) {
>> @@ -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.
>> @@ -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);
>> }
>>
>>
>> @@ -1158,7 +1158,7 @@ SetTheImage (
>> ImageSize - AllHeaderSize,
>> VendorCode,
>> FmpDxeProgress,
>> - IncommingFwVersion,
>> + IncomingFwVersion,
>> AbortReason
>> );
>> if (EFI_ERROR (Status)) {
>> diff --git a/FmpDevicePkg/Include/Library/FmpDeviceLib.h
>b/FmpDevicePkg/Include/Library/FmpDeviceLib.h
>> index 1e498c13ce..9a89f5c2ee 100644
>> --- a/FmpDevicePkg/Include/Library/FmpDeviceLib.h
>> +++ b/FmpDevicePkg/Include/Library/FmpDeviceLib.h
>> @@ -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.
>> @@ -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.
>
>Nice.
>
>Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
>
>> @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
>> diff --git
>a/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdate
>PolicyLibOnProtocol.c
>b/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdate
>PolicyLibOnProtocol.c
>> index 2c7c37fa92..6f916888c7 100644
>> ---
>a/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdate
>PolicyLibOnProtocol.c
>> +++
>b/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdate
>PolicyLibOnProtocol.c
>> @@ -37,7 +37,7 @@ LookupCapsuleUpdatePolicyProtocol (
>> return TRUE;
>> }
>> Status = gBS->LocateProtocol (
>> - &gEdkiiCapuleUpdatePolicyProtocolGuid,
>> + &gEdkiiCapsuleUpdatePolicyProtocolGuid,
>> NULL,
>> (VOID **)&mCapsuleUpdatePolicy
>> );
>> diff --git
>a/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdate
>PolicyLibOnProtocol.inf
>b/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdate
>PolicyLibOnProtocol.inf
>> index 042daaabce..a56b836d22 100644
>> ---
>a/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdate
>PolicyLibOnProtocol.inf
>> +++
>b/FmpDevicePkg/Library/CapsuleUpdatePolicyLibOnProtocol/CapsuleUpdate
>PolicyLibOnProtocol.inf
>> @@ -37,4 +37,4 @@ [LibraryClasses]
>> UefiBootServicesTableLib
>>
>> [Protocols]
>> - gEdkiiCapuleUpdatePolicyProtocolGuid ## CONSUMES
>> + gEdkiiCapsuleUpdatePolicyProtocolGuid ## CONSUMES
>> diff --git a/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c
>b/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c
>> index fd219cb70b..316de12e91 100644
>> --- a/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c
>> +++ b/FmpDevicePkg/Library/FmpDeviceLibNull/FmpDeviceLib.c
>> @@ -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.
>> @@ -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
>> diff --git a/FmpDevicePkg/PrivateInclude/Protocol/CapsuleUpdatePolicy.h
>b/FmpDevicePkg/PrivateInclude/Protocol/CapsuleUpdatePolicy.h
>> index 871f0a1854..4f7d917295 100644
>> --- a/FmpDevicePkg/PrivateInclude/Protocol/CapsuleUpdatePolicy.h
>> +++ b/FmpDevicePkg/PrivateInclude/Protocol/CapsuleUpdatePolicy.h
>> @@ -127,6 +127,6 @@ struct
>_EDKII_CAPSULE_UPDATE_POLICY_PROTOCOL {
>>
>EDKII_CAPSULE_UPDATE_POLICY_IS_FMP_DEVICE_AT_LOCK_EVENT_REQUI
>RED IsLockFmpDeviceAtLockEventGuidRequired;
>> };
>>
>> -extern EFI_GUID gEdkiiCapuleUpdatePolicyProtocolGuid;
>> +extern EFI_GUID gEdkiiCapsuleUpdatePolicyProtocolGuid;
>>
>> #endif
>>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#49378): https://edk2.groups.io/g/devel/message/49378
Mute This Topic: https://groups.io/mt/35103493/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.