From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web12.2234.1578046378379724738 for ; Fri, 03 Jan 2020 02:12:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=G989zPFE; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578046377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mITOkSWe2jGYkjBusXJ+wwmrsZoItwe+c1N3JeAxWos=; b=G989zPFERHAsNKjP0JLoi33wAK+GY0WBJR9p2U+xZcHbTTVeAWfK47lZeZli1aEwn7QeOm OOrWK2tKGnr++0Db+dWc2GcpYsgjjbxkkImhkWTD30CYLOPUaDV3GH9tCJ6JEqhZEJAJMa m4p6anr/TQf8i08NNls9xY4rm6fj+Ks= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-415-S3yzo2iLPgeEBQeVkLoRSw-1; Fri, 03 Jan 2020 05:12:55 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7A1D61005510; Fri, 3 Jan 2020 10:12:54 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DC5C984668; Fri, 3 Jan 2020 10:12:49 +0000 (UTC) From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= To: devel@edk2.groups.io Cc: Antoine Coeur , Jiewen Yao , Chao Zhang , Philippe Mathieu-Daude Subject: [PATCH v2 70/78] SignedCapsulePkg/Universal: Fix various typos Date: Fri, 3 Jan 2020 10:08:04 +0100 Message-Id: <20200103090812.10592-71-philmd@redhat.com> In-Reply-To: <20200103090812.10592-1-philmd@redhat.com> References: <20200103090812.10592-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: S3yzo2iLPgeEBQeVkLoRSw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Antoine Coeur Fix various typos in documentation, comments and debug strings. Cc: Jiewen Yao Cc: Chao Zhang Signed-off-by: Antoine Coeur Reviewed-by: Philippe Mathieu-Daude Signed-off-by: Philippe Mathieu-Daude --- .../SystemFirmwareUpdate/SystemFirmwareDxe.h | 2 +- .../RecoveryModuleLoadPei/ParseConfigProfile.c | 2 +- .../RecoveryModuleLoadPei/RecoveryModuleLoadPei.c | 14 +++++++------- .../SystemFirmwareUpdate/ParseConfigProfile.c | 2 +- .../SystemFirmwareUpdate/SystemFirmwareCommonDxe.c | 4 ++-- .../SystemFirmwareUpdate/SystemFirmwareReportDxe.c | 8 ++++---- .../SystemFirmwareUpdate/SystemFirmwareUpdateDxe.c | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmware= Dxe.h b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h index f7166e337ad7..d3cc89e5f106 100644 --- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h +++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h @@ -113,7 +113,7 @@ typedef struct { =20 #define ABORT_REASON_MAX_SIZE 0x40 // UnicodeStringSize inc= luding final L'\0' =20 -#define CAPSULE_IMAGE_ADDITIONAL_MAX_SIZE (0x20020 + 0xA0000) // Addtion= al size for Capsule Header, FV block alignment + DispatchImage. +#define CAPSULE_IMAGE_ADDITIONAL_MAX_SIZE (0x20020 + 0xA0000) // Additio= nal size for Capsule Header, FV block alignment + DispatchImage. =20 typedef struct { UINT8 ImageIndex; diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigPr= ofile.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfi= le.c index ee9787a2bf53..5cd690ddeb76 100644 --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/ParseConfigProfile.c @@ -103,7 +103,7 @@ ParseRecoveryDataFile ( // =20 // - // FileBuid + // FileGuid // Status =3D GetGuidFromDataFile( Context, diff --git a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.c b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModul= eLoadPei.c index eda3cc542068..53b821c2bb26 100644 --- a/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.c +++ b/SignedCapsulePkg/Universal/RecoveryModuleLoadPei/RecoveryModuleLoadPe= i.c @@ -20,7 +20,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include // -// The protocols, PPI and GUID defintions for this module +// The protocols, PPI and GUID definitions for this module // #include #include @@ -144,7 +144,7 @@ IsFmpCapsuleGuid ( } =20 /** - This function assumes the input Capusule image already passes basic chec= k in + This function assumes the input Capsule image already passes basic check= in ValidateFmpCapsule(). =20 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 cap= sule. =20 - @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 capsul= e. **/ 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. =20 - @retval EFI_SUCESS Create hob and install FvInfo PPI successf= ully. + @retval EFI_SUCCESS Create hob and install FvInfo PPI successf= ully. @retval EFI_VOLUME_CORRUPTED The input data is not an FV. @retval EFI_OUT_OF_RESOURCES No enough resource to process the input da= ta. **/ @@ -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. =20 - @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. =20 - @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 se= curity 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 capsul= e. =20 - @retval EFI_SUCESS Process Capsule Image successfully. + @retval EFI_SUCCESS Process Capsule Image successfully. @retval EFI_UNSUPPORTED Capsule image is not supported by the firm= ware. @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/ParseConfigPro= file.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile= .c index 7d414b07fbc4..878c6680a338 100644 --- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c +++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/ParseConfigProfile.c @@ -153,7 +153,7 @@ ParseUpdateDataFile ( (*UpdateArray)[Index].BaseAddress =3D (EFI_PHYSICAL_ADDRESS) Num64; =20 // - // FileBuid + // FileGuid // Status =3D GetGuidFromDataFile( Context, diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmware= CommonDxe.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwar= eCommonDxe.c index d377a8d05665..1b6d7e78eaa1 100644 --- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonD= xe.c +++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonD= xe.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", Syste= mFmpPrivate->LastAttempt.LastAttemptVersion, SystemFmpPrivate->LastAttempt.= LastAttemptStatus)); + DEBUG((DEBUG_INFO, "GetLastAttempt - %r\n", VarStatus)); + DEBUG((DEBUG_INFO, "GetLastAttempt Version - 0x%x, State - 0x%x\n", Syst= emFmpPrivate->LastAttempt.LastAttemptVersion, SystemFmpPrivate->LastAttempt= .LastAttemptStatus)); =20 return EFI_SUCCESS; } diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmware= ReportDxe.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwar= eReportDxe.c index ffd9d1f25bfb..ebd1d0d53db8 100644 --- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportD= xe.c +++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportD= xe.c @@ -30,7 +30,7 @@ SYSTEM_FMP_PRIVATE_DATA *mSystemFmpPrivate =3D NULL; @param[out] LastAttemptVersion The last attempt version, which will be r= ecorded in ESRT and FMP EFI_FIRMWARE_IMAGE_DESCRIPTOR. @param[out] LastAttemptStatus The last attempt status, which will be re= corded in ESRT and FMP EFI_FIRMWARE_IMAGE_DESCRIPTOR. =20 - @retval EFI_SUCESS Process Capsule Image successfully. + @retval EFI_SUCCESS Process Capsule Image successfully. @retval EFI_UNSUPPORTED Capsule image is not supported by the firm= ware. @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 =3D DispatchSystemFmpImages((VOID *)Image, ImageSize, &SystemFmpP= rivate->LastAttempt.LastAttemptVersion, &SystemFmpPrivate->LastAttempt.Last= AttemptStatus); - DEBUG((DEBUG_INFO, "(Agent)SetImage - LastAttemp Version - 0x%x, State -= 0x%x\n", SystemFmpPrivate->LastAttempt.LastAttemptVersion, SystemFmpPrivat= e->LastAttempt.LastAttemptStatus)); + DEBUG((DEBUG_INFO, "(Agent)SetImage - LastAttempt Version - 0x%x, State = - 0x%x\n", SystemFmpPrivate->LastAttempt.LastAttemptVersion, SystemFmpPriva= te->LastAttempt.LastAttemptStatus)); if (EFI_ERROR(Status)) { VarStatus =3D 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; } =20 @@ -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/SystemFirmware= UpdateDxe.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwar= eUpdateDxe.c index c302f750e2fd..bdb70bdb32cc 100644 --- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateD= xe.c +++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateD= xe.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 =3D GetVariableHook; gRT->GetNextVariableName =3D GetNextVariableNameHook; gRT->SetVariable =3D 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)); =20 return Status; } --=20 2.21.0