OvmfPkg/Qemu: Fix various typos

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@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Antoine Coeur <coeur@gmx.fr>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
Message-Id: <20200207010831.9046-58-philmd@redhat.com>

diff --git a/OvmfPkg/AcpiPlatformDxe/Qemu.c b/OvmfPkg/AcpiPlatformDxe/Qemu.c
index f60e00f58af3b72fc153ae497a605ab8e7670cee..7fb42270043fbe22109330c814f3a27e62ea254c 100644 (file)
--- a/OvmfPkg/AcpiPlatformDxe/Qemu.c
+++ b/OvmfPkg/AcpiPlatformDxe/Qemu.c
@@ -137,7 +137,7 @@ QemuInstallAcpiMadtTable (
   ++Iso;\r
 \r
   //\r
-  // Set Level-tiggered, Active High for all possible PCI link targets.\r
+  // Set Level-triggered, Active High for all possible PCI link targets.\r
   //\r
   for (Loop = 0; Loop < 16; ++Loop) {\r
     if ((PcdGet16 (Pcd8259LegacyModeEdgeLevel) & (1 << Loop)) == 0) {\r
@@ -148,7 +148,7 @@ QemuInstallAcpiMadtTable (
     Iso->Bus                         = 0x00; // ISA\r
     Iso->Source                      = (UINT8) Loop;\r
     Iso->GlobalSystemInterruptVector = (UINT32) Loop;\r
-    Iso->Flags                       = 0x000D; // Level-tiggered, Active High\r
+    Iso->Flags                       = 0x000D; // Level-triggered, Active High\r
     ++Iso;\r
   }\r
   ASSERT (\r

diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
index bc1a891dbaf16aa801589de504b37faf47fbd6f7..75a3a88a36129ca6d5f1dbf31bede1d737e1e1d4 100644 (file)
--- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
+++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
@@ -1113,7 +1113,7 @@ InstallQemuFwCfgTables (
       goto UninstallAcpiTables;\r
     }\r
     //\r
-    // Ownership of S3Context has been transfered.\r
+    // Ownership of S3Context has been transferred.\r
     //\r
     S3Context = NULL;\r
   }\r

diff --git a/OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c b/OvmfPkg/Library/DxePciLibI440FxQ35/PciLib.c
index 49bdfdf65043dae41368271b90ba968e99650380..1839f11f3301f448deaf9a23e7eba7d0042adfeb 100644 (file)
--- 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\r
   configuration registers from a single PCI function to be read. Size is\r
   returned. When possible 32-bit PCI configuration read cycles are used to read\r
-  from StartAdress to StartAddress + Size. Due to alignment restrictions, 8-bit\r
+  from StartAddress to StartAddress + Size. Due to alignment restrictions, 8-bit\r
   and 16-bit PCI configuration read cycles may be used at the beginning and the\r
   end of the range.\r
 \r
@@ -1193,7 +1193,7 @@ PciReadBuffer (
   Size from the buffer specified by Buffer. This function only allows the PCI\r
   configuration registers from a single PCI function to be written. Size is\r
   returned. When possible 32-bit PCI configuration write cycles are used to\r
-  write from StartAdress to StartAddress + Size. Due to alignment restrictions,\r
+  write from StartAddress to StartAddress + Size. Due to alignment restrictions,\r
   8-bit and 16-bit PCI configuration write cycles may be used at the beginning\r
   and the end of the range.\r
 \r

diff --git a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c
index 586c2dec125cb1ffc8cb442481e932380a22c630..ceffb17fa62298439c4c4d4a12d02b758b0cffac 100644 (file)
--- 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\r
                           structure is indeterminate.\r
 \r
-  @param[out]    IsFinal  In case of successul parsing, this parameter signals\r
+  @param[out]    IsFinal  In case of successful parsing, this parameter signals\r
                           whether the node just parsed is the final node in the\r
                           device path. The call after a final node will attempt\r
                           to start parsing the next path. If the call doesn't\r

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c
index 59d4680e5ec1c240c937e5145b8f532c9fff28b8..983680f8b6dd006156bd2b25617d1c7e22ec7faf 100644 (file)
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c
@@ -164,7 +164,7 @@ AllocFwCfgDmaAccessBuffer (
 \r
   //\r
   // As per UEFI spec, in order to map a host address with\r
-  // BusMasterCommomBuffer64, the buffer must be allocated using the IOMMU\r
+  // BusMasterCommonBuffer64, the buffer must be allocated using the IOMMU\r
   // AllocateBuffer()\r
   //\r
   Status = mIoMmuProtocol->AllocateBuffer (\r

diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
index 859d1e70c5c27e921dcabf3eea4c5fd7cbdcef76..7a6dfb9c21d6d69ce850bb90b7909727e0a70c2e 100644 (file)
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
@@ -21,7 +21,7 @@
 #include <Pi/PiFirmwareVolume.h>\r
 \r
 //\r
-// The protocols, PPI and GUID defintions for this module\r
+// The protocols, PPI and GUID definitions for this module\r
 //\r
 #include <Guid/SystemNvDataGuid.h>\r
 //\r
@@ -41,7 +41,7 @@ typedef struct {
 \r
 EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {\r
   //\r
-  // Systen NvStorage FVB\r
+  // System NvStorage FVB\r
   //\r
   {\r
     FixedPcdGet32 (PcdFlashNvStorageVariableSize) +\r

diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
index ca6326e833ed7cb88170a49b8a88f890869f8525..8125fd0735a125b300c72295631bd8258f53bc06 100644 (file)
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
@@ -1,8 +1,8 @@
 ## @file\r
-#  Component description file for QEMU Flash Fimware Volume Block DXE driver\r
+#  Component description file for QEMU Flash Firmware Volume Block DXE driver\r
 #  module.\r
 #\r
-#  This DXE runtime driver implements and produces the Fimware Volue Block\r
+#  This DXE runtime driver implements and produces the Firmware Volue Block\r
 #  Protocol for a QEMU flash device.\r
 #\r
 #  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r

diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf
index 241e912e2967c51254337ddc93251480c369def9..4715d5fc437e12384ce35eae0eabaea102fe0e3e 100644 (file)
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf
@@ -1,8 +1,8 @@
 ## @file\r
-#  Component description file for QEMU Flash Fimware Volume Block SMM driver\r
+#  Component description file for QEMU Flash Firmware Volume Block SMM driver\r
 #  module.\r
 #\r
-#  This SMM driver implements and produces the SMM Fimware Volue Block Protocol\r
+#  This SMM driver implements and produces the SMM Firmware Volue Block Protocol\r
 #  for a QEMU flash device.\r
 #\r
 #  Copyright (C) 2015, Red Hat, Inc.\r

diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
index edf438a422fafcc66da0de48b411d44fe59b1e00..b7b99129a80e782289bfc853bf5781dfa7c1e9af 100644 (file)
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
@@ -15,7 +15,7 @@
 **/\r
 \r
 //\r
-// The protocols, PPI and GUID defintions for this module\r
+// The protocols, PPI and GUID definitions for this module\r
 //\r
 #include <Protocol/DevicePath.h>\r
 #include <Protocol/FirmwareVolumeBlock.h>\r
@@ -118,7 +118,7 @@ GetFvbInstance (
                             returned\r
     Global                - Pointer to ESAL_FWB_GLOBAL that contains all\r
                             instance data\r
-    FwhInstance           - The EFI_FW_VOL_INSTANCE fimrware instance structure\r
+    FwhInstance           - The EFI_FW_VOL_INSTANCE firmware instance structure\r
 \r
   Returns:\r
     EFI_SUCCESS           - Successfully returns\r
@@ -695,7 +695,7 @@ FvbProtocolWrite (
     Writes data beginning at Lba:Offset from FV. The write terminates either\r
     when *NumBytes of data have been written, or when a block boundary is\r
     reached.  *NumBytes is updated to reflect the actual number of bytes\r
-    written. The write opertion does not include erase. This routine will\r
+    written. The write operation does not include erase. This routine will\r
     attempt to write only the specified bytes. If the writes do not stick,\r
     it will return an error.\r
 \r
@@ -740,7 +740,7 @@ FvbProtocolRead (
     Reads data beginning at Lba:Offset from FV. The Read terminates either\r
     when *NumBytes of data have been read, or when a block boundary is\r
     reached.  *NumBytes is updated to reflect the actual number of bytes\r
-    written. The write opertion does not include erase. This routine will\r
+    written. The write operation does not include erase. This routine will\r
     attempt to write only the specified bytes. If the writes do not stick,\r
     it will return an error.\r
 \r

diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c
index 522110ef4e098b5b60527036bec60f326bad1df8..6a4a860b3c25f3a050aed61eb7f968025bb9a2da 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Driver.c
+++ b/OvmfPkg/QemuVideoDxe/Driver.c
@@ -206,7 +206,7 @@ QemuVideoControllerDriverStart (
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   //\r
-  // Allocate Private context data for GOP inteface.\r
+  // Allocate Private context data for GOP interface.\r
   //\r
   Private = AllocateZeroPool (sizeof (QEMU_VIDEO_PRIVATE_DATA));\r
   if (Private == NULL) {\r

diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.asm b/OvmfPkg/QemuVideoDxe/VbeShim.asm
index cb2a60d8278d29237d70e134e3049be0b5ee9357..1d284b26412423bfdf8c65d51c0585d963833e4f 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/VbeShim.asm
+++ b/OvmfPkg/QemuVideoDxe/VbeShim.asm
@@ -49,7 +49,7 @@ Handler:
   je         ReadEdid\r
   cmp        ah, 0x00\r
   je         SetModeLegacy\r
-  DebugLog   StrUnkownFunction\r
+  DebugLog   StrUnknownFunction\r
 Hang:\r
   jmp        Hang\r
 \r
@@ -93,7 +93,7 @@ GetModeInfo:
   and        cx, ~0x4000 ; clear potentially set LFB bit in mode number\r
   cmp        cx, 0x00f1\r
   je         KnownMode1\r
-  DebugLog   StrUnkownMode\r
+  DebugLog   StrUnknownMode\r
   jmp        Hang\r
 KnownMode1:\r
   ; target (es:di) set on input\r
@@ -155,7 +155,7 @@ SetMode:
 \r
   cmp        bx, 0x40f1\r
   je         KnownMode2\r
-  DebugLog   StrUnkownMode\r
+  DebugLog   StrUnknownMode\r
   jmp        Hang\r
 KnownMode2:\r
 \r
@@ -203,7 +203,7 @@ SetModeLegacy:
   je         KnownMode3\r
   cmp        al, 0x12\r
   je         KnownMode4\r
-  DebugLog   StrUnkownMode\r
+  DebugLog   StrUnknownMode\r
   jmp        Hang\r
 KnownMode3:\r
   mov        al, 0x30\r
@@ -252,7 +252,7 @@ StrExitSuccess:
 StrExitUnsupported:\r
   db 'Unsupported', 0x0a, 0\r
 \r
-StrUnkownFunction:\r
+StrUnknownFunction:\r
   db 'Unknown Function', 0x0a, 0\r
 \r
 StrEnterGetInfo:\r
@@ -270,8 +270,8 @@ StrEnterSetMode:
 StrEnterSetModeLegacy:\r
   db 'SetModeLegacy', 0x0a, 0\r
 \r
-StrUnkownMode:\r
-  db 'Unkown Mode', 0x0a, 0\r
+StrUnknownMode:\r
+  db 'Unknown Mode', 0x0a, 0\r
 \r
 StrGetPmCapabilities:\r
   db 'GetPmCapabilities', 0x0a, 0\r