From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.81]) by mx.groups.io with SMTP id smtpd.web10.6820.1581039666806265782 for ; Thu, 06 Feb 2020 17:41:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fOeBupjZ; spf=pass (domain: redhat.com, ip: 207.211.31.81, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581039665; 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=lwu5J6kGzNRPwHXPu1PSqgJrhb5VqOVgQ7m6Urpx5sM=; b=fOeBupjZIXzCwAZyzd/8BbHVeIW2oc3YlmQslqJR8Qk9kV1UxJONxnk+KZ6/7DcI4ycFUW xoZ/SBZNSfHZ/qJOFANrUOKQXFNIL0ZpNW0hG5rg8F1SflAj79wXx8VfcYUip4W2l7eJ1v TWoyr8ouvl3AJKYVumA6U/PRxge8cuY= 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-23-Hxl0MJAvPVKVL3yePLEBjg-1; Thu, 06 Feb 2020 20:41:00 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EF2818A6EC0; Fri, 7 Feb 2020 01:40:59 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-120.brq.redhat.com [10.40.204.120]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 764FA5C3FD; Fri, 7 Feb 2020 01:40:58 +0000 (UTC) From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= To: devel@edk2.groups.io Cc: Laszlo Ersek , Eric Dong Subject: [PATCH v3 57/78] OvmfPkg/Qemu: Fix various typos Date: Fri, 7 Feb 2020 02:08:10 +0100 Message-Id: <20200207010831.9046-58-philmd@redhat.com> In-Reply-To: <20200207010831.9046-1-philmd@redhat.com> References: <20200207010831.9046-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: Hxl0MJAvPVKVL3yePLEBjg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Antoine Coeur Fix various typos in comments and documentation. When "VbeShim.asm" is modified, we have to re-run "VbeShim.sh" to update "VbeShim.h". The string modified by this patch is only used when the DEBUG macro (at the top of the file) is commented out. Since the string is not referenced, NASM eliminates it, resulting in the same byte array content in "VbeShim.h". Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Antoine Coeur Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daude --- .../FvbServicesRuntimeDxe.inf | 4 ++-- .../FvbServicesSmm.inf | 4 ++-- OvmfPkg/AcpiPlatformDxe/Qemu.c | 4 ++-- OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 2 +- OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c | 4 ++-- .../Library/QemuBootOrderLib/QemuBootOrderLib.c | 2 +- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c | 2 +- OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c | 4 ++-- .../FwBlockService.c | 8 ++++---- OvmfPkg/QemuVideoDxe/Driver.c | 2 +- OvmfPkg/QemuVideoDxe/VbeShim.asm | 14 +++++++------- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.i= nf b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf index ca6326e833ed..8125fd0735a1 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf @@ -1,8 +1,8 @@ ## @file -# Component description file for QEMU Flash Fimware Volume Block DXE driv= er +# Component description file for QEMU Flash Firmware Volume Block DXE dri= ver # module. # -# This DXE runtime driver implements and produces the Fimware Volue Block +# This DXE runtime driver implements and produces the Firmware Volue Bloc= k # Protocol for a QEMU flash device. # # Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf b/Ov= mfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf index 241e912e2967..4715d5fc437e 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf @@ -1,8 +1,8 @@ ## @file -# Component description file for QEMU Flash Fimware Volume Block SMM driv= er +# Component description file for QEMU Flash Firmware Volume Block SMM dri= ver # module. # -# This SMM driver implements and produces the SMM Fimware Volue Block Pro= tocol +# This SMM driver implements and produces the SMM Firmware Volue Block Pr= otocol # for a QEMU flash device. # # Copyright (C) 2015, Red Hat, Inc. diff --git a/OvmfPkg/AcpiPlatformDxe/Qemu.c b/OvmfPkg/AcpiPlatformDxe/Qemu.= c index f60e00f58af3..7fb42270043f 100644 --- a/OvmfPkg/AcpiPlatformDxe/Qemu.c +++ b/OvmfPkg/AcpiPlatformDxe/Qemu.c @@ -137,7 +137,7 @@ QemuInstallAcpiMadtTable ( ++Iso; =20 // - // Set Level-tiggered, Active High for all possible PCI link targets. + // Set Level-triggered, Active High for all possible PCI link targets. // for (Loop =3D 0; Loop < 16; ++Loop) { if ((PcdGet16 (Pcd8259LegacyModeEdgeLevel) & (1 << Loop)) =3D=3D 0) { @@ -148,7 +148,7 @@ QemuInstallAcpiMadtTable ( Iso->Bus =3D 0x00; // ISA Iso->Source =3D (UINT8) Loop; Iso->GlobalSystemInterruptVector =3D (UINT32) Loop; - Iso->Flags =3D 0x000D; // Level-tiggered, Active= High + Iso->Flags =3D 0x000D; // Level-triggered, Activ= e High ++Iso; } ASSERT ( diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatform= Dxe/QemuFwCfgAcpi.c index bc1a891dbaf1..75a3a88a3612 100644 --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c @@ -1113,7 +1113,7 @@ InstallQemuFwCfgTables ( goto UninstallAcpiTables; } // - // Ownership of S3Context has been transfered. + // Ownership of S3Context has been transferred. // S3Context =3D NULL; } diff --git a/OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c b/OvmfPkg/Library/= DxePciLibI440FxQ35/PciLib.c index 49bdfdf65043..1839f11f3301 100644 --- a/OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c +++ b/OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c @@ -1156,7 +1156,7 @@ PciBitFieldAndThenOr32 ( Size into the buffer specified by Buffer. This function only allows the = PCI configuration registers from a single PCI function to be read. Size is returned. When possible 32-bit PCI configuration read cycles are used to= read - from StartAdress to StartAddress + Size. Due to alignment restrictions, = 8-bit + from StartAddress to StartAddress + Size. Due to alignment restrictions,= 8-bit and 16-bit PCI configuration read cycles may be used at the beginning an= d the end of the range. =20 @@ -1193,7 +1193,7 @@ PciReadBuffer ( Size from the buffer specified by Buffer. This function only allows the = PCI configuration registers from a single PCI function to be written. Size i= s returned. When possible 32-bit PCI configuration write cycles are used t= o - write from StartAdress to StartAddress + Size. Due to alignment restrict= ions, + write from StartAddress to StartAddress + Size. Due to alignment restric= tions, 8-bit and 16-bit PCI configuration write cycles may be used at the begin= ning and the end of the range. =20 diff --git a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c b/OvmfPkg/= Library/QemuBootOrderLib/QemuBootOrderLib.c index 586c2dec125c..ceffb17fa622 100644 --- a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c +++ b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c @@ -412,7 +412,7 @@ typedef struct { If the call doesn't succeed, the contents of thi= s structure is indeterminate. =20 - @param[out] IsFinal In case of successul parsing, this parameter sig= nals + @param[out] IsFinal In case of successful parsing, this parameter si= gnals whether the node just parsed is the final node i= n the device path. The call after a final node will at= tempt to start parsing the next path. If the call does= n't diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c b/OvmfPkg/Library/= QemuFwCfgLib/QemuFwCfgDxe.c index 59d4680e5ec1..983680f8b6dd 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c @@ -164,7 +164,7 @@ AllocFwCfgDmaAccessBuffer ( =20 // // As per UEFI spec, in order to map a host address with - // BusMasterCommomBuffer64, the buffer must be allocated using the IOMMU + // BusMasterCommonBuffer64, the buffer must be allocated using the IOMMU // AllocateBuffer() // Status =3D mIoMmuProtocol->AllocateBuffer ( diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c b/OvmfPkg/Qem= uFlashFvbServicesRuntimeDxe/FvbInfo.c index 859d1e70c5c2..7a6dfb9c21d6 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c @@ -21,7 +21,7 @@ #include =20 // -// The protocols, PPI and GUID defintions for this module +// The protocols, PPI and GUID definitions for this module // #include // @@ -41,7 +41,7 @@ typedef struct { =20 EFI_FVB_MEDIA_INFO mPlatformFvbMediaInfo[] =3D { // - // Systen NvStorage FVB + // System NvStorage FVB // { FixedPcdGet32 (PcdFlashNvStorageVariableSize) + diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/Ovmf= Pkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c index edf438a422fa..b7b99129a80e 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c @@ -15,7 +15,7 @@ **/ =20 // -// The protocols, PPI and GUID defintions for this module +// The protocols, PPI and GUID definitions for this module // #include #include @@ -118,7 +118,7 @@ GetFvbInstance ( returned Global - Pointer to ESAL_FWB_GLOBAL that contains all instance data - FwhInstance - The EFI_FW_VOL_INSTANCE fimrware instance stru= cture + FwhInstance - The EFI_FW_VOL_INSTANCE firmware instance stru= cture =20 Returns: EFI_SUCCESS - Successfully returns @@ -695,7 +695,7 @@ FvbProtocolWrite ( Writes data beginning at Lba:Offset from FV. The write terminates eith= er when *NumBytes of data have been written, or when a block boundary is reached. *NumBytes is updated to reflect the actual number of bytes - written. The write opertion does not include erase. This routine will + written. The write operation does not include erase. This routine will attempt to write only the specified bytes. If the writes do not stick, it will return an error. =20 @@ -740,7 +740,7 @@ FvbProtocolRead ( Reads data beginning at Lba:Offset from FV. The Read terminates either when *NumBytes of data have been read, or when a block boundary is reached. *NumBytes is updated to reflect the actual number of bytes - written. The write opertion does not include erase. This routine will + written. The write operation does not include erase. This routine will attempt to write only the specified bytes. If the writes do not stick, it will return an error. =20 diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c index 522110ef4e09..6a4a860b3c25 100644 --- a/OvmfPkg/QemuVideoDxe/Driver.c +++ b/OvmfPkg/QemuVideoDxe/Driver.c @@ -206,7 +206,7 @@ QemuVideoControllerDriverStart ( OldTpl =3D gBS->RaiseTPL (TPL_CALLBACK); =20 // - // Allocate Private context data for GOP inteface. + // Allocate Private context data for GOP interface. // Private =3D AllocateZeroPool (sizeof (QEMU_VIDEO_PRIVATE_DATA)); if (Private =3D=3D NULL) { diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.asm b/OvmfPkg/QemuVideoDxe/VbeShi= m.asm index cb2a60d8278d..1d284b264124 100644 --- a/OvmfPkg/QemuVideoDxe/VbeShim.asm +++ b/OvmfPkg/QemuVideoDxe/VbeShim.asm @@ -49,7 +49,7 @@ Handler: je ReadEdid cmp ah, 0x00 je SetModeLegacy - DebugLog StrUnkownFunction + DebugLog StrUnknownFunction Hang: jmp Hang =20 @@ -93,7 +93,7 @@ GetModeInfo: and cx, ~0x4000 ; clear potentially set LFB bit in mode number cmp cx, 0x00f1 je KnownMode1 - DebugLog StrUnkownMode + DebugLog StrUnknownMode jmp Hang KnownMode1: ; target (es:di) set on input @@ -155,7 +155,7 @@ SetMode: =20 cmp bx, 0x40f1 je KnownMode2 - DebugLog StrUnkownMode + DebugLog StrUnknownMode jmp Hang KnownMode2: =20 @@ -203,7 +203,7 @@ SetModeLegacy: je KnownMode3 cmp al, 0x12 je KnownMode4 - DebugLog StrUnkownMode + DebugLog StrUnknownMode jmp Hang KnownMode3: mov al, 0x30 @@ -252,7 +252,7 @@ StrExitSuccess: StrExitUnsupported: db 'Unsupported', 0x0a, 0 =20 -StrUnkownFunction: +StrUnknownFunction: db 'Unknown Function', 0x0a, 0 =20 StrEnterGetInfo: @@ -270,8 +270,8 @@ StrEnterSetMode: StrEnterSetModeLegacy: db 'SetModeLegacy', 0x0a, 0 =20 -StrUnkownMode: - db 'Unkown Mode', 0x0a, 0 +StrUnknownMode: + db 'Unknown Mode', 0x0a, 0 =20 StrGetPmCapabilities: db 'GetPmCapabilities', 0x0a, 0 --=20 2.21.1