[edk2-devel] [PATCH] MdeModulePkg Universal: Fix typos

Giri Mudusuru via groups.io posted 1 patch 1 year, 1 month ago
Failed in applying to current master (apply log)
.../Acpi/AcpiTableDxe/AcpiTableProtocol.c     | 10 ++--
.../BootGraphicsResourceTableDxe.c            |  2 +-
MdeModulePkg/Universal/BdsDxe/BdsEntry.c      |  2 +-
.../CapsuleOnDiskLoadPei.uni                  |  4 +-
.../Universal/CapsulePei/UefiCapsule.c        |  2 +-
.../Console/ConPlatformDxe/ConPlatform.c      |  8 +--
.../Console/ConPlatformDxe/ConPlatform.h      |  6 +-
.../Console/ConSplitterDxe/ConSplitter.c      | 46 +++++++--------
.../Console/ConSplitterDxe/ConSplitter.h      | 56 +++++++++----------
.../ConSplitterDxe/ConSplitterGraphics.c      |  6 +-
.../Universal/Console/TerminalDxe/Terminal.h  |  4 +-
.../Console/TerminalDxe/TerminalConIn.c       | 12 ++--
.../Universal/DebugPortDxe/DebugPort.c        |  2 +-
.../Universal/DebugPortDxe/DebugPort.h        |  2 +-
.../DebugServicePei/DebugServicePei.c         |  6 +-
.../DebugServicePei/DebugServicePei.inf       |  2 +-
.../DebugSupportDxe/Ia32/PlDebugSupport.c     |  2 +-
.../Universal/Disk/DiskIoDxe/DiskIo.c         |  8 +--
.../Universal/Disk/DiskIoDxe/DiskIo.h         |  8 +--
.../Universal/Disk/PartitionDxe/Partition.c   |  8 +--
.../Disk/RamDiskDxe/RamDiskBlockIo.c          |  4 +-
.../Universal/Disk/RamDiskDxe/RamDiskImpl.h   |  4 +-
.../Universal/DisplayEngineDxe/FormDisplay.c  |  2 +-
.../Universal/DriverSampleDxe/DriverSample.c  |  2 +-
.../Universal/EbcDxe/EbcDebugger/EdbCommand.c |  4 +-
.../Universal/EbcDxe/EbcDebugger/EdbSupport.h |  2 +-
.../EbcDxe/EbcDebugger/EdbSupportFile.c       |  2 +-
.../Universal/EbcDxe/EbcDebugger/EdbSymbol.c  | 10 ++--
MdeModulePkg/Universal/EbcDxe/EbcExecute.c    | 12 ++--
.../FaultTolerantWriteDxe.c                   |  2 +-
.../FaultTolerantWriteSmm.c                   |  2 +-
.../FaultTolerantWriteSmmDxe.c                |  2 +-
.../Universal/HiiDatabaseDxe/ConfigRouting.c  |  6 +-
.../Universal/HiiDatabaseDxe/HiiDatabase.h    |  2 +-
.../Universal/HiiDatabaseDxe/HiiDatabase.uni  |  2 +-
.../HiiDatabaseDxe/HiiDatabaseDxe.inf         |  2 +-
MdeModulePkg/Universal/HiiDatabaseDxe/Image.c |  6 +-
.../Universal/HiiDatabaseDxe/String.c         |  2 +-
.../HiiResourcesSample.c                      |  2 +-
MdeModulePkg/Universal/PCD/Dxe/Pcd.c          |  2 +-
MdeModulePkg/Universal/PCD/Dxe/Pcd.inf        |  6 +-
MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni     |  6 +-
MdeModulePkg/Universal/PCD/Dxe/Service.c      |  2 +-
MdeModulePkg/Universal/PCD/Dxe/Service.h      |  2 +-
MdeModulePkg/Universal/PCD/Pei/Pcd.c          |  4 +-
MdeModulePkg/Universal/PCD/Pei/Pcd.inf        |  6 +-
MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni    |  6 +-
MdeModulePkg/Universal/PCD/Pei/Service.c      |  6 +-
MdeModulePkg/Universal/PCD/Pei/Service.h      |  6 +-
.../RegularExpressionDxe.c                    |  2 +-
.../RegularExpressionDxe.h                    |  2 +-
.../Pei/ReportStatusCodeRouterPei.c           |  6 +-
.../Pei/ReportStatusCodeRouterPei.inf         |  2 +-
.../Pei/ReportStatusCodeRouterPei.uni         |  2 +-
.../ReportStatusCodeRouterRuntimeDxe.c        |  6 +-
.../ReportStatusCodeRouterRuntimeDxe.inf      |  2 +-
.../ReportStatusCodeRouterRuntimeDxe.uni      |  2 +-
.../Smm/ReportStatusCodeRouterCommon.c        |  2 +-
.../Smm/ReportStatusCodeRouterSmm.inf         |  2 +-
.../Smm/ReportStatusCodeRouterSmm.uni         |  2 +-
.../Smm/ReportStatusCodeRouterStandaloneMm.c  |  4 +-
.../ReportStatusCodeRouterStandaloneMm.inf    |  2 +-
.../Smm/ReportStatusCodeRouterTraditional.c   |  4 +-
.../Universal/SetupBrowserDxe/Expression.c    |  2 +-
.../Universal/SetupBrowserDxe/Expression.h    |  2 +-
.../Universal/SetupBrowserDxe/Presentation.c  |  2 +-
MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c  | 16 +++---
MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h  |  6 +-
.../Pei/StatusCodeHandlerPei.c                |  2 +-
.../Universal/Variable/Pei/Variable.c         |  2 +-
.../Variable/RuntimeDxe/VariableDxe.c         |  2 +-
.../RuntimeDxe/VariablePolicySmmDxe.c         |  2 +-
.../Variable/RuntimeDxe/VariableSmm.c         |  4 +-
.../RuntimeDxe/VariableSmmRuntimeDxe.c        |  2 +-
74 files changed, 197 insertions(+), 197 deletions(-)
[edk2-devel] [PATCH] MdeModulePkg Universal: Fix typos
Posted by Giri Mudusuru via groups.io 1 year, 1 month ago
Adress->Address
agregates->aggregates
assoicated->associated
availiable->available
begining->beginning
Caspule->Capsule
CHNAGED->CHANGED
continous->continuous
Determin->Determine
Devcice->Device
dyanmic->dynamic
existance->existence
FLASE->FALSE
functin->function
implictly->implicitly
INSTRUCITON->INSTRUCTION
keydtroke->keystroke
Mullti->Multi
occpuies->occupies
optionaly->optionally
orignal->original
Regsitered->Registered
Serivce->Service
spliter->splitter
Stataus->Status
SUCESS->SUCCESS
successfuly->successfully
swtich->switch
Varible->Variable
verfication->verification
writting->writing

Signed-off-by: Giri Mudusuru <girim@apple.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Andrew Fish <afish@apple.com>
---
 .../Acpi/AcpiTableDxe/AcpiTableProtocol.c     | 10 ++--
 .../BootGraphicsResourceTableDxe.c            |  2 +-
 MdeModulePkg/Universal/BdsDxe/BdsEntry.c      |  2 +-
 .../CapsuleOnDiskLoadPei.uni                  |  4 +-
 .../Universal/CapsulePei/UefiCapsule.c        |  2 +-
 .../Console/ConPlatformDxe/ConPlatform.c      |  8 +--
 .../Console/ConPlatformDxe/ConPlatform.h      |  6 +-
 .../Console/ConSplitterDxe/ConSplitter.c      | 46 +++++++--------
 .../Console/ConSplitterDxe/ConSplitter.h      | 56 +++++++++----------
 .../ConSplitterDxe/ConSplitterGraphics.c      |  6 +-
 .../Universal/Console/TerminalDxe/Terminal.h  |  4 +-
 .../Console/TerminalDxe/TerminalConIn.c       | 12 ++--
 .../Universal/DebugPortDxe/DebugPort.c        |  2 +-
 .../Universal/DebugPortDxe/DebugPort.h        |  2 +-
 .../DebugServicePei/DebugServicePei.c         |  6 +-
 .../DebugServicePei/DebugServicePei.inf       |  2 +-
 .../DebugSupportDxe/Ia32/PlDebugSupport.c     |  2 +-
 .../Universal/Disk/DiskIoDxe/DiskIo.c         |  8 +--
 .../Universal/Disk/DiskIoDxe/DiskIo.h         |  8 +--
 .../Universal/Disk/PartitionDxe/Partition.c   |  8 +--
 .../Disk/RamDiskDxe/RamDiskBlockIo.c          |  4 +-
 .../Universal/Disk/RamDiskDxe/RamDiskImpl.h   |  4 +-
 .../Universal/DisplayEngineDxe/FormDisplay.c  |  2 +-
 .../Universal/DriverSampleDxe/DriverSample.c  |  2 +-
 .../Universal/EbcDxe/EbcDebugger/EdbCommand.c |  4 +-
 .../Universal/EbcDxe/EbcDebugger/EdbSupport.h |  2 +-
 .../EbcDxe/EbcDebugger/EdbSupportFile.c       |  2 +-
 .../Universal/EbcDxe/EbcDebugger/EdbSymbol.c  | 10 ++--
 MdeModulePkg/Universal/EbcDxe/EbcExecute.c    | 12 ++--
 .../FaultTolerantWriteDxe.c                   |  2 +-
 .../FaultTolerantWriteSmm.c                   |  2 +-
 .../FaultTolerantWriteSmmDxe.c                |  2 +-
 .../Universal/HiiDatabaseDxe/ConfigRouting.c  |  6 +-
 .../Universal/HiiDatabaseDxe/HiiDatabase.h    |  2 +-
 .../Universal/HiiDatabaseDxe/HiiDatabase.uni  |  2 +-
 .../HiiDatabaseDxe/HiiDatabaseDxe.inf         |  2 +-
 MdeModulePkg/Universal/HiiDatabaseDxe/Image.c |  6 +-
 .../Universal/HiiDatabaseDxe/String.c         |  2 +-
 .../HiiResourcesSample.c                      |  2 +-
 MdeModulePkg/Universal/PCD/Dxe/Pcd.c          |  2 +-
 MdeModulePkg/Universal/PCD/Dxe/Pcd.inf        |  6 +-
 MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni     |  6 +-
 MdeModulePkg/Universal/PCD/Dxe/Service.c      |  2 +-
 MdeModulePkg/Universal/PCD/Dxe/Service.h      |  2 +-
 MdeModulePkg/Universal/PCD/Pei/Pcd.c          |  4 +-
 MdeModulePkg/Universal/PCD/Pei/Pcd.inf        |  6 +-
 MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni    |  6 +-
 MdeModulePkg/Universal/PCD/Pei/Service.c      |  6 +-
 MdeModulePkg/Universal/PCD/Pei/Service.h      |  6 +-
 .../RegularExpressionDxe.c                    |  2 +-
 .../RegularExpressionDxe.h                    |  2 +-
 .../Pei/ReportStatusCodeRouterPei.c           |  6 +-
 .../Pei/ReportStatusCodeRouterPei.inf         |  2 +-
 .../Pei/ReportStatusCodeRouterPei.uni         |  2 +-
 .../ReportStatusCodeRouterRuntimeDxe.c        |  6 +-
 .../ReportStatusCodeRouterRuntimeDxe.inf      |  2 +-
 .../ReportStatusCodeRouterRuntimeDxe.uni      |  2 +-
 .../Smm/ReportStatusCodeRouterCommon.c        |  2 +-
 .../Smm/ReportStatusCodeRouterSmm.inf         |  2 +-
 .../Smm/ReportStatusCodeRouterSmm.uni         |  2 +-
 .../Smm/ReportStatusCodeRouterStandaloneMm.c  |  4 +-
 .../ReportStatusCodeRouterStandaloneMm.inf    |  2 +-
 .../Smm/ReportStatusCodeRouterTraditional.c   |  4 +-
 .../Universal/SetupBrowserDxe/Expression.c    |  2 +-
 .../Universal/SetupBrowserDxe/Expression.h    |  2 +-
 .../Universal/SetupBrowserDxe/Presentation.c  |  2 +-
 MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c  | 16 +++---
 MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h  |  6 +-
 .../Pei/StatusCodeHandlerPei.c                |  2 +-
 .../Universal/Variable/Pei/Variable.c         |  2 +-
 .../Variable/RuntimeDxe/VariableDxe.c         |  2 +-
 .../RuntimeDxe/VariablePolicySmmDxe.c         |  2 +-
 .../Variable/RuntimeDxe/VariableSmm.c         |  4 +-
 .../RuntimeDxe/VariableSmmRuntimeDxe.c        |  2 +-
 74 files changed, 197 insertions(+), 197 deletions(-)

diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
index e09bc9b704..d0aebfc7aa 100644
--- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
+++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c
@@ -426,7 +426,7 @@ ReallocateAcpiTableBuffer (
 
   if (mAcpiTableAllocType != AllocateAnyPages) {
     //
-    // Calculate orignal ACPI table buffer size
+    // Calculate original ACPI table buffer size
     //
     TotalSize = sizeof (EFI_ACPI_DESCRIPTION_HEADER) +         // for ACPI 2.0/3.0 XSDT
                 mEfiAcpiMaxNumTables * sizeof (UINT64);
@@ -1800,7 +1800,7 @@ InstallAcpiTableFromHob (
   UINTN                                         TableKey;
   EFI_STATUS                                    Status;
   UINTN                                         EntrySize;
-  UNIVERSAL_PAYLOAD_ACPI_TABLE                  *AcpiTableAdress;
+  UNIVERSAL_PAYLOAD_ACPI_TABLE                  *AcpiTableAddress;
   VOID                                          *TableToInstall;
   EFI_ACPI_SDT_HEADER                           *Table;
   UNIVERSAL_PAYLOAD_GENERIC_HEADER              *GenericHeader;
@@ -1825,15 +1825,15 @@ InstallAcpiTableFromHob (
     //
     // UNIVERSAL_PAYLOAD_ACPI_TABLE structure is used when Revision equals to UNIVERSAL_PAYLOAD_ACPI_TABLE_REVISION
     //
-    AcpiTableAdress = (UNIVERSAL_PAYLOAD_ACPI_TABLE *)GET_GUID_HOB_DATA (GuidHob);
-    if (AcpiTableAdress->Header.Length < UNIVERSAL_PAYLOAD_SIZEOF_THROUGH_FIELD (UNIVERSAL_PAYLOAD_ACPI_TABLE, Rsdp)) {
+    AcpiTableAddress = (UNIVERSAL_PAYLOAD_ACPI_TABLE *)GET_GUID_HOB_DATA (GuidHob);
+    if (AcpiTableAddress->Header.Length < UNIVERSAL_PAYLOAD_SIZEOF_THROUGH_FIELD (UNIVERSAL_PAYLOAD_ACPI_TABLE, Rsdp)) {
       //
       // Retrun if can't find the ACPI Info Hob with enough length
       //
       return EFI_NOT_FOUND;
     }
 
-    Rsdp = (EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER *)(UINTN)(AcpiTableAdress->Rsdp);
+    Rsdp = (EFI_ACPI_3_0_ROOT_SYSTEM_DESCRIPTION_POINTER *)(UINTN)(AcpiTableAddress->Rsdp);
 
     //
     // An ACPI-compatible OS must use the XSDT if present.
diff --git a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.c b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.c
index 57f15d49ea..27fa0515a0 100644
--- a/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.c
+++ b/MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.c
@@ -447,7 +447,7 @@ BgrtReadyToBootEventNotify (
       return;
     } else {
       //
-      // If BGRT data change happens, then uninstall orignal AcpiTable first
+      // If BGRT data change happens, then uninstall original AcpiTable first
       //
       Status = AcpiTableProtocol->UninstallAcpiTable (
                                     AcpiTableProtocol,
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
index 72de8d3211..a92befe128 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -766,7 +766,7 @@ BdsEntry (
 
   //
   // Initialize L"BootOptionSupport" EFI global variable.
-  // Lazy-ConIn implictly disables BDS hotkey.
+  // Lazy-ConIn implicitly disables BDS hotkey.
   //
   BootOptionSupport = EFI_BOOT_OPTION_SUPPORT_APP | EFI_BOOT_OPTION_SUPPORT_SYSPREP;
   if (!PcdGetBool (PcdConInConnectOnDemand)) {
diff --git a/MdeModulePkg/Universal/CapsuleOnDiskLoadPei/CapsuleOnDiskLoadPei.uni b/MdeModulePkg/Universal/CapsuleOnDiskLoadPei/CapsuleOnDiskLoadPei.uni
index c3eae6a5c2..7a64a58123 100644
--- a/MdeModulePkg/Universal/CapsuleOnDiskLoadPei/CapsuleOnDiskLoadPei.uni
+++ b/MdeModulePkg/Universal/CapsuleOnDiskLoadPei/CapsuleOnDiskLoadPei.uni
@@ -1,5 +1,5 @@
 // /** @file
-// Caspule On Disk Load module.
+// Capsule On Disk Load module.
 //
 // Load Capsule On Disk and build CV hob.
 //
@@ -10,6 +10,6 @@
 // **/
 
 
-#string STR_MODULE_ABSTRACT             #language en-US "Caspule On Disk Load module."
+#string STR_MODULE_ABSTRACT             #language en-US "Capsule On Disk Load module."
 
 #string STR_MODULE_DESCRIPTION          #language en-US "Load Capsule On Disk and build CV hob."
diff --git a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
index 8e26a7d795..11a9d9e5dc 100644
--- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
+++ b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
@@ -676,7 +676,7 @@ SortMemoryResourceDescriptor (
 }
 
 /**
-  Merge continous memory resource entries.
+  Merge continuous memory resource entries.
 
   @param[in, out] MemoryResource    A pointer to the memory resource entry buffer.
 
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
index 700ea9d5c0..1881d36be9 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
@@ -191,7 +191,7 @@ ConPlatformDriverBindingSupported (
   Start this driver on the device for console input.
 
   Start this driver on ControllerHandle by opening Simple Text Input Protocol,
-  reading Device Path, and installing Console In Devcice GUID on ControllerHandle.
+  reading Device Path, and installing Console In Device GUID on ControllerHandle.
 
   Append its device path into the console environment variables ConInDev.
 
@@ -443,7 +443,7 @@ ConPlatformTextOutDriverBindingStart (
 }
 
 /**
-  Stop this driver on ControllerHandle by removing Console In Devcice GUID
+  Stop this driver on ControllerHandle by removing Console In Device GUID
   and closing the Simple Text Input protocol on ControllerHandle.
 
   @param  This              Protocol instance pointer.
@@ -516,7 +516,7 @@ ConPlatformTextInDriverBindingStop (
 }
 
 /**
-  Stop this driver on ControllerHandle by removing Console Out Devcice GUID
+  Stop this driver on ControllerHandle by removing Console Out Device GUID
   and closing the Simple Text Output protocol on ControllerHandle.
 
   @param  This              Protocol instance pointer.
@@ -1168,7 +1168,7 @@ ConPlatformUpdateDeviceVariable (
 
   //
   // Get Variable according to variable name.
-  // The memory for Variable is allocated within ConPlatformGetVarible(),
+  // The memory for Variable is allocated within ConPlatformGetVariable(),
   // it is the caller's responsibility to free the memory before return.
   //
   VariableDevicePath = ConPlatformGetVariable (VariableName);
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
index f63b25c465..a88a788326 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
@@ -111,7 +111,7 @@ ConPlatformTextOutDriverBindingSupported (
   Start this driver on the device for console input.
 
   Start this driver on ControllerHandle by opening Simple Text Input Protocol,
-  reading Device Path, and installing Console In Devcice GUID on ControllerHandle.
+  reading Device Path, and installing Console In Device GUID on ControllerHandle.
 
   Append its device path into the console environment variables ConInDev.
 
@@ -161,7 +161,7 @@ ConPlatformTextOutDriverBindingStart (
   );
 
 /**
-  Stop this driver on ControllerHandle by removing Console In Devcice GUID
+  Stop this driver on ControllerHandle by removing Console In Device GUID
   and closing the Simple Text Input protocol on ControllerHandle.
 
   @param  This              Protocol instance pointer.
@@ -184,7 +184,7 @@ ConPlatformTextInDriverBindingStop (
   );
 
 /**
-  Stop this driver on ControllerHandle by removing Console Out Devcice GUID
+  Stop this driver on ControllerHandle by removing Console Out Device GUID
   and closing the Simple Text Output protocol on ControllerHandle.
 
   @param  This              Protocol instance pointer.
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 8b5e62e3a8..b3b7b703a4 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -3548,8 +3548,8 @@ ConSplitterTextInExDequeueKey (
   @param  Key                      Driver may perform diagnostics on reset.
 
   @retval EFI_SUCCESS              The keystroke information was returned.
-  @retval EFI_NOT_READY            There was no keystroke data availiable.
-  @retval EFI_DEVICE_ERROR         The keydtroke information was not returned due
+  @retval EFI_NOT_READY            There was no keystroke data available.
+  @retval EFI_DEVICE_ERROR         The keystroke information was not returned due
                                    to hardware errors.
 
 **/
@@ -3620,8 +3620,8 @@ ConSplitterTextInPrivateReadKeyStroke (
   @param  Key                      Driver may perform diagnostics on reset.
 
   @retval EFI_SUCCESS              The keystroke information was returned.
-  @retval EFI_NOT_READY            There was no keystroke data availiable.
-  @retval EFI_DEVICE_ERROR         The keydtroke information was not returned due
+  @retval EFI_NOT_READY            There was no keystroke data available.
+  @retval EFI_DEVICE_ERROR         The keystroke information was not returned due
                                    to hardware errors.
 
 **/
@@ -3651,10 +3651,10 @@ ConSplitterTextInReadKeyStroke (
 }
 
 /**
-  This event aggregates all the events of the ConIn devices in the spliter.
+  This event aggregates all the events of the ConIn devices in the splitter.
 
   If any events of physical ConIn devices are signaled, signal the ConIn
-  spliter event. This will cause the calling code to call
+  splitter event. This will cause the calling code to call
   ConSplitterTextInReadKeyStroke ().
 
   @param  Event                    The Event associated with callback.
@@ -3697,7 +3697,7 @@ ConSplitterTextInWaitForKey (
 /**
   Test if the key has been registered on input device.
 
-  @param  RegsiteredData           A pointer to a buffer that is filled in with the
+  @param  RegisteredData           A pointer to a buffer that is filled in with the
                                    keystroke state data for the key that was
                                    registered.
   @param  InputData                A pointer to a buffer that is filled in with the
@@ -3710,14 +3710,14 @@ ConSplitterTextInWaitForKey (
 **/
 BOOLEAN
 IsKeyRegistered (
-  IN EFI_KEY_DATA  *RegsiteredData,
+  IN EFI_KEY_DATA  *RegisteredData,
   IN EFI_KEY_DATA  *InputData
   )
 {
-  ASSERT (RegsiteredData != NULL && InputData != NULL);
+  ASSERT (RegisteredData != NULL && InputData != NULL);
 
-  if ((RegsiteredData->Key.ScanCode    != InputData->Key.ScanCode) ||
-      (RegsiteredData->Key.UnicodeChar != InputData->Key.UnicodeChar))
+  if ((RegisteredData->Key.ScanCode    != InputData->Key.ScanCode) ||
+      (RegisteredData->Key.UnicodeChar != InputData->Key.UnicodeChar))
   {
     return FALSE;
   }
@@ -3725,14 +3725,14 @@ IsKeyRegistered (
   //
   // Assume KeyShiftState/KeyToggleState = 0 in Registered key data means these state could be ignored.
   //
-  if ((RegsiteredData->KeyState.KeyShiftState != 0) &&
-      (RegsiteredData->KeyState.KeyShiftState != InputData->KeyState.KeyShiftState))
+  if ((RegisteredData->KeyState.KeyShiftState != 0) &&
+      (RegisteredData->KeyState.KeyShiftState != InputData->KeyState.KeyShiftState))
   {
     return FALSE;
   }
 
-  if ((RegsiteredData->KeyState.KeyToggleState != 0) &&
-      (RegsiteredData->KeyState.KeyToggleState != InputData->KeyState.KeyToggleState))
+  if ((RegisteredData->KeyState.KeyToggleState != 0) &&
+      (RegisteredData->KeyState.KeyToggleState != InputData->KeyState.KeyToggleState))
   {
     return FALSE;
   }
@@ -3801,7 +3801,7 @@ ConSplitterTextInResetEx (
                                    pressed.
 
   @retval EFI_SUCCESS              The keystroke information was returned.
-  @retval EFI_NOT_READY            There was no keystroke data availiable.
+  @retval EFI_NOT_READY            There was no keystroke data available.
   @retval EFI_DEVICE_ERROR         The keystroke information was not returned due
                                    to hardware errors.
   @retval EFI_INVALID_PARAMETER    KeyData is NULL.
@@ -4203,8 +4203,8 @@ ConSplitterSimplePointerReset (
   @param  State                    The state information of simple pointer device.
 
   @retval EFI_SUCCESS              The keystroke information was returned.
-  @retval EFI_NOT_READY            There was no keystroke data availiable.
-  @retval EFI_DEVICE_ERROR         The keydtroke information was not returned due
+  @retval EFI_NOT_READY            There was no keystroke data available.
+  @retval EFI_DEVICE_ERROR         The keystroke information was not returned due
                                    to hardware errors.
 
 **/
@@ -4271,14 +4271,14 @@ ConSplitterSimplePointerPrivateGetState (
 
 /**
   Reads the next keystroke from the input device. The WaitForKey Event can
-  be used to test for existance of a keystroke via WaitForEvent () call.
+  be used to test for existence of a keystroke via WaitForEvent () call.
 
   @param  This                     A pointer to protocol instance.
   @param  State                    A pointer to state information on the pointer device
 
   @retval EFI_SUCCESS              The keystroke information was returned in State.
-  @retval EFI_NOT_READY            There was no keystroke data availiable.
-  @retval EFI_DEVICE_ERROR         The keydtroke information was not returned due
+  @retval EFI_NOT_READY            There was no keystroke data available.
+  @retval EFI_DEVICE_ERROR         The keystroke information was not returned due
                                    to hardware errors.
 
 **/
@@ -4299,9 +4299,9 @@ ConSplitterSimplePointerGetState (
 }
 
 /**
-  This event aggregates all the events of the ConIn devices in the spliter.
+  This event aggregates all the events of the ConIn devices in the splitter.
   If any events of physical ConIn devices are signaled, signal the ConIn
-  spliter event. This will cause the calling code to call
+  splitter event. This will cause the calling code to call
   ConSplitterTextInReadKeyStroke ().
 
   @param  Event                    The Event associated with callback.
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
index a1fe747260..20ca330df9 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
@@ -462,7 +462,7 @@ ConSplitterStdErrDriverBindingStart (
   );
 
 /**
-  Stop Console In ConSplitter on ControllerHandle by closing Console In Devcice GUID.
+  Stop Console In ConSplitter on ControllerHandle by closing Console In Device GUID.
 
   @param  This              Driver Binding protocol instance pointer.
   @param  ControllerHandle  Handle of device to stop driver on
@@ -507,7 +507,7 @@ ConSplitterSimplePointerDriverBindingStop (
   );
 
 /**
-  Stop Console Out ConSplitter on device handle by closing Console Out Devcice GUID.
+  Stop Console Out ConSplitter on device handle by closing Console Out Device GUID.
 
   @param  This              Driver Binding protocol instance pointer.
   @param  ControllerHandle  Handle of device to stop driver on
@@ -690,13 +690,13 @@ ConSplitterAbsolutePointerGetState (
   );
 
 /**
-  This event agregates all the events of the pointer devices in the splitter.
+  This event aggregates all the events of the pointer devices in the splitter.
 
   If any events of physical pointer devices are signaled, signal the pointer
   splitter event. This will cause the calling code to call
   ConSplitterAbsolutePointerGetState ().
 
-  @param  Event                    The Event assoicated with callback.
+  @param  Event                    The Event associated with callback.
   @param  Context                  Context registered when Event was created.
 
 **/
@@ -1237,7 +1237,7 @@ ConSplitterTextOutDeleteDevice (
 //
 
 /**
-  Reset the input device and optionaly run diagnostics
+  Reset the input device and optionally run diagnostics
 
   @param  This                     Protocol instance pointer.
   @param  ExtendedVerification     Driver may perform diagnostics on reset.
@@ -1256,14 +1256,14 @@ ConSplitterTextInReset (
 
 /**
   Reads the next keystroke from the input device. The WaitForKey Event can
-  be used to test for existance of a keystroke via WaitForEvent () call.
+  be used to test for existence of a keystroke via WaitForEvent () call.
 
   @param  This                     Protocol instance pointer.
   @param  Key                      Driver may perform diagnostics on reset.
 
   @retval EFI_SUCCESS              The keystroke information was returned.
-  @retval EFI_NOT_READY            There was no keystroke data availiable.
-  @retval EFI_DEVICE_ERROR         The keydtroke information was not returned due
+  @retval EFI_NOT_READY            There was no keystroke data available.
+  @retval EFI_DEVICE_ERROR         The keystroke information was not returned due
                                    to hardware errors.
 
 **/
@@ -1311,7 +1311,7 @@ ConSplitterTextInExDeleteDevice (
 //
 
 /**
-  Reset the input device and optionaly run diagnostics
+  Reset the input device and optionally run diagnostics
 
   @param  This                     Protocol instance pointer.
   @param  ExtendedVerification     Driver may perform diagnostics on reset.
@@ -1330,7 +1330,7 @@ ConSplitterTextInResetEx (
 
 /**
   Reads the next keystroke from the input device. The WaitForKey Event can
-  be used to test for existance of a keystroke via WaitForEvent () call.
+  be used to test for existence of a keystroke via WaitForEvent () call.
 
   @param  This                     Protocol instance pointer.
   @param  KeyData                  A pointer to a buffer that is filled in with the
@@ -1338,7 +1338,7 @@ ConSplitterTextInResetEx (
                                    pressed.
 
   @retval EFI_SUCCESS              The keystroke information was returned.
-  @retval EFI_NOT_READY            There was no keystroke data availiable.
+  @retval EFI_NOT_READY            There was no keystroke data available.
   @retval EFI_DEVICE_ERROR         The keystroke information was not returned due
                                    to hardware errors.
   @retval EFI_INVALID_PARAMETER    KeyData is NULL.
@@ -1425,13 +1425,13 @@ ConSplitterTextInUnregisterKeyNotify (
   );
 
 /**
-  This event aggregates all the events of the ConIn devices in the spliter.
+  This event aggregates all the events of the ConIn devices in the splitter.
 
   If any events of physical ConIn devices are signaled, signal the ConIn
-  spliter event. This will cause the calling code to call
+  splitter event. This will cause the calling code to call
   ConSplitterTextInReadKeyStroke ().
 
-  @param  Event                    The Event assoicated with callback.
+  @param  Event                    The Event associated with callback.
   @param  Context                  Context registered when Event was created.
 
 **/
@@ -1444,14 +1444,14 @@ ConSplitterTextInWaitForKey (
 
 /**
   Reads the next keystroke from the input device. The WaitForKey Event can
-  be used to test for existance of a keystroke via WaitForEvent () call.
+  be used to test for existence of a keystroke via WaitForEvent () call.
 
   @param  Private                  Protocol instance pointer.
   @param  Key                      Driver may perform diagnostics on reset.
 
   @retval EFI_SUCCESS              The keystroke information was returned.
-  @retval EFI_NOT_READY            There was no keystroke data availiable.
-  @retval EFI_DEVICE_ERROR         The keydtroke information was not returned due
+  @retval EFI_NOT_READY            There was no keystroke data available.
+  @retval EFI_DEVICE_ERROR         The keystroke information was not returned due
                                    to hardware errors.
 
 **/
@@ -1463,7 +1463,7 @@ ConSplitterTextInPrivateReadKeyStroke (
   );
 
 /**
-  Reset the input device and optionaly run diagnostics
+  Reset the input device and optionally run diagnostics
 
   @param  This                     Protocol instance pointer.
   @param  ExtendedVerification     Driver may perform diagnostics on reset.
@@ -1482,14 +1482,14 @@ ConSplitterSimplePointerReset (
 
 /**
   Reads the next keystroke from the input device. The WaitForKey Event can
-  be used to test for existance of a keystroke via WaitForEvent () call.
+  be used to test for existence of a keystroke via WaitForEvent () call.
 
   @param  This                     A pointer to protocol instance.
   @param  State                    A pointer to state information on the pointer device
 
   @retval EFI_SUCCESS              The keystroke information was returned in State.
-  @retval EFI_NOT_READY            There was no keystroke data availiable.
-  @retval EFI_DEVICE_ERROR         The keydtroke information was not returned due
+  @retval EFI_NOT_READY            There was no keystroke data available.
+  @retval EFI_DEVICE_ERROR         The keystroke information was not returned due
                                    to hardware errors.
 
 **/
@@ -1501,12 +1501,12 @@ ConSplitterSimplePointerGetState (
   );
 
 /**
-  This event agregates all the events of the ConIn devices in the spliter.
+  This event aggregates all the events of the ConIn devices in the splitter.
   If any events of physical ConIn devices are signaled, signal the ConIn
-  spliter event. This will cause the calling code to call
+  splitter event. This will cause the calling code to call
   ConSplitterTextInReadKeyStroke ().
 
-  @param  Event                    The Event assoicated with callback.
+  @param  Event                    The Event associated with callback.
   @param  Context                  Context registered when Event was created.
 
 **/
@@ -1522,10 +1522,10 @@ ConSplitterSimplePointerWaitForInput (
 //
 
 /**
-  Reset the text output device hardware and optionaly run diagnostics
+  Reset the text output device hardware and optionally run diagnostics
 
   @param  This                     Protocol instance pointer.
-  @param  ExtendedVerification     Driver may perform more exhaustive verfication
+  @param  ExtendedVerification     Driver may perform more exhaustive verification
                                    operation of the device during reset.
 
   @retval EFI_SUCCESS              The text output device was reset.
@@ -1832,7 +1832,7 @@ ConSplitterGraphicsOutputSetMode (
 
   @retval EFI_SUCCESS             The Blt operation completed.
   @retval EFI_INVALID_PARAMETER   BltOperation is not valid.
-  @retval EFI_DEVICE_ERROR        A hardware error occurred writting to the video
+  @retval EFI_DEVICE_ERROR        A hardware error occurred writing to the video
                                   buffer.
 
 **/
@@ -1945,7 +1945,7 @@ ConSplitterUgaDrawSetMode (
 
   @retval EFI_SUCCESS            The Blt operation completed.
   @retval EFI_INVALID_PARAMETER  BltOperation is not valid.
-  @retval EFI_DEVICE_ERROR       A hardware error occurred writting to the video buffer.
+  @retval EFI_DEVICE_ERROR       A hardware error occurred writing to the video buffer.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
index 64ad567a6d..bbdef81d72 100644
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterGraphics.c
@@ -1,5 +1,5 @@
 /** @file
-  Support for Graphics output spliter.
+  Support for Graphics output splitter.
 
 Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -237,7 +237,7 @@ ConSplitterGraphicsOutputSetMode (
 
   @retval EFI_SUCCESS             The Blt operation completed.
   @retval EFI_INVALID_PARAMETER   BltOperation is not valid.
-  @retval EFI_DEVICE_ERROR        A hardware error occurred writting to the video
+  @retval EFI_DEVICE_ERROR        A hardware error occurred writing to the video
                                   buffer.
 
 **/
@@ -513,7 +513,7 @@ ConSplitterUgaDrawSetMode (
 
   @retval EFI_SUCCESS            The Blt operation completed.
   @retval EFI_INVALID_PARAMETER  BltOperation is not valid.
-  @retval EFI_DEVICE_ERROR       A hardware error occurred writting to the video buffer.
+  @retval EFI_DEVICE_ERROR       A hardware error occurred writing to the video buffer.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
index 4238f8420e..c39f9ec1e5 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
@@ -235,7 +235,7 @@ TerminalConInReadKeyStroke (
 /**
   Check if the key already has been registered.
 
-  @param  RegsiteredData           A pointer to a buffer that is filled in with the
+  @param  RegisteredData           A pointer to a buffer that is filled in with the
                                    keystroke state data for the key that was
                                    registered.
   @param  InputData                A pointer to a buffer that is filled in with the
@@ -248,7 +248,7 @@ TerminalConInReadKeyStroke (
 **/
 BOOLEAN
 IsKeyRegistered (
-  IN EFI_KEY_DATA  *RegsiteredData,
+  IN EFI_KEY_DATA  *RegisteredData,
   IN EFI_KEY_DATA  *InputData
   );
 
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
index 2286264b29..88fb9f6d01 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
@@ -140,9 +140,9 @@ TerminalConInReadKeyStroke (
 /**
   Check if the key already has been registered.
 
-  If both RegsiteredData and InputData is NULL, then ASSERT().
+  If both RegisteredData and InputData is NULL, then ASSERT().
 
-  @param  RegsiteredData           A pointer to a buffer that is filled in with the
+  @param  RegisteredData           A pointer to a buffer that is filled in with the
                                    keystroke state data for the key that was
                                    registered.
   @param  InputData                A pointer to a buffer that is filled in with the
@@ -155,14 +155,14 @@ TerminalConInReadKeyStroke (
 **/
 BOOLEAN
 IsKeyRegistered (
-  IN EFI_KEY_DATA  *RegsiteredData,
+  IN EFI_KEY_DATA  *RegisteredData,
   IN EFI_KEY_DATA  *InputData
   )
 {
-  ASSERT (RegsiteredData != NULL && InputData != NULL);
+  ASSERT (RegisteredData != NULL && InputData != NULL);
 
-  if ((RegsiteredData->Key.ScanCode    != InputData->Key.ScanCode) ||
-      (RegsiteredData->Key.UnicodeChar != InputData->Key.UnicodeChar))
+  if ((RegisteredData->Key.ScanCode    != InputData->Key.ScanCode) ||
+      (RegisteredData->Key.UnicodeChar != InputData->Key.UnicodeChar))
   {
     return FALSE;
   }
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
index f79ad0489c..e464ff9f99 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.c
@@ -584,7 +584,7 @@ DebugPortRead (
   @param  Buffer              Pointer to buffer to read.
 
   @retval EFI_SUCCESS         The data was written.
-  @retval others              Fails when writting datas to debug port device.
+  @retval others              Fails when writing datas to debug port device.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
index 48be8ef16b..6b96bbb02f 100644
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPort.h
@@ -354,7 +354,7 @@ DebugPortRead (
   @param  Buffer              Pointer to buffer to read.
 
   @retval EFI_SUCCESS         The data was written.
-  @retval others              Fails when writting datas to debug port device.
+  @retval others              Fails when writing datas to debug port device.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/DebugServicePei/DebugServicePei.c b/MdeModulePkg/Universal/DebugServicePei/DebugServicePei.c
index b3407279c8..d3fcfe4535 100644
--- a/MdeModulePkg/Universal/DebugServicePei/DebugServicePei.c
+++ b/MdeModulePkg/Universal/DebugServicePei/DebugServicePei.c
@@ -73,18 +73,18 @@ PeiDebugAssert (
 /**
   Entry point of Debug Service PEIM
 
-  This funciton installs EDKII DEBUG PPI
+  This function installs EDKII DEBUG PPI
 
   @param  FileHandle  Handle of the file being invoked.
   @param  PeiServices Describes the list of possible PEI Services.
 
-  @retval EFI_SUCESS  The entry point of Debug Service PEIM executes successfully.
+  @retval EFI_SUCCESS The entry point of Debug Service PEIM executes successfully.
   @retval Others      Some error occurs during the execution of this function.
 
 **/
 EFI_STATUS
 EFIAPI
-DebugSerivceInitialize (
+DebugServiceInitialize (
   IN EFI_PEI_FILE_HANDLE     FileHandle,
   IN CONST EFI_PEI_SERVICES  **PeiServices
   )
diff --git a/MdeModulePkg/Universal/DebugServicePei/DebugServicePei.inf b/MdeModulePkg/Universal/DebugServicePei/DebugServicePei.inf
index eb76af0343..91b35b1870 100644
--- a/MdeModulePkg/Universal/DebugServicePei/DebugServicePei.inf
+++ b/MdeModulePkg/Universal/DebugServicePei/DebugServicePei.inf
@@ -17,7 +17,7 @@
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
 
-  ENTRY_POINT                    = DebugSerivceInitialize
+  ENTRY_POINT                    = DebugServiceInitialize
 
 #
 # The following information is for reference only and not required by the build tools.
diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c
index 40fe74d8c2..433497f8b1 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c
@@ -89,7 +89,7 @@ HookEntry (
   //
   ReadIdtGateDescriptor (ExceptionType, &(IdtEntryTable[ExceptionType].OrigDesc));
   //
-  // stores orignal interrupt handle
+  // stores original interrupt handle
   //
   IdtEntryTable[ExceptionType].OrigVector = (DEBUG_PROC)GetInterruptHandleFromIdt (&(IdtEntryTable[ExceptionType].OrigDesc));
 
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
index 38af39f41e..e7e09f0bbd 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
@@ -1034,7 +1034,7 @@ DiskIo2ReadWriteDisk (
                                                                          Event will be signaled upon completion.
   @retval EFI_DEVICE_ERROR      The device reported an error while performing the write.
   @retval EFI_NO_MEDIA          There is no medium in the device.
-  @retval EFI_MEDIA_CHNAGED     The MediaId is not for the current medium.
+  @retval EFI_MEDIA_CHANGED     The MediaId is not for the current medium.
   @retval EFI_INVALID_PARAMETER The read request contains device addresses that are not valid for the device.
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.
 
@@ -1078,7 +1078,7 @@ DiskIo2ReadDiskEx (
   @retval EFI_WRITE_PROTECTED   The device cannot be written to.
   @retval EFI_DEVICE_ERROR      The device reported an error while performing the write operation.
   @retval EFI_NO_MEDIA          There is no medium in the device.
-  @retval EFI_MEDIA_CHNAGED     The MediaId is not for the current medium.
+  @retval EFI_MEDIA_CHANGED     The MediaId is not for the current medium.
   @retval EFI_INVALID_PARAMETER The write request contains device addresses that are not valid for the device.
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.
 
@@ -1208,7 +1208,7 @@ DiskIo2FlushDiskEx (
   @retval EFI_SUCCESS           The data was read correctly from the device.
   @retval EFI_DEVICE_ERROR      The device reported an error while performing the read.
   @retval EFI_NO_MEDIA          There is no media in the device.
-  @retval EFI_MEDIA_CHNAGED     The MediaId does not matched the current device.
+  @retval EFI_MEDIA_CHANGED     The MediaId does not matched the current device.
   @retval EFI_INVALID_PARAMETER The read request contains device addresses that are not
                                 valid for the device.
 
@@ -1254,7 +1254,7 @@ DiskIoReadDisk (
   @retval EFI_WRITE_PROTECTED   The device can not be written to.
   @retval EFI_DEVICE_ERROR      The device reported an error while performing the write.
   @retval EFI_NO_MEDIA          There is no media in the device.
-  @retval EFI_MEDIA_CHNAGED     The MediaId does not matched the current device.
+  @retval EFI_MEDIA_CHANGED     The MediaId does not matched the current device.
   @retval EFI_INVALID_PARAMETER The write request contains device addresses that are not
                                  valid for the device.
 
diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
index 13edb5ff7b..3c89fe042a 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.h
@@ -182,7 +182,7 @@ DiskIoDriverBindingStop (
   @retval EFI_SUCCESS           The data was read correctly from the device.
   @retval EFI_DEVICE_ERROR      The device reported an error while performing the read.
   @retval EFI_NO_MEDIA          There is no media in the device.
-  @retval EFI_MEDIA_CHNAGED     The MediaId does not matched the current device.
+  @retval EFI_MEDIA_CHANGED     The MediaId does not matched the current device.
   @retval EFI_INVALID_PARAMETER The read request contains device addresses that are not
                                 valid for the device.
 
@@ -217,7 +217,7 @@ DiskIoReadDisk (
   @retval EFI_WRITE_PROTECTED   The device can not be written to.
   @retval EFI_DEVICE_ERROR      The device reported an error while performing the write.
   @retval EFI_NO_MEDIA          There is no media in the device.
-  @retval EFI_MEDIA_CHNAGED     The MediaId does not matched the current device.
+  @retval EFI_MEDIA_CHANGED     The MediaId does not matched the current device.
   @retval EFI_INVALID_PARAMETER The write request contains device addresses that are not
                                  valid for the device.
 
@@ -264,7 +264,7 @@ DiskIo2Cancel (
                                                                          Event will be signaled upon completion.
   @retval EFI_DEVICE_ERROR      The device reported an error while performing the write.
   @retval EFI_NO_MEDIA          There is no medium in the device.
-  @retval EFI_MEDIA_CHNAGED     The MediaId is not for the current medium.
+  @retval EFI_MEDIA_CHANGED     The MediaId is not for the current medium.
   @retval EFI_INVALID_PARAMETER The read request contains device addresses that are not valid for the device.
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.
 
@@ -297,7 +297,7 @@ DiskIo2ReadDiskEx (
   @retval EFI_WRITE_PROTECTED   The device cannot be written to.
   @retval EFI_DEVICE_ERROR      The device reported an error while performing the write operation.
   @retval EFI_NO_MEDIA          There is no medium in the device.
-  @retval EFI_MEDIA_CHNAGED     The MediaId is not for the current medium.
+  @retval EFI_MEDIA_CHANGED     The MediaId is not for the current medium.
   @retval EFI_INVALID_PARAMETER The write request contains device addresses that are not valid for the device.
   @retval EFI_OUT_OF_RESOURCES  The request could not be completed due to a lack of resources.
 
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
index bc89559727..8974230cf9 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
@@ -713,7 +713,7 @@ PartitionReadBlocks (
   @retval EFI_WRITE_PROTECTED   The device can not be written to.
   @retval EFI_DEVICE_ERROR      The device reported an error while performing the write.
   @retval EFI_NO_MEDIA          There is no media in the device.
-  @retval EFI_MEDIA_CHNAGED     The MediaId does not matched the current device.
+  @retval EFI_MEDIA_CHANGED     The MediaId does not matched the current device.
   @retval EFI_BAD_BUFFER_SIZE   The Buffer was not a multiple of the block size of the device.
   @retval EFI_INVALID_PARAMETER The write request contains a LBA that is not
                                 valid for the device.
@@ -757,7 +757,7 @@ PartitionWriteBlocks (
   @param  This              Protocol instance pointer.
 
   @retval EFI_SUCCESS       All outstanding data was written to the device
-  @retval EFI_DEVICE_ERROR  The device reported an error while writting back the data
+  @retval EFI_DEVICE_ERROR  The device reported an error while writing back the data
   @retval EFI_NO_MEDIA      There is no media in the device.
 
 **/
@@ -1001,7 +1001,7 @@ PartitionReadBlocksEx (
                                 the Event is NULL.
   @retval EFI_WRITE_PROTECTED   The device can not be written to.
   @retval EFI_NO_MEDIA          There is no media in the device.
-  @retval EFI_MEDIA_CHNAGED     The MediaId does not matched the current device.
+  @retval EFI_MEDIA_CHANGED     The MediaId does not matched the current device.
   @retval EFI_DEVICE_ERROR      The device reported an error while performing the write.
   @retval EFI_BAD_BUFFER_SIZE   The Buffer was not a multiple of the block size of the device.
   @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not valid,
@@ -1068,7 +1068,7 @@ PartitionWriteBlocksEx (
   @retval EFI_SUCCESS          The flush request was queued if Event is not NULL.
                                All outstanding data was written correctly to the
                                device if the Event is NULL.
-  @retval EFI_DEVICE_ERROR     The device reported an error while writting back
+  @retval EFI_DEVICE_ERROR     The device reported an error while writing back
                                the data.
   @retval EFI_WRITE_PROTECTED  The device cannot be written to.
   @retval EFI_NO_MEDIA         There is no media in the device.
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskBlockIo.c b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskBlockIo.c
index 4fbbb1f3b4..a7ec9aa036 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskBlockIo.c
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskBlockIo.c
@@ -191,7 +191,7 @@ RamDiskBlkIoReadBlocks (
   @retval EFI_DEVICE_ERROR        The device reported an error while performing
                                   the write.
   @retval EFI_NO_MEDIA            There is no media in the device.
-  @retval EFI_MEDIA_CHNAGED       The MediaId does not matched the current
+  @retval EFI_MEDIA_CHANGED       The MediaId does not matched the current
                                   device.
   @retval EFI_BAD_BUFFER_SIZE     The Buffer was not a multiple of the block
                                   size of the device.
@@ -258,7 +258,7 @@ RamDiskBlkIoWriteBlocks (
   @param[in] This            Indicates a pointer to the calling context.
 
   @retval EFI_SUCCESS             All outstanding data was written to the device.
-  @retval EFI_DEVICE_ERROR        The device reported an error while writting
+  @retval EFI_DEVICE_ERROR        The device reported an error while writing
                                   back the data
   @retval EFI_NO_MEDIA            There is no media in the device.
 
diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h
index e194951805..b20691971e 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h
@@ -272,7 +272,7 @@ RamDiskBlkIoReadBlocks (
   @retval EFI_DEVICE_ERROR        The device reported an error while performing
                                   the write.
   @retval EFI_NO_MEDIA            There is no media in the device.
-  @retval EFI_MEDIA_CHNAGED       The MediaId does not matched the current
+  @retval EFI_MEDIA_CHANGED       The MediaId does not matched the current
                                   device.
   @retval EFI_BAD_BUFFER_SIZE     The Buffer was not a multiple of the block
                                   size of the device.
@@ -296,7 +296,7 @@ RamDiskBlkIoWriteBlocks (
   @param[in] This            Indicates a pointer to the calling context.
 
   @retval EFI_SUCCESS             All outstanding data was written to the device.
-  @retval EFI_DEVICE_ERROR        The device reported an error while writting
+  @retval EFI_DEVICE_ERROR        The device reported an error while writing
                                   back the data
   @retval EFI_NO_MEDIA            There is no media in the device.
 
diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
index a7b7dc743a..71f1182038 100644
--- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
@@ -3518,7 +3518,7 @@ UiDisplayMenu (
         Difference = MoveToNextStatement (TRUE, &NewPos, MenuOption->Row - TopRow, FALSE);
         if (Difference < 0) {
           //
-          // We hit the begining MenuOption that can be focused
+          // We hit the beginning MenuOption that can be focused
           // so we simply scroll to the top.
           //
           Repaint = TRUE;
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index 62ba52e940..353eae7bce 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -1733,7 +1733,7 @@ DriverCallback (
   @param ImageHandle     Image handle this driver.
   @param SystemTable     Pointer to SystemTable.
 
-  @retval EFI_SUCESS     This function always complete successfully.
+  @retval EFI_SUCCESS    This function always complete successfully.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommand.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommand.c
index e099b16986..4067d24d9b 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommand.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbCommand.c
@@ -419,7 +419,7 @@ EFI_DEBUGGER_COMMAND_SET  mDebuggerCommandSet[] = {
     L"",
     L"The display symbol command will configure the symbol show or not-show when disassembly.\n\n"
     L"DISPLAYSYMBOL [on|off]\n"
-    L"  (No Argument) - swtich symbol output state to another one\n"
+    L"  (No Argument) - switch symbol output state to another one\n"
     L"  on            - enable symbol output\n"
     L"  off           - disable symbol output\n",
     L"",
@@ -432,7 +432,7 @@ EFI_DEBUGGER_COMMAND_SET  mDebuggerCommandSet[] = {
     L"",
     L"The display code command will configure the source code only show or misc source code with assembly.\n\n"
     L"DISPLAYCODE [on|off]\n"
-    L"  (No Argument) - swtich source only output state to another one\n"
+    L"  (No Argument) - switch source only output state to another one\n"
     L"  on            - enable source only output\n"
     L"  off           - disable source only output\n",
     L"",
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupport.h b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupport.h
index 43f750440f..c76cb2e496 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupport.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupport.h
@@ -427,7 +427,7 @@ EDBSPrintWithOffset (
 /**
 
   Read a file.
-  If ScanFs is FLASE, it will use DebuggerPrivate->Vol as default Fs.
+  If ScanFs is FALSE, it will use DebuggerPrivate->Vol as default Fs.
   If ScanFs is TRUE, it will scan all FS and check the file.
   If there is only one file match the name, it will be read.
   If there is more than one file match the name, it will return Error.
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportFile.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportFile.c
index cef5141423..3cf8317dc6 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportFile.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportFile.c
@@ -122,7 +122,7 @@ ReadFileFromVol (
 /**
 
   Read a file.
-  If ScanFs is FLASE, it will use DebuggerPrivate->Vol as default Fs.
+  If ScanFs is FALSE, it will use DebuggerPrivate->Vol as default Fs.
   If ScanFs is TRUE, it will scan all FS and check the file.
   If there is only one file match the name, it will be read.
   If there is more than one file match the name, it will return Error.
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
index 834c90e32a..8a81d38c9b 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSymbol.c
@@ -1773,7 +1773,7 @@ FindSymbolStr (
   Get line number and offset from this line in code file.
 
   @param  Line            - Line buffer in code file
-  @param  Offset          - Offset to functin entry
+  @param  Offset          - Offset to function entry
 
   @return Line number
 
@@ -1867,7 +1867,7 @@ typedef enum {
   Get line number from this code file.
 
   @param  Entry           - Symbol entry
-  @param  FuncOffset      - Offset to functin entry
+  @param  FuncOffset      - Offset to function entry
   @param  SearchType      - Search type for the code
 
   @return Line number
@@ -1981,7 +1981,7 @@ EdbGetLineNumberFromCode (
   @param  LineNumber      - line number
   @param  FuncEnd         - Function end
 
-  @return Funtion start
+  @return Function start
 
 **/
 VOID *
@@ -2045,10 +2045,10 @@ EdbGetSourceStrFromCodeByLine (
   Get source string from this code file.
 
   @param  Entry           - Symbol entry
-  @param  FuncOffset      - Offset to functin entry
+  @param  FuncOffset      - Offset to function entry
   @param  FuncEnd         - Function end
 
-  @retval Funtion start
+  @retval Function start
 
 **/
 VOID *
diff --git a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
index 3221f95a73..9947b3b9ac 100644
--- a/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcExecute.c
@@ -430,7 +430,7 @@ ConvertStackAddr (
   appropriate subfunction, then writes back the returned result.
 
   Format:
-    INSTRUCITON[32|64] {@}R1, {@}R2 {Immed16|Index16}
+    INSTRUCTION[32|64] {@}R1, {@}R2 {Immed16|Index16}
 
   @param  VmPtr             A pointer to VM context.
   @param  IsSignedOp        Indicates whether the operand is signed or not.
@@ -742,7 +742,7 @@ ExecutePOP (
   appropriate subfunction, then writes back the returned result.
 
   Format:
-    INSTRUCITON[32|64] {@}R1, {@}R2 {Immed16|Index16}
+    INSTRUCTION[32|64] {@}R1, {@}R2 {Immed16|Index16}
 
   @param  VmPtr             A pointer to VM context.
 
@@ -764,7 +764,7 @@ ExecuteSignedDataManip (
   appropriate subfunction, then writes back the returned result.
 
   Format:
-    INSTRUCITON[32|64] {@}R1, {@}R2 {Immed16|Index16}
+    INSTRUCTION[32|64] {@}R1, {@}R2 {Immed16|Index16}
 
   @param  VmPtr             A pointer to VM context.
 
@@ -4126,7 +4126,7 @@ ExecuteEXTNDD (
   appropriate subfunction, then writes back the returned result.
 
   Format:
-    INSTRUCITON[32|64] {@}R1, {@}R2 {Immed16|Index16}
+    INSTRUCTION[32|64] {@}R1, {@}R2 {Immed16|Index16}
 
   @param  VmPtr             A pointer to VM context.
 
@@ -4155,7 +4155,7 @@ ExecuteSignedDataManip (
   appropriate subfunction, then writes back the returned result.
 
   Format:
-    INSTRUCITON[32|64] {@}R1, {@}R2 {Immed16|Index16}
+    INSTRUCTION[32|64] {@}R1, {@}R2 {Immed16|Index16}
 
   @param  VmPtr             A pointer to VM context.
 
@@ -4184,7 +4184,7 @@ ExecuteUnsignedDataManip (
   appropriate subfunction, then writes back the returned result.
 
   Format:
-    INSTRUCITON[32|64] {@}R1, {@}R2 {Immed16|Index16}
+    INSTRUCTION[32|64] {@}R1, {@}R2 {Immed16|Index16}
 
   @param  VmPtr             A pointer to VM context.
   @param  IsSignedOp        Indicates whether the operand is signed or not.
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c
index 965dd3968e..330a2e7b70 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.c
@@ -17,7 +17,7 @@
   The write record has three states to specify the different phase of write operation.
   1) WRITE_ALLOCATED is that the record is allocated in write space.
      The information of write operation is stored in write record structure.
-  2) SPARE_COMPLETED is that the data from write buffer is writed into the spare block as the backup.
+  2) SPARE_COMPLETED is that the data from write buffer is written into the spare block as the backup.
   3) WRITE_COMPLETED is that the data is copied from the spare block to the target block.
 
   This driver operates the data as the whole size of spare block.
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
index 8c2d209fa0..30cf2363c9 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.c
@@ -17,7 +17,7 @@
   The write record has three states to specify the different phase of write operation.
   1) WRITE_ALLOCATED is that the record is allocated in write space.
      The information of write operation is stored in write record structure.
-  2) SPARE_COMPLETED is that the data from write buffer is writed into the spare block as the backup.
+  2) SPARE_COMPLETED is that the data from write buffer is written into the spare block as the backup.
   3) WRITE_COMPLETED is that the data is copied from the spare block to the target block.
 
   This driver operates the data as the whole size of spare block.
diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c
index d273e4d27d..8364dfecf7 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.c
@@ -525,7 +525,7 @@ SmmFtwReady (
   @param[in]  ImageHandle       The firmware allocated handle for the UEFI image.
   @param[in]  SystemTable       A pointer to the EFI system table.
 
-  @retval     EFI_SUCCESS       This funtion always return EFI_SUCCESS.
+  @retval     EFI_SUCCESS       This function always return EFI_SUCCESS.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 5ae6189a28..94684d7002 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -2717,7 +2717,7 @@ ParseIfrData (
           }
         } else {
           //
-          // When flag is not set, default value is FASLE.
+          // When flag is not set, default value is FALSE.
           //
           DefaultData.Type = DefaultValueFromDefault;
           if (QuestionReferBitField) {
@@ -3786,7 +3786,7 @@ UpdateDefaultValue (
       EndBit   = StartBit + BlockData->BitWidth - 1;
 
       //
-      // Set the bit field default value to related bit filed, then we will got the new default vaule for the block data.
+      // Set the bit field default value to related bit filed, then we will got the new default value for the block data.
       //
       DefaultValueData->Value.u32 = BitFieldWrite32 (0, StartBit, EndBit, BitFieldDefaultValue);
     }
@@ -5410,7 +5410,7 @@ HiiConfigRoutingExportConfig (
   @param  This                   A pointer to the EFI_HII_CONFIG_ROUTING_PROTOCOL
                                  instance.
   @param  Configuration          A null-terminated Unicode string in
-                                 <MulltiConfigResp> format.
+                                 <MultiConfigResp> format.
   @param  Progress               A pointer to a string filled in with the offset of
                                  the most recent & before the first failing name /
                                  value pair (or the beginning of the string if the
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index 421c293cfc..3fbf4cd5ce 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -1905,7 +1905,7 @@ HiiConfigRoutingExportConfig (
   @param  This                    A pointer to the EFI_HII_CONFIG_ROUTING_PROTOCOL
                                   instance.
   @param  Configuration           A null-terminated Unicode string in
-                                  <MulltiConfigResp> format.
+                                  <MultiConfigResp> format.
   @param  Progress                A pointer to a string filled in with the offset
                                   of the most recent & before the first failing
                                   name / value pair (or the beginning of the string
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni
index c799672b7b..675dfaf782 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.uni
@@ -1,7 +1,7 @@
 // /** @file
 // The DXE driver produces HII protocols defined in UEFI specification.
 //
-// This driver produces all required HII serivces that includes HiiDataBase, HiiString,
+// This driver produces all required HII services that includes HiiDataBase, HiiString,
 // HiiFont, HiiConfigRouting. To support UEFI HII, this driver is required.
 //
 // Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
index 0116fb6ecb..38ca221d96 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
@@ -1,7 +1,7 @@
 ## @file
 # The DXE driver produces HII protocols defined in UEFI specification.
 #
-# This driver produces all required HII serivces that includes HiiDataBase, HiiString,
+# This driver produces all required HII services that includes HiiDataBase, HiiString,
 # HiiFont, HiiConfigRouting. To support UEFI HII, this driver is required.
 #
 # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
index b5b9625969..68d51f2f1a 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
@@ -643,9 +643,9 @@ HiiNewImage (
   EfiAcquireLock (&mHiiDatabaseLock);
 
   //
-  // Calcuate the size of new image.
+  // Calculate the size of new image.
   // Make sure the size doesn't overflow UINT32.
-  // Note: 24Bit BMP occpuies 3 bytes per pixel.
+  // Note: 24Bit BMP occupies 3 bytes per pixel.
   //
   NewBlockSize = (UINT32)Image->Width * Image->Height;
   if (NewBlockSize > (MAX_UINT32 - (sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) - sizeof (EFI_HII_RGB_PIXEL))) / 3) {
@@ -1174,7 +1174,7 @@ HiiSetImage (
   //
   // Make sure the final package length doesn't overflow.
   // Length of the package header is represented using 24 bits. So MAX length is MAX_UINT24.
-  // 24Bit BMP occpuies 3 bytes per pixel.
+  // 24Bit BMP occupies 3 bytes per pixel.
   //
   NewBlockSize = (UINT32)Image->Width * Image->Height;
   if (NewBlockSize > (MAX_UINT32 - (sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) - sizeof (EFI_HII_RGB_PIXEL))) / 3) {
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
index e3fceed7c4..f3859cf8a7 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
@@ -27,7 +27,7 @@ CHAR16  mLanguageWindow[16] = {
 
   @param  Private                Hii database private structure.
   @param  StringPackage          HII string package instance.
-  @param  FontId                Font identifer, which must be unique within the string package.
+  @param  FontId                 Font identifier, which must be unique within the string package.
   @param  DuplicateEnable        If true, duplicate HII_FONT_INFO which refers to
                                  the same EFI_FONT_INFO is permitted. Otherwise it
                                  is not allowed.
diff --git a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c
index dd0ae5001d..e13092ce14 100644
--- a/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c
+++ b/MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSample.c
@@ -57,7 +57,7 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePath = {
   @param[in] ImageHandle     Image handle this driver.
   @param[in] SystemTable     Pointer to SystemTable.
 
-  @retval EFI_SUCESS     This function always complete successfully.
+  @retval EFI_SUCCESS        This function always complete successfully.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
index 855ba3cceb..02d30db0f4 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -95,7 +95,7 @@ GET_PCD_INFO_PROTOCOL  mGetPcdInfoInstance = {
 
 ///
 /// Instance of EFI_GET_PCD_INFO_PROTOCOL which is defined in PI 1.2.1 Vol 3.
-/// This PPI instance only support dyanmicEx type PCD.
+/// This PPI instance only support dynamicEx type PCD.
 ///
 EFI_GET_PCD_INFO_PROTOCOL  mEfiGetPcdInfoInstance = {
   DxeGetPcdInfoGetInfoEx,
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index eb9f757f14..6fc53e4943 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -48,8 +48,8 @@
 #         If module is release as binary and will not pariticpate platform building,
 #         the dynamic PCD used by this module need be accessed as:
 #               PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)
-#         Developer need explicity gives {Token Space Guid:Token Number} as parameter
-#         in writting source code.
+#         Developer need explicitly gives {Token Space Guid:Token Number} as parameter
+#         in writing source code.
 #
 #    2.3 According to PCD value's storage method, dynamic PCD could be classfied as:
 #      a) Default Storage:
@@ -79,7 +79,7 @@
 #           DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.
 #
 #    2.4 When and how to use dynamic PCD
-#      Module developer do not care the used PCD is dynamic or static when writting
+#      Module developer do not care the used PCD is dynamic or static when writing
 #      source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator
 #      in platform DSC file. Please ref section 2.3 to get matching between dynamic
 #      PCD type and section name in DSC file.
diff --git a/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni b/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni
index 6a3b3db4c6..d5a45e2339 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni
+++ b/MdeModulePkg/Universal/PCD/Dxe/PcdDxe.uni
@@ -48,8 +48,8 @@
 // If module is release as binary and will not pariticpate platform building,
 // the dynamic PCD used by this module need be accessed as:
 // PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)
-// Developer need explicity gives {Token Space Guid:Token Number} as parameter
-// in writting source code.
+// Developer need explicitly gives {Token Space Guid:Token Number} as parameter
+// in writing source code.
 //
 // 2.3 According to PCD value's storage method, dynamic PCD could be classfied as:
 // a) Default Storage:
@@ -79,7 +79,7 @@
 // DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.
 //
 // 2.4 When and how to use dynamic PCD
-// Module developer do not care the used PCD is dynamic or static when writting
+// Module developer do not care the used PCD is dynamic or static when writing
 // source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator
 // in platform DSC file. Please ref section 2.3 to get matching between dynamic
 // PCD type and section name in DSC file.
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.c b/MdeModulePkg/Universal/PCD/Dxe/Service.c
index 1ae06a639c..f27341d7ce 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.c
@@ -1022,7 +1022,7 @@ GetHiiVariable (
   Invoke the callback function when dynamic PCD entry was set, if this PCD entry
   has registered callback function.
 
-  @param ExTokenNumber   DynamicEx PCD's token number, if this PCD entry is dyanmicEx
+  @param ExTokenNumber   DynamicEx PCD's token number, if this PCD entry is dynamicEx
                          type PCD.
   @param Guid            DynamicEx PCD's guid, if this PCD entry is dynamicEx type
                          PCD.
diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index 6f4a6c72ff..4e115dc109 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -30,7 +30,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/UefiRuntimeServicesTableLib.h>
 
 //
-// Please make sure the PCD Serivce DXE Version is consistent with
+// Please make sure the PCD Service DXE Version is consistent with
 // the version of the generated DXE PCD Database by build tool.
 //
 #define PCD_SERVICE_DXE_VERSION  7
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
index c51ac96a32..e62c55c089 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c
@@ -54,7 +54,7 @@ PCD_PPI  mPcdPpiInstance = {
 
 ///
 /// Instance of EFI_PEI_PCD_PPI which is defined in PI 1.2 Vol 3.
-/// This PPI instance only support dyanmicEx type PCD.
+/// This PPI instance only support dynamicEx type PCD.
 ///
 EFI_PEI_PCD_PPI  mEfiPcdPpiInstance = {
   PeiPcdSetSku,
@@ -90,7 +90,7 @@ GET_PCD_INFO_PPI  mGetPcdInfoInstance = {
 
 ///
 /// Instance of EFI_GET_PCD_INFO_PPI which is defined in PI 1.2.1 Vol 3.
-/// This PPI instance only support dyanmicEx type PCD.
+/// This PPI instance only support dynamicEx type PCD.
 ///
 EFI_GET_PCD_INFO_PPI  mEfiGetPcdInfoInstance = {
   PeiGetPcdInfoGetInfoEx,
diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index 7152a7d53b..e4a37228cc 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -47,8 +47,8 @@
 #         If module is release as binary and will not pariticpate platform building,
 #         the dynamic PCD used by this module need be accessed as:
 #               PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)
-#         Developer need explicity gives {Token Space Guid:Token Number} as parameter
-#         in writting source code.
+#         Developer need explicitly gives {Token Space Guid:Token Number} as parameter
+#         in writing source code.
 #
 #    2.3 According to PCD value's storage method, dynamic PCD could be classfied as:
 #      a) Default Storage:
@@ -78,7 +78,7 @@
 #           DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.
 #
 #    2.4 When and how to use dynamic PCD
-#      Module developer do not care the used PCD is dynamic or static when writting
+#      Module developer do not care the used PCD is dynamic or static when writing
 #      source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator
 #      in platform DSC file. Please ref section 2.3 to get matching between dynamic
 #      PCD type and section name in DSC file.
diff --git a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni b/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
index 0a800889a2..556b1461f0 100644
--- a/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
+++ b/MdeModulePkg/Universal/PCD/Pei/PcdPeim.uni
@@ -47,8 +47,8 @@
 // If module is release as binary and will not pariticpate platform building,
 // the dynamic PCD used by this module need be accessed as:
 // PcdGetxxEx(gEfiMyTokenspaceGuid, PcdSampleDynamicPcd)
-// Developer need explicity gives {Token Space Guid:Token Number} as parameter
-// in writting source code.
+// Developer need explicitly gives {Token Space Guid:Token Number} as parameter
+// in writing source code.
 //
 // 2.3 According to PCD value's storage method, dynamic PCD could be classfied as:
 // a) Default Storage:
@@ -78,7 +78,7 @@
 // DSC file. [PcdsDynamicExVpd] is for dynamicex type PCD.
 //
 // 2.4 When and how to use dynamic PCD
-// Module developer do not care the used PCD is dynamic or static when writting
+// Module developer do not care the used PCD is dynamic or static when writing
 // source code/INF. Dynamic PCD and dynamic type is pointed by platform integrator
 // in platform DSC file. Please ref section 2.3 to get matching between dynamic
 // PCD type and section name in DSC file.
diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.c b/MdeModulePkg/Universal/PCD/Pei/Service.c
index 0a570a4cbe..f893c5042b 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.c
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.c
@@ -284,7 +284,7 @@ PeiGetPcdInfo (
 }
 
 /**
-  The function registers the CallBackOnSet fucntion
+  The function registers the CallBackOnSet function
   according to TokenNumber and EFI_GUID space.
 
   @param  ExTokenNumber       The token number.
@@ -518,7 +518,7 @@ GetHiiVariable (
   Invoke the callback function when dynamic PCD entry was set, if this PCD entry
   has registered callback function.
 
-  @param ExTokenNumber   DynamicEx PCD's token number, if this PCD entry is dyanmicEx
+  @param ExTokenNumber   DynamicEx PCD's token number, if this PCD entry is dynamicEx
                          type PCD.
   @param Guid            DynamicEx PCD's guid, if this PCD entry is dynamicEx type
                          PCD.
@@ -804,7 +804,7 @@ ExSetWorker (
   Wrapper function for get PCD value for dynamic-ex PCD.
 
   @param Guid            Token space guid for dynamic-ex PCD.
-  @param ExTokenNumber   Token number for dyanmic-ex PCD.
+  @param ExTokenNumber   Token number for dynamic-ex PCD.
   @param GetSize         The size of dynamic-ex PCD value.
 
   @return PCD entry in PCD database.
diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index 8b94bf308e..035e549d5b 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.h
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.h
@@ -28,7 +28,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/MemoryAllocationLib.h>
 
 //
-// Please make sure the PCD Serivce PEIM Version is consistent with
+// Please make sure the PCD Service PEIM Version is consistent with
 // the version of the generated PEIM PCD Database by build tool.
 //
 #define PCD_SERVICE_PEIM_VERSION  7
@@ -950,7 +950,7 @@ GetWorker (
   Wrapper function for get PCD value for dynamic-ex PCD.
 
   @param Guid            Token space guid for dynamic-ex PCD.
-  @param ExTokenNumber   Token number for dyanmic-ex PCD.
+  @param ExTokenNumber   Token number for dynamic-ex PCD.
   @param GetSize         The size of dynamic-ex PCD value.
 
   @return PCD entry in PCD database.
@@ -989,7 +989,7 @@ GetExPcdTokenNumber (
   );
 
 /**
-  The function registers the CallBackOnSet fucntion
+  The function registers the CallBackOnSet function
   according to TokenNumber and EFI_GUID space.
 
   @param  TokenNumber       The token number.
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c
index 326a6e6884..a10407cf30 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c
@@ -305,7 +305,7 @@ RegularExpressionGetInfo (
                                  SyntaxType is not supported by this driver.
   @retval EFI_DEVICE_ERROR       The regular expression string matching
                                  failed due to a hardware or firmware error.
-  @retval EFI_INVALID_PARAMETER  String, Pattern, Result, or CapturesCountis
+  @retval EFI_INVALID_PARAMETER  String, Pattern, Result, or CapturesCount is
                                  NULL.
 
 **/
diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h
index 1a6961a671..4da44675bc 100644
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h
@@ -66,7 +66,7 @@
                                  SyntaxType is not supported by this driver.
   @retval EFI_DEVICE_ERROR       The regular expression string matching
                                  failed due to a hardware or firmware error.
-  @retval EFI_INVALID_PARAMETER  String, Pattern, Result, or CapturesCountis
+  @retval EFI_INVALID_PARAMETER  String, Pattern, Result, or CapturesCount is
                                  NULL.
 
 **/
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c
index b12398345f..cfaa3aa0ab 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.c
@@ -1,5 +1,5 @@
 /** @file
-  Report Status Code Router PEIM which produces Report Stataus Code Handler PPI and Status Code PPI.
+  Report Status Code Router PEIM which produces Report Status Code Handler PPI and Status Code PPI.
 
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -270,12 +270,12 @@ ReportDispatcher (
   Entry point of Status Code PEIM.
 
   This function is the entry point of this Status Code Router PEIM.
-  It produces Report Stataus Code Handler PPI and Status Code PPI.
+  It produces Report Status Code Handler PPI and Status Code PPI.
 
   @param  FileHandle  Handle of the file being invoked.
   @param  PeiServices Describes the list of possible PEI Services.
 
-  @retval EFI_SUCESS  The entry point of DXE IPL PEIM executes successfully.
+  @retval EFI_SUCCESS The entry point of DXE IPL PEIM executes successfully.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
index a53d0587e9..71a80a1ea5 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
@@ -1,5 +1,5 @@
 ## @file
-#  Report Status Code Router PEIM which produces Report Stataus Code Handler PPI and Status Code PPI.
+#  Report Status Code Router PEIM which produces Report Status Code Handler PPI and Status Code PPI.
 #
 #  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
 #
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.uni
index 8f391d2a19..26eea8696e 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.uni
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.uni
@@ -1,5 +1,5 @@
 // /** @file
-// Report Status Code Router PEIM which produces Report Stataus Code Handler PPI and Status Code PPI.
+// Report Status Code Router PEIM which produces Report Status Code Handler PPI and Status Code PPI.
 //
 // Report Status Code Router is a PEIM that produces Report Status Code Handler PPI and Status Code PPI.
 //
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c
index 9a207859bf..2341077526 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.c
@@ -1,5 +1,5 @@
 /** @file
-  Report Status Code Router Driver which produces Report Stataus Code Handler Protocol
+  Report Status Code Router Driver which produces Report Status Code Handler Protocol
   and Status Code Runtime Protocol.
 
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
@@ -133,7 +133,7 @@ Register (
   CallbackEntry->Tpl                = Tpl;
 
   //
-  // If TPL of registered callback funtion is not TPL_HIGH_LEVEL, then event should be created
+  // If TPL of registered callback function is not TPL_HIGH_LEVEL, then event should be created
   // for it, and related buffer for status code data should be prepared.
   // Here the data buffer must be prepared in advance, because Report Status Code Protocol might
   // be invoked under TPL_HIGH_LEVEL and no memory allocation is allowed then.
@@ -369,7 +369,7 @@ VirtualAddressChangeCallBack (
   Entry point of Generic Status Code Driver.
 
   This function is the entry point of this Generic Status Code Driver.
-  It installs eport Stataus Code Handler Protocol  and Status Code Runtime Protocol,
+  It installs report Status Code Handler Protocol  and Status Code Runtime Protocol,
   and registers event for EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE.
 
   @param  ImageHandle       The firmware allocated handle for the EFI image.
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
index 4b53f79e94..21ac1f38e2 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
@@ -1,5 +1,5 @@
 ## @file
-#  Report Status Code Router Driver which produces Report Stataus Code Handler Protocol and Status Code Runtime Protocol.
+#  Report Status Code Router Driver which produces Report Status Code Handler Protocol and Status Code Runtime Protocol.
 #
 #  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
 #
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.uni
index 480cd51679..7e0d1cabcd 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.uni
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.uni
@@ -1,5 +1,5 @@
 // /** @file
-// Report Status Code Router Driver which produces Report Stataus Code Handler Protocol and Status Code Runtime Protocol.
+// Report Status Code Router Driver which produces Report Status Code Handler Protocol and Status Code Runtime Protocol.
 //
 // Report Status Code Router Driver that produces Report Status Code Handler Protocol and Status Code Runtime Protocol.
 //
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterCommon.c b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterCommon.c
index 286378e1d7..a5395c8da6 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterCommon.c
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterCommon.c
@@ -1,5 +1,5 @@
 /** @file
-  Report Status Code Router Driver which produces SMM Report Stataus Code Handler Protocol
+  Report Status Code Router Driver which produces SMM Report Status Code Handler Protocol
   and SMM Status Code Protocol.
 
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
index 539badc4c7..639d11605a 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
@@ -1,5 +1,5 @@
 ## @file
-#  Report Status Code Router Driver which produces SMM Report Stataus Code Handler Protocol and SMM Status Code Protocol.
+#  Report Status Code Router Driver which produces SMM Report Status Code Handler Protocol and SMM Status Code Protocol.
 #
 #  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
 #
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.uni b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.uni
index b65f8b6d29..ff8c964123 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.uni
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.uni
@@ -1,5 +1,5 @@
 // /** @file
-// Report Status Code Router Driver which produces SMM Report Stataus Code Handler Protocol and SMM Status Code Protocol.
+// Report Status Code Router Driver which produces SMM Report Status Code Handler Protocol and SMM Status Code Protocol.
 //
 // Report Status Code Router Driver that produces SMM Report Status Code Handler Protocol and SMM Status Code Protocol.
 //
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterStandaloneMm.c b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterStandaloneMm.c
index 0ca8c31312..58935a3933 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterStandaloneMm.c
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterStandaloneMm.c
@@ -1,5 +1,5 @@
 /** @file
-  Report Status Code Router Driver which produces MM Report Stataus Code Handler Protocol
+  Report Status Code Router Driver which produces MM Report Status Code Handler Protocol
   and MM Status Code Protocol.
 
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
@@ -14,7 +14,7 @@
   Entry point of Generic Status Code Driver.
 
   This function is the entry point of MM Status Code Router .
-  It produces MM Report Stataus Code Handler and Status Code protocol.
+  It produces MM Report Status Code Handler and Status Code protocol.
 
   @param  ImageHandle       The firmware allocated handle for the EFI image.
   @param  SystemTable       A pointer to the EFI System Table.
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterStandaloneMm.inf b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterStandaloneMm.inf
index 7aa0127e0b..2e1825d6ab 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterStandaloneMm.inf
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterStandaloneMm.inf
@@ -1,5 +1,5 @@
 ## @file
-#  Report Status Code Router Driver which produces MM Report Stataus Code Handler Protocol and MM Status Code Protocol.
+#  Report Status Code Router Driver which produces MM Report Status Code Handler Protocol and MM Status Code Protocol.
 #
 #  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
 #  Copyright (c) Microsoft Corporation.
diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterTraditional.c b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterTraditional.c
index 98dce689ea..4c5f79456d 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterTraditional.c
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterTraditional.c
@@ -1,5 +1,5 @@
 /** @file
-  Report Status Code Router Driver which produces MM Report Stataus Code Handler Protocol
+  Report Status Code Router Driver which produces MM Report Status Code Handler Protocol
   and MM Status Code Protocol.
 
   Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
@@ -14,7 +14,7 @@
   Entry point of Generic Status Code Driver.
 
   This function is the entry point of SMM Status Code Router .
-  It produces SMM Report Stataus Code Handler and Status Code protocol.
+  It produces SMM Report Status Code Handler and Status Code protocol.
 
   @param  ImageHandle       The firmware allocated handle for the EFI image.
   @param  SystemTable       A pointer to the EFI System Table.
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
index d21930b31a..19647d0ec4 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
@@ -2523,7 +2523,7 @@ Done:
   @param  Form                   Form associated with this expression.
   @param  Expression             Expression to be evaluated.
 
-  @retval EFI_SUCCESS            The expression evaluated successfuly
+  @retval EFI_SUCCESS            The expression evaluated successfully
   @retval EFI_NOT_FOUND          The Question which referenced by a QuestionId
                                  could not be found.
   @retval EFI_OUT_OF_RESOURCES   There is not enough system memory to grow the
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h
index b56c81eb05..3af0a1ba84 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.h
@@ -203,7 +203,7 @@ PopCurrentExpression (
   @param  Form                   Form associated with this expression.
   @param  Expression             Expression to be evaluated.
 
-  @retval EFI_SUCCESS            The expression evaluated successfuly
+  @retval EFI_SUCCESS            The expression evaluated successfully
   @retval EFI_NOT_FOUND          The Question which referenced by a QuestionId
                                  could not be found.
   @retval EFI_OUT_OF_RESOURCES   There is not enough system memory to grow the
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index babef21497..c09b7ae1ba 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -60,7 +60,7 @@ CheckConfigAccess (
   @param  FormSet        FormSet this Form belongs to.
   @param  Form           The Form.
 
-  @retval EFI_SUCCESS    The expression evaluated successfuly
+  @retval EFI_SUCCESS    The expression evaluated successfully
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
index 1a86e69d3c..7e3aa388d1 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.c
@@ -244,7 +244,7 @@ GetSmbiosStructureSize (
 
 /**
 
-  Determin whether an SmbiosHandle has already in use.
+  Determine whether an SmbiosHandle has already in use.
 
   @param Head        Pointer to the beginning of SMBIOS structure.
   @param Handle      A unique handle will be assigned to the SMBIOS record.
@@ -1039,7 +1039,7 @@ GetNextSmbiosRecord (
 
   @param  TableEntryPointStructure   On exit, points to the SMBIOS entrypoint structure.
 
-  @retval EFI_SUCCESS                Structure created sucessfully.
+  @retval EFI_SUCCESS                Structure created successfully.
   @retval EFI_OUT_OF_RESOURCES       No enough memory.
 
 **/
@@ -1234,7 +1234,7 @@ SmbiosCreateTable (
 
   @param  TableEntryPointStructure   On exit, points to the SMBIOS entrypoint structure.
 
-  @retval EFI_SUCCESS                Structure created sucessfully.
+  @retval EFI_SUCCESS                Structure created successfully.
   @retval EFI_OUT_OF_RESOURCES       No enough memory.
 
 **/
@@ -1435,7 +1435,7 @@ SmbiosTableConstruction (
   Validates a SMBIOS 2.0 table entry point.
 
   @param  TableEntry       The SmBios table entry to validate.
-  @param  TableAddress     On exit, point to the smbios table addres.
+  @param  TableAddress     On exit, point to the smbios table address.
   @param  TableMaximumSize On exit, point to the maximum size of the table.
 
   @retval TRUE           SMBIOS table entry point is valid.
@@ -1515,7 +1515,7 @@ IsValidSmbios20Table (
   Validates a SMBIOS 3.0 table entry point.
 
   @param  TableEntry       The SmBios table entry to validate.
-  @param  TableAddress     On exit, point to the smbios table addres.
+  @param  TableAddress     On exit, point to the smbios table address.
   @param  TableMaximumSize On exit, point to the maximum size of the table.
 
   @retval TRUE           SMBIOS table entry point is valid.
@@ -1699,7 +1699,7 @@ RetrieveSmbiosFromHob (
   UINTN                             Index;
   SMBIOS_STRUCTURE_POINTER          Smbios;
   EFI_HOB_GUID_TYPE                 *GuidHob;
-  UNIVERSAL_PAYLOAD_SMBIOS_TABLE    *SmBiosTableAdress;
+  UNIVERSAL_PAYLOAD_SMBIOS_TABLE    *SmBiosTableAddress;
   UNIVERSAL_PAYLOAD_GENERIC_HEADER  *GenericHeader;
   VOID                              *TableAddress;
   UINTN                             TableMaximumSize;
@@ -1723,9 +1723,9 @@ RetrieveSmbiosFromHob (
         //
         // UNIVERSAL_PAYLOAD_SMBIOS_TABLE structure is used when Revision equals to UNIVERSAL_PAYLOAD_SMBIOS_TABLE_REVISION
         //
-        SmBiosTableAdress = (UNIVERSAL_PAYLOAD_SMBIOS_TABLE *)GET_GUID_HOB_DATA (GuidHob);
+        SmBiosTableAddress = (UNIVERSAL_PAYLOAD_SMBIOS_TABLE *)GET_GUID_HOB_DATA (GuidHob);
         if (GenericHeader->Length >= UNIVERSAL_PAYLOAD_SIZEOF_THROUGH_FIELD (UNIVERSAL_PAYLOAD_SMBIOS_TABLE, SmBiosEntryPoint)) {
-          if (mIsSmbiosTableValid[Index].IsValid ((VOID *)(UINTN)SmBiosTableAdress->SmBiosEntryPoint, &TableAddress, &TableMaximumSize, &MajorVersion, &MinorVersion)) {
+          if (mIsSmbiosTableValid[Index].IsValid ((VOID *)(UINTN)SmBiosTableAddress->SmBiosEntryPoint, &TableAddress, &TableMaximumSize, &MajorVersion, &MinorVersion)) {
             Smbios.Raw = TableAddress;
             Status     = ParseAndAddExistingSmbiosTable (ImageHandle, Smbios, TableMaximumSize, MajorVersion, MinorVersion);
             if (EFI_ERROR (Status)) {
diff --git a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h
index f1500beabd..433f846898 100644
--- a/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h
+++ b/MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.h
@@ -124,7 +124,7 @@ SmbiosTableConstruction (
   Validates a SMBIOS 3.0 table entry point.
 
   @param  TableEntry       The SmBios table entry to validate.
-  @param  TableAddress     On exit, point to the smbios table addres.
+  @param  TableAddress     On exit, point to the smbios table address.
   @param  TableMaximumSize On exit, point to the maximum size of the table.
 
   @retval TRUE           SMBIOS table entry point is valid.
@@ -145,7 +145,7 @@ IsValidSmbios30Table (
   Validates a SMBIOS 2.0 table entry point.
 
   @param  TableEntry       The SmBios table entry to validate.
-  @param  TableAddress     On exit, point to the smbios table addres.
+  @param  TableAddress     On exit, point to the smbios table address.
   @param  TableMaximumSize On exit, point to the maximum size of the table.
 
   @retval TRUE           SMBIOS table entry point is valid.
@@ -166,7 +166,7 @@ IsValidSmbios20Table (
   Validates a SMBIOS table entry point.
 
   @param  TableEntry       The SmBios table entry to validate.
-  @param  TableAddress     On exit, point to the smbios table addres.
+  @param  TableAddress     On exit, point to the smbios table address.
   @param  TableMaximumSize On exit, point to the maximum size of the table.
 
   @retval TRUE           SMBIOS table entry point is valid.
diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
index d740a62478..fd94cc08ab 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
@@ -19,7 +19,7 @@
   @param  FileHandle  Handle of the file being invoked.
   @param  PeiServices Describes the list of possible PEI Services.
 
-  @retval EFI_SUCESS  The entry point of DXE IPL PEIM executes successfully.
+  @retval EFI_SUCCESS  The entry point of DXE IPL PEIM executes successfully.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/MdeModulePkg/Universal/Variable/Pei/Variable.c
index 26a4c73b45..349827b5e3 100644
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.c
+++ b/MdeModulePkg/Universal/Variable/Pei/Variable.c
@@ -858,7 +858,7 @@ FindVariableEx (
 
   if (IndexTable != NULL) {
     //
-    // traverse the variable index table to look for varible.
+    // traverse the variable index table to look for variable.
     // The IndexTable->Index[Index] records the distance of two neighbouring VAR_ADDED type variables.
     //
     for (Offset = 0, Index = 0; Index < IndexTable->Length; Index++) {
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
index d5c409c914..27a4a0b81d 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
@@ -400,7 +400,7 @@ VariableWriteServiceInitializeDxe (
   Fault Tolerant Write protocol notification event handler.
 
   Non-Volatile variable write may needs FTW protocol to reclaim when
-  writting variable.
+  writing variable.
 
   @param[in] Event    Event whose notification function is being invoked.
   @param[in] Context  Pointer to the notification function's context.
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariablePolicySmmDxe.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariablePolicySmmDxe.c
index 6151a2ba0b..97ffed6bb8 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariablePolicySmmDxe.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariablePolicySmmDxe.c
@@ -476,7 +476,7 @@ VariablePolicyVirtualAddressCallback (
   @param[in] SystemTable  A pointer to the EFI System Table.
 
   @retval EFI_SUCCESS     The entry point executed successfully.
-  @retval other           Some error occured when executing this entry point.
+  @retval other           Some error occurred when executing this entry point.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
index 5253c328dc..308b4afe7a 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
@@ -932,7 +932,7 @@ SmmVariableHandler (
       VariableCacheContext->ReadLock                           = RuntimeVariableCacheContext->ReadLock;
       VariableCacheContext->HobFlushComplete                   = RuntimeVariableCacheContext->HobFlushComplete;
 
-      // Set up the intial pending request since the RT cache needs to be in sync with SMM cache
+      // Set up the initial pending request since the RT cache needs to be in sync with SMM cache
       VariableCacheContext->VariableRuntimeHobCache.PendingUpdateOffset = 0;
       VariableCacheContext->VariableRuntimeHobCache.PendingUpdateLength = 0;
       if ((mVariableModuleGlobal->VariableGlobal.HobVariableBase > 0) &&
@@ -1060,7 +1060,7 @@ VariableWriteServiceInitializeSmm (
   SMM Fault Tolerant Write protocol notification event handler.
 
   Non-Volatile variable write may needs FTW protocol to reclaim when
-  writting variable.
+  writing variable.
 
   @param  Protocol   Points to the protocol's unique identifier
   @param  Interface  Points to the interface instance
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c
index 4aaeb5ba88..23791a47f9 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c
@@ -263,7 +263,7 @@ InitCommunicateBuffer (
 
   @param[in]   DataSize               This size of the function header and the data.
 
-  @retval      EFI_SUCCESS            Success is returned from the functin in SMM.
+  @retval      EFI_SUCCESS            Success is returned from the function in SMM.
   @retval      Others                 Failure is returned from the function in SMM.
 
 **/
-- 
2.39.2 (Apple Git-144)



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#105275): https://edk2.groups.io/g/devel/message/105275
Mute This Topic: https://groups.io/mt/99113947/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-