Fix various typos in SignedCapsulePkg. --- .../Include/Guid/EdkiiSystemFmpCapsule.h | 4 +-- .../Include/Library/IniParsingLib.h | 14 +++++----- .../Library/IniParsingLib/IniParsingLib.c | 26 +++++++++---------- SignedCapsulePkg/SignedCapsulePkg.dec | 4 +-- .../ParseConfigProfile.c | 2 +- .../RecoveryModuleLoadPei.c | 14 +++++----- .../SystemFirmwareUpdate/ParseConfigProfile.c | 2 +- .../SystemFirmwareCommonDxe.c | 4 +-- .../SystemFirmwareUpdate/SystemFirmwareDxe.h | 2 +- .../SystemFirmwareReportDxe.c | 8 +++--- .../SystemFirmwareUpdateDxe.c | 4 +-- 11 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/SignedCapsulePkg/Include/Guid/EdkiiSystemFmpCapsule.h b/SignedCapsulePkg/Include/Guid/EdkiiSystemFmpCapsule.h index 1129d715ae..8295f92a73 100644 --- a/SignedCapsulePkg/Include/Guid/EdkiiSystemFmpCapsule.h +++ b/SignedCapsulePkg/Include/Guid/EdkiiSystemFmpCapsule.h @@ -60,7 +60,7 @@ ImageOffset = <ImageOffset> # Fv offset of this SystemFirmware image (HEX) FileGuid = XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX # PcdEdkiiSystemFirmwareFileGuid - NOTE: The [Name?] entry may have differnt FileGuid. + NOTE: The [Name?] entry may have different FileGuid. Only the one, whose FileGuid matches PcdEdkiiSystemFirmwareFileGuid, takes effect. The other entry is ignored. @@ -80,7 +80,7 @@ ImageOffset = <ImageOffset> # Image offset of this SystemFirmware image (HEX) FileGuid = XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX # PcdEdkiiSystemFirmwareFileGuid - NOTE: The [Name?] entry may have differnt FileGuid. + NOTE: The [Name?] entry may have different FileGuid. Only the one, whose FileGuid matches PcdEdkiiSystemFirmwareFileGuid, takes effect. The other entry is ignored. diff --git a/SignedCapsulePkg/Include/Library/IniParsingLib.h b/SignedCapsulePkg/Include/Library/IniParsingLib.h index 26d100ffde..edfdde7e8d 100644 --- a/SignedCapsulePkg/Include/Library/IniParsingLib.h +++ b/SignedCapsulePkg/Include/Library/IniParsingLib.h @@ -14,7 +14,7 @@ 3.1) an ASCII String. The valid format is [A-Za-z0-9_]+ 3.2) a GUID. The valid format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx, where x is [A-Fa-f0-9] 3.3) a decimal value. The valid format is [0-9]+ - 3.4) a heximal value. The valid format is 0x[A-Fa-f0-9]+ + 3.4) a hexadecimal value. The valid format is 0x[A-Fa-f0-9]+ 4) '#' or ';' can be used as comment at anywhere. 5) TAB(0x20) or SPACE(0x9) can be used as separator. 6) LF(\n, 0xA) or CR(\r, 0xD) can be used as line break. @@ -106,14 +106,14 @@ GetDecimalUintnFromDataFile ( ); /** - Get section entry heximal UINTN value. + Get section entry hexadecimal UINTN value. @param[in] Context INI Config file context. @param[in] SectionName Section name. @param[in] EntryName Section entry name. - @param[out] Data Point to the got heximal UINTN value. + @param[out] Data Point to the got hexadecimal UINTN value. - @retval EFI_SUCCESS Section entry heximal UINTN value is got. + @retval EFI_SUCCESS Section entry hexadecimal UINTN value is got. @retval EFI_NOT_FOUND Section is not found. **/ EFI_STATUS @@ -126,14 +126,14 @@ GetHexUintnFromDataFile ( ); /** - Get section entry heximal UINT64 value. + Get section entry hexadecimal UINT64 value. @param[in] Context INI Config file context. @param[in] SectionName Section name. @param[in] EntryName Section entry name. - @param[out] Data Point to the got heximal UINT64 value. + @param[out] Data Point to the got hexadecimal UINT64 value. - @retval EFI_SUCCESS Section entry heximal UINT64 value is got. + @retval EFI_SUCCESS Section entry hexadecimal UINT64 value is got. @retval EFI_NOT_FOUND Section is not found. **/ EFI_STATUS diff --git a/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c b/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c index 757d65a206..bea45e0d3b 100644 --- a/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c +++ b/SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.c @@ -14,7 +14,7 @@ 3.1) an ASCII String. The valid format is [A-Za-z0-9_]+ 3.2) a GUID. The valid format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx, where x is [A-Fa-f0-9] 3.3) a decimal value. The valid format is [0-9]+ - 3.4) a heximal value. The valid format is 0x[A-Fa-f0-9]+ + 3.4) a hexadecimal value. The valid format is 0x[A-Fa-f0-9]+ 4) '#' or ';' can be used as comment at anywhere. 5) TAB(0x20) or SPACE(0x9) can be used as separator. 6) LF(\n, 0xA) or CR(\r, 0xD) can be used as line break. @@ -165,13 +165,13 @@ IsValidDecimalString ( } /** - Return if the heximal string is valid. + Return if the hexadecimal string is valid. - @param[in] Hex The heximal string to be checked. - @param[in] Length The length of heximal string in bytes. + @param[in] Hex The hexadecimal string to be checked. + @param[in] Length The length of hexadecimal string in bytes. - @retval TRUE The heximal string is valid. - @retval FALSE The heximal string is invalid. + @retval TRUE The hexadecimal string is valid. + @retval FALSE The hexadecimal string is invalid. **/ BOOLEAN IsValidHexString ( @@ -388,7 +388,7 @@ ProfileGetLine ( /** Trim Buffer by removing all CR, LF, TAB, and SPACE chars in its head and tail. - @param[in, out] Buffer On input, buffer data to be trimed. + @param[in, out] Buffer On input, buffer data to be trimmed. On output, the trimmed buffer. @param[in, out] BufferSize On input, size of original buffer data. On output, size of the trimmed buffer. @@ -1166,14 +1166,14 @@ GetDecimalUintnFromDataFile ( } /** - Get section entry heximal UINTN value. + Get section entry hexadecimal UINTN value. @param[in] Context INI Config file context. @param[in] SectionName Section name. @param[in] EntryName Section entry name. - @param[out] Data Point to the got heximal UINTN value. + @param[out] Data Point to the got hexadecimal UINTN value. - @retval EFI_SUCCESS Section entry heximal UINTN value is got. + @retval EFI_SUCCESS Section entry hexadecimal UINTN value is got. @retval EFI_NOT_FOUND Section is not found. **/ EFI_STATUS @@ -1210,14 +1210,14 @@ GetHexUintnFromDataFile ( } /** - Get section entry heximal UINT64 value. + Get section entry hexadecimal UINT64 value. @param[in] Context INI Config file context. @param[in] SectionName Section name. @param[in] EntryName Section entry name. - @param[out] Data Point to the got heximal UINT64 value. + @param[out] Data Point to the got hexadecimal UINT64 value. - @retval EFI_SUCCESS Section entry heximal UINT64 value is got. + @retval EFI_SUCCESS Section entry hexadecimal UINT64 value is got. @retval EFI_NOT_FOUND Section is not found. **/ EFI_STATUS diff --git a/SignedCapsulePkg/SignedCapsulePkg.dec b/SignedCapsulePkg/SignedCapsulePkg.dec index 3492de6c8b..04dbf62af4 100644 --- a/SignedCapsulePkg/SignedCapsulePkg.dec +++ b/SignedCapsulePkg/SignedCapsulePkg.dec @@ -53,7 +53,7 @@ [PcdsDynamicEx] ## This dynamic PCD holds the EDKII system firmware image descriptor. # This information can be used for version check in EDKII system FMP capsule. - # Only if the new EdkiiSystemFrimwareImageDescriptor.Version is not less than + # Only if the new EdkiiSystemFirmwareImageDescriptor.Version is not less than # the current PcdEdkiiSystemFirmwareImageDescriptor.LowestSupportedVersion, # the EDKII system FmpCapsule will be processed. # The data structure of this PCD is EDKII_SYSTEM_FIRMWARE_IMAGE_DESCRIPTOR, @@ -65,7 +65,7 @@ ## This dynamic PCD hold the GUID of a firmware FFS which includes EDKII # system firmware image. - # An EDKII system firmware udpate module need consume this PCD to extract + # An EDKII system firmware update module need consume this PCD to extract # the EDKII system firmware from the capsule image. # It must be in [PcdsDynamicEx], because the EDKII system firmware update module may # consume the PCD produced in current system firmware image. diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c index ee9787a2bf..5cd690ddeb 100644 --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c @@ -103,7 +103,7 @@ ParseRecoveryDataFile ( // // - // FileBuid + // FileGuid // Status = GetGuidFromDataFile( Context, diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c index eda3cc5420..53b821c2bb 100644 --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPei.c @@ -20,7 +20,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include <Uefi.h> #include <PiPei.h> // -// The protocols, PPI and GUID defintions for this module +// The protocols, PPI and GUID definitions for this module // #include <Ppi/MasterBootMode.h> #include <Ppi/BootInRecoveryMode.h> @@ -144,7 +144,7 @@ IsFmpCapsuleGuid ( } /** - This function assumes the input Capusule image already passes basic check in + This function assumes the input Capsule image already passes basic check in ValidateFmpCapsule(). Criteria of system FMP capsule is: @@ -235,7 +235,7 @@ IsValidCapsuleHeader ( @param[out] IsSystemFmp If it is a system FMP. @param[out] EmbeddedDriverCount The EmbeddedDriverCount in the FMP capsule. - @retval EFI_SUCESS Input capsule is a correct FMP capsule. + @retval EFI_SUCCESS Input capsule is a correct FMP capsule. @retval EFI_INVALID_PARAMETER Input capsule is not a correct FMP capsule. **/ EFI_STATUS @@ -398,7 +398,7 @@ InitializeRecoveryModule ( @param[in] FvImage Points to the DXE FV image. @param[in] FvImageSize The length of the DXE FV image in bytes. - @retval EFI_SUCESS Create hob and install FvInfo PPI successfully. + @retval EFI_SUCCESS Create hob and install FvInfo PPI successfully. @retval EFI_VOLUME_CORRUPTED The input data is not an FV. @retval EFI_OUT_OF_RESOURCES No enough resource to process the input data. **/ @@ -479,7 +479,7 @@ CreateHobForRecoveryCapsule ( @param[in] ConfigImage Points to the config file image. @param[in] ConfigImageSize The length of the config file image in bytes. - @retval EFI_SUCESS Process Recovery Image successfully. + @retval EFI_SUCCESS Process Recovery Image successfully. **/ EFI_STATUS RecoverImage ( @@ -554,7 +554,7 @@ RecoverImage ( @param[in] Image Points to the recovery image. @param[in] Length The length of the recovery image in bytes. - @retval EFI_SUCESS Process Recovery Image successfully. + @retval EFI_SUCCESS Process Recovery Image successfully. @retval EFI_SECURITY_VIOLATION Recovery image is not processed due to security violation. **/ EFI_STATUS @@ -607,7 +607,7 @@ ProcessRecoveryImage ( @param[in] CapsuleHeader Points to a capsule header. @param[in] IsSystemFmp If this capsule is a system FMP capsule. - @retval EFI_SUCESS Process Capsule Image successfully. + @retval EFI_SUCCESS Process Capsule Image successfully. @retval EFI_UNSUPPORTED Capsule image is not supported by the firmware. @retval EFI_VOLUME_CORRUPTED FV volume in the capsule is corrupted. @retval EFI_OUT_OF_RESOURCES Not enough memory. diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c index 7d414b07fb..878c6680a3 100644 --- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c +++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c @@ -153,7 +153,7 @@ ParseUpdateDataFile ( (*UpdateArray)[Index].BaseAddress = (EFI_PHYSICAL_ADDRESS) Num64; // - // FileBuid + // FileGuid // Status = GetGuidFromDataFile( Context, diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c index d377a8d056..1b6d7e78ea 100644 --- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c +++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c @@ -331,8 +331,8 @@ InitializePrivateData ( &VarSize, &SystemFmpPrivate->LastAttempt ); - DEBUG((DEBUG_INFO, "GetLastAttemp - %r\n", VarStatus)); - DEBUG((DEBUG_INFO, "GetLastAttemp Version - 0x%x, State - 0x%x\n", SystemFmpPrivate->LastAttempt.LastAttemptVersion, SystemFmpPrivate->LastAttempt.LastAttemptStatus)); + DEBUG((DEBUG_INFO, "GetLastAttempt - %r\n", VarStatus)); + DEBUG((DEBUG_INFO, "GetLastAttempt Version - 0x%x, State - 0x%x\n", SystemFmpPrivate->LastAttempt.LastAttemptVersion, SystemFmpPrivate->LastAttempt.LastAttemptStatus)); return EFI_SUCCESS; } diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h index f7166e337a..d3cc89e5f1 100644 --- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h +++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h @@ -113,7 +113,7 @@ typedef struct { #define ABORT_REASON_MAX_SIZE 0x40 // UnicodeStringSize including final L'\0' -#define CAPSULE_IMAGE_ADDITIONAL_MAX_SIZE (0x20020 + 0xA0000) // Addtional size for Capsule Header, FV block alignment + DispatchImage. +#define CAPSULE_IMAGE_ADDITIONAL_MAX_SIZE (0x20020 + 0xA0000) // Additional size for Capsule Header, FV block alignment + DispatchImage. typedef struct { UINT8 ImageIndex; diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.c index ffd9d1f25b..ebd1d0d53d 100644 --- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.c +++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.c @@ -30,7 +30,7 @@ SYSTEM_FMP_PRIVATE_DATA *mSystemFmpPrivate = NULL; @param[out] LastAttemptVersion The last attempt version, which will be recorded in ESRT and FMP EFI_FIRMWARE_IMAGE_DESCRIPTOR. @param[out] LastAttemptStatus The last attempt status, which will be recorded in ESRT and FMP EFI_FIRMWARE_IMAGE_DESCRIPTOR. - @retval EFI_SUCESS Process Capsule Image successfully. + @retval EFI_SUCCESS Process Capsule Image successfully. @retval EFI_UNSUPPORTED Capsule image is not supported by the firmware. @retval EFI_VOLUME_CORRUPTED FV volume in the capsule is corrupted. @retval EFI_OUT_OF_RESOURCES Not enough memory. @@ -174,7 +174,7 @@ FmpSetImage ( // Process FV // Status = DispatchSystemFmpImages((VOID *)Image, ImageSize, &SystemFmpPrivate->LastAttempt.LastAttemptVersion, &SystemFmpPrivate->LastAttempt.LastAttemptStatus); - DEBUG((DEBUG_INFO, "(Agent)SetImage - LastAttemp Version - 0x%x, State - 0x%x\n", SystemFmpPrivate->LastAttempt.LastAttemptVersion, SystemFmpPrivate->LastAttempt.LastAttemptStatus)); + DEBUG((DEBUG_INFO, "(Agent)SetImage - LastAttempt Version - 0x%x, State - 0x%x\n", SystemFmpPrivate->LastAttempt.LastAttemptVersion, SystemFmpPrivate->LastAttempt.LastAttemptStatus)); if (EFI_ERROR(Status)) { VarStatus = gRT->SetVariable( SYSTEM_FMP_LAST_ATTEMPT_VARIABLE_NAME, @@ -183,7 +183,7 @@ FmpSetImage ( sizeof(SystemFmpPrivate->LastAttempt), &SystemFmpPrivate->LastAttempt ); - DEBUG((DEBUG_INFO, "(Agent)SetLastAttemp - %r\n", VarStatus)); + DEBUG((DEBUG_INFO, "(Agent)SetLastAttempt - %r\n", VarStatus)); return Status; } @@ -211,7 +211,7 @@ FmpSetImage ( sizeof(SystemFmpPrivate->LastAttempt), &SystemFmpPrivate->LastAttempt ); - DEBUG((DEBUG_INFO, "(Agent)SetLastAttemp - %r\n", VarStatus)); + DEBUG((DEBUG_INFO, "(Agent)SetLastAttempt - %r\n", VarStatus)); return Status; } } diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c index c302f750e2..bdb70bdb32 100644 --- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c +++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c @@ -493,7 +493,7 @@ FmpSetImage ( // the current variable driver may not manage the new NVRAM region. // if (mNvRamUpdated) { - DEBUG ((DEBUG_INFO, "NvRamUpdated, Update Variable Serivces\n")); + DEBUG ((DEBUG_INFO, "NvRamUpdated, Update Variable Services\n")); gRT->GetVariable = GetVariableHook; gRT->GetNextVariableName = GetNextVariableNameHook; gRT->SetVariable = SetVariableHook; @@ -514,7 +514,7 @@ FmpSetImage ( sizeof(SystemFmpPrivate->LastAttempt), &SystemFmpPrivate->LastAttempt ); - DEBUG((DEBUG_INFO, "SetLastAttemp - %r\n", VarStatus)); + DEBUG((DEBUG_INFO, "SetLastAttempt - %r\n", VarStatus)); return Status; } -- 2.20.1 (Apple Git-117) -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43355): https://edk2.groups.io/g/devel/message/43355 Mute This Topic: https://groups.io/mt/32317344/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-