[edk2-devel] [PATCH v2 57/78] OvmfPkg/Qemu: Fix various typos

Philippe Mathieu-Daudé philmd at redhat.com
Fri Jan 3 09:07:51 UTC 2020


From: Antoine Coeur <coeur at gmx.fr>

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 <jordan.l.justen at intel.com>
Cc: Laszlo Ersek <lersek at redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel at linaro.org>
Signed-off-by: Antoine Coeur <coeur at gmx.fr>
Reviewed-by: Philippe Mathieu-Daude <philmd at redhat.com>
Reviewed-by: Laszlo Ersek <lersek at redhat.com>
Signed-off-by: Philippe Mathieu-Daude <philmd at redhat.com>
---
v2: Comment VbeShim.h is not modified in description (Laszlo)
---
 .../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.inf 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 driver
+#  Component description file for QEMU Flash Firmware Volume Block DXE driver
 #  module.
 #
-#  This DXE runtime driver implements and produces the Fimware Volue Block
+#  This DXE runtime driver implements and produces the Firmware Volue Block
 #  Protocol for a QEMU flash device.
 #
 #  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf b/OvmfPkg/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 driver
+#  Component description file for QEMU Flash Firmware Volume Block SMM driver
 #  module.
 #
-#  This SMM driver implements and produces the SMM Fimware Volue Block Protocol
+#  This SMM driver implements and produces the SMM Firmware Volue Block Protocol
 #  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;
 
   //
-  // Set Level-tiggered, Active High for all possible PCI link targets.
+  // Set Level-triggered, Active High for all possible PCI link targets.
   //
   for (Loop = 0; Loop < 16; ++Loop) {
     if ((PcdGet16 (Pcd8259LegacyModeEdgeLevel) & (1 << Loop)) == 0) {
@@ -148,7 +148,7 @@ QemuInstallAcpiMadtTable (
     Iso->Bus                         = 0x00; // ISA
     Iso->Source                      = (UINT8) Loop;
     Iso->GlobalSystemInterruptVector = (UINT32) Loop;
-    Iso->Flags                       = 0x000D; // Level-tiggered, Active High
+    Iso->Flags                       = 0x000D; // Level-triggered, Active High
     ++Iso;
   }
   ASSERT (
diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatformDxe/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 = 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 and the
   end of the range.
 
@@ -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 is
   returned. When possible 32-bit PCI configuration write cycles are used to
-  write from StartAdress to StartAddress + Size. Due to alignment restrictions,
+  write from StartAddress to StartAddress + Size. Due to alignment restrictions,
   8-bit and 16-bit PCI configuration write cycles may be used at the beginning
   and the end of the range.
 
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 this
                           structure is indeterminate.
 
-  @param[out]    IsFinal  In case of successul parsing, this parameter signals
+  @param[out]    IsFinal  In case of successful parsing, this parameter signals
                           whether the node just parsed is the final node in the
                           device path. The call after a final node will attempt
                           to start parsing the next path. If the call doesn'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 (
 
   //
   // 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 = mIoMmuProtocol->AllocateBuffer (
diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
index 859d1e70c5c2..7a6dfb9c21d6 100644
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
@@ -21,7 +21,7 @@
 #include <Pi/PiFirmwareVolume.h>
 
 //
-// The protocols, PPI and GUID defintions for this module
+// The protocols, PPI and GUID definitions for this module
 //
 #include <Guid/SystemNvDataGuid.h>
 //
@@ -41,7 +41,7 @@ typedef struct {
 
 EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
   //
-  // Systen NvStorage FVB
+  // System NvStorage FVB
   //
   {
     FixedPcdGet32 (PcdFlashNvStorageVariableSize) +
diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
index edf438a422fa..b7b99129a80e 100644
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
@@ -15,7 +15,7 @@
 **/
 
 //
-// The protocols, PPI and GUID defintions for this module
+// The protocols, PPI and GUID definitions for this module
 //
 #include <Protocol/DevicePath.h>
 #include <Protocol/FirmwareVolumeBlock.h>
@@ -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 structure
+    FwhInstance           - The EFI_FW_VOL_INSTANCE firmware instance structure
 
   Returns:
     EFI_SUCCESS           - Successfully returns
@@ -695,7 +695,7 @@ FvbProtocolWrite (
     Writes data beginning at Lba:Offset from FV. The write terminates either
     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.
 
@@ -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.
 
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 = gBS->RaiseTPL (TPL_CALLBACK);
 
   //
-  // Allocate Private context data for GOP inteface.
+  // Allocate Private context data for GOP interface.
   //
   Private = AllocateZeroPool (sizeof (QEMU_VIDEO_PRIVATE_DATA));
   if (Private == NULL) {
diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.asm b/OvmfPkg/QemuVideoDxe/VbeShim.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
 
@@ -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:
 
   cmp        bx, 0x40f1
   je         KnownMode2
-  DebugLog   StrUnkownMode
+  DebugLog   StrUnknownMode
   jmp        Hang
 KnownMode2:
 
@@ -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
 
-StrUnkownFunction:
+StrUnknownFunction:
   db 'Unknown Function', 0x0a, 0
 
 StrEnterGetInfo:
@@ -270,8 +270,8 @@ StrEnterSetMode:
 StrEnterSetModeLegacy:
   db 'SetModeLegacy', 0x0a, 0
 
-StrUnkownMode:
-  db 'Unkown Mode', 0x0a, 0
+StrUnknownMode:
+  db 'Unknown Mode', 0x0a, 0
 
 StrGetPmCapabilities:
   db 'GetPmCapabilities', 0x0a, 0
-- 
2.21.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#52791): https://edk2.groups.io/g/devel/message/52791
Mute This Topic: https://groups.io/mt/69395956/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-





More information about the edk2-devel-archive mailing list