From mboxrd@z Thu Jan 1 00:00:00 1970 Subject: [PATCH v2 7/7] EmulatorPkg: Fix various typos To: devel@edk2.groups.io From: =?UTF-8?B?Q8WTdXI=?= X-Originating-Location: Tokyo, JP (199.47.199.26) X-Originating-Platform: Mac Chrome 75 User-Agent: GROUPS.IO Web Poster MIME-Version: 1.0 Date: Tue, 02 Jul 2019 09:43:58 -0700 Message-ID: <21474.1562085838740107208@groups.io> Content-Type: multipart/alternative; boundary="AiO2i3Rgxxg8wkfLt5Tr" --AiO2i3Rgxxg8wkfLt5Tr Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Fix various typos in EmulatorPkg. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Coeur --- EmulatorPkg/BootModePei/BootModePei.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|= =C2=A0 2 +- .../FirmwareVolumePei/FirmwareVolumePei.c=C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +- EmulatorPkg/Unix/Host/Host.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 | 20 +++++++++---------- EmulatorPkg/Unix/Host/LinuxPacketFilter.c=C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +- EmulatorPkg/Unix/Host/Pthreads.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = = =C2=A0 |=C2=A0 2 +- EmulatorPkg/Unix/Host/X64/Gasket.S=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 4 ++-- EmulatorPkg/Unix/Host/X64/SwitchStack.S=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 = 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/EmulatorPkg/BootModePei/BootModePei.c b/EmulatorPkg/BootModeP= ei/BootModePei.c index a008a2331d..0f8d8f090e 100644 --- a/EmulatorPkg/BootModePei/BootModePei.c +++ b/EmulatorPkg/BootModePei/BootModePei.c @@ -18,7 +18,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // -// The protocols, PPI and GUID defintions for this module +// The protocols, PPI and GUID definitions for this module // #include #include diff --git a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c b/EmulatorP= kg/FirmwareVolumePei/FirmwareVolumePei.c index 4178111096..c8ff6edff3 100644 --- a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c +++ b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c @@ -77,7 +77,7 @@ Returns: if (Index =3D=3D 0) { // // Assume the first FD was produced by the NT32.DSC -=C2=A0 =C2=A0 =C2=A0 =C2=A0 //=C2=A0 All these strange offests are needed= to keep in +=C2=A0 =C2=A0 =C2=A0 =C2=A0 //=C2=A0 All these strange offsets are needed= to keep in //=C2=A0 sync with the FlashMap and NT32.dsc file // BuildResourceDescriptorHob ( diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c index febfb1f44c..b6d7777d41 100644 --- a/EmulatorPkg/Unix/Host/Host.c +++ b/EmulatorPkg/Unix/Host/Host.c @@ -38,7 +38,7 @@ UINTN=C2=A0 =C2=A0 =C2=A0 =C2=A0gFdInfoCount =3D 0; EMU_FD_INFO *gFdInfo; // -// Array that supports seperate memory rantes. +// Array that supports separate memory ranges. //=C2=A0 The memory ranges are set in system.cmd via the EFI_MEMORY_SIZE v= ariable. //=C2=A0 The number of array elements is allocated base on parsing //=C2=A0 EFI_MEMORY_SIZE and the memory is never freed. @@ -379,7 +379,7 @@ Arguments: Returns: EFI_SUCCESS=C2=A0 =C2=A0 =C2=A0 - The file was opened and mapped. EFI_NOT_FOUND=C2=A0 =C2=A0 - FileName was not found in the current directo= ry -=C2=A0 EFI_DEVICE_ERROR - An error occured attempting to map the opened f= ile +=C2=A0 EFI_DEVICE_ERROR - An error occurred attempting to map the opened = file **/ EFI_STATUS @@ -523,7 +523,7 @@ Arguments: PeiCorePe32File=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0- SEC PE32 Returns: -=C2=A0 Success means control is transfered and thus we should never retur= n +=C2=A0 Success means control is transferred and thus we should never retu= rn **/ VOID @@ -611,7 +611,7 @@ Routine Description: It allows discontinuous memory regions to be supported by the emulator. It uses gSystemMemory[] and gSystemMemoryCount that were created by parsing the host environment variable EFI_MEMORY_SIZE. -=C2=A0 The size comes from the varaible and the address comes from the ca= ll to +=C2=A0 The size comes from the variable and the address comes from the ca= ll to UnixOpenFile. Arguments: @@ -661,7 +661,7 @@ Routine Description: This is all of GCD for system memory passed to DXE Core. FV mapping and other device mapped into system memory are not - inlcuded in the check. + included in the check. Arguments: Index=C2=A0 =C2=A0 =C2=A0 - Which memory region to use @@ -898,7 +898,7 @@ Routine Description: The ModHandle is needed to unload the image. Arguments: -=C2=A0 ImageContext - Input data returned from PE Laoder Library. Used to= find the +=C2=A0 ImageContext - Input data returned from PE Loader Library. Used to= find the .PDB file name of the PE Image. ModHandle=C2=A0 =C2=A0 - Returned from LoadLibraryEx() and stored for call= to FreeLibrary(). @@ -922,7 +922,7 @@ AddHandle ( for (Index =3D 0; Index < mImageContextModHandleArraySize; Index++, Array+= +) { if (Array->ImageContext =3D=3D NULL) { // -=C2=A0 =C2=A0 =C2=A0 // Make a copy of the stirng and store the ModHandle +=C2=A0 =C2=A0 =C2=A0 // Make a copy of the string and store the ModHandle // Array->ImageContext =3D ImageContext; Array->ModHandle=C2=A0 =C2=A0 =3D ModHandle; @@ -933,7 +933,7 @@ AddHandle ( // // No free space in mImageContextModHandleArray so grow it by // IMAGE_CONTEXT_TO_MOD_HANDLE entires. realloc will -=C2=A0 // copy the old values to the new locaiton. But it does +=C2=A0 // copy the old values to the new location. But it does // not zero the new memory area. // PreviousSize =3D mImageContextModHandleArraySize * sizeof (IMAGE_CONTEXT_T= O_MOD_HANDLE); @@ -961,11 +961,11 @@ Routine Description: Return the ModHandle and delete the entry in the array. Arguments: -=C2=A0 ImageContext - Input data returned from PE Laoder Library. Used to= find the +=C2=A0 ImageContext - Input data returned from PE Loader Library. Used to= find the .PDB file name of the PE Image. Returns: -=C2=A0 ModHandle - ModHandle assoicated with ImageContext is returned +=C2=A0 ModHandle - ModHandle associated with ImageContext is returned NULL=C2=A0 =C2=A0 =C2=A0 - No ModHandle associated with ImageContext **/ diff --git a/EmulatorPkg/Unix/Host/LinuxPacketFilter.c b/EmulatorPkg/Unix/= Host/LinuxPacketFilter.c index a8028d18ff..2b772ab884 100644 --- a/EmulatorPkg/Unix/Host/LinuxPacketFilter.c +++ b/EmulatorPkg/Unix/Host/LinuxPacketFilter.c @@ -6,7 +6,7 @@ is just a template that needs to get filled in. Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.
-Portitions copyright (c) 2011, Apple Inc. All rights reserved. +Portions copyright (c) 2011, Apple Inc. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent diff --git a/EmulatorPkg/Unix/Host/Pthreads.c b/EmulatorPkg/Unix/Host/Pthr= eads.c index 7c71a2da4f..3aadab0c28 100644 --- a/EmulatorPkg/Unix/Host/Pthreads.c +++ b/EmulatorPkg/Unix/Host/Pthreads.c @@ -133,7 +133,7 @@ PthreadCreate ( EnabledOnEntry =3D FALSE; } -=C2=A0 // Aquire lock for global, SecFakePthreadStart runs in a different= thread. +=C2=A0 // Acquire lock for global, SecFakePthreadStart runs in a differen= t thread. pthread_mutex_lock (&mThreadMangle.Mutex); mThreadMangle.Start=C2=A0 =C2=A0=3D Start; diff --git a/EmulatorPkg/Unix/Host/X64/Gasket.S b/EmulatorPkg/Unix/Host/X6= 4/Gasket.S index a9ca707562..030faa8e4c 100644 --- a/EmulatorPkg/Unix/Host/X64/Gasket.S +++ b/EmulatorPkg/Unix/Host/X64/Gasket.S @@ -15,11 +15,11 @@ // // Gaskets are EFI ABI to UNIX ABI calls // EFI ABI code will sub 40 (0x28) from %rsp before calling a function -//=C2=A0 This is the 32 (0x20) byte to spill registers and 8 bytes to ali= gn stack on 16 byte boundry. +//=C2=A0 This is the 32 (0x20) byte to spill registers and 8 bytes to ali= gn stack on 16 byte boundary. // .text -// 32 byte shadow to spill rcx-r9, 8 bytes to align stack on 16 byte boun= dry +// 32 byte shadow to spill rcx-r9, 8 bytes to align stack on 16 byte boun= dary // Any call with 0 - 4 arguments allocates 40 bytes on the stack. // For more than 4 args you always have to increase in quanta of 16 so 5 o= r 6 args is 56, // 7 or 8 args is 72, and 9 or 10 args is 88 diff --git a/EmulatorPkg/Unix/Host/X64/SwitchStack.S b/EmulatorPkg/Unix/Ho= st/X64/SwitchStack.S index 4126cc9912..36838bf29e 100644 --- a/EmulatorPkg/Unix/Host/X64/SwitchStack.S +++ b/EmulatorPkg/Unix/Host/X64/SwitchStack.S @@ -1,7 +1,7 @@ #-------------------------------------------------------------------------= ----- # # Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
-# Portitions copyright (c) 2011, Apple Inc. All rights reserved. +# Portions copyright (c) 2011, Apple Inc. All rights reserved. # SPDX-License-Identifier: BSD-2-Clause-Patent # #-------------------------------------------------------------------------= ----- -- 2.20.1 (Apple Git-117) --AiO2i3Rgxxg8wkfLt5Tr Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable
Fix various typos in EmulatorPkg.
 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Coeur <coeur@gmx.fr>
---
 EmulatorPkg/BootModePei/BootModePei.c       = ;  |  2 +-
 .../FirmwareVolumePei/FirmwareVolumePei.c     |&= nbsp; 2 +-
 EmulatorPkg/Unix/Host/Host.c          =         | 20 +++++++++----------
 EmulatorPkg/Unix/Host/LinuxPacketFilter.c     |&= nbsp; 2 +-
 EmulatorPkg/Unix/Host/Pthreads.c        &nb= sp;     |  2 +-
 EmulatorPkg/Unix/Host/X64/Gasket.S        &= nbsp;   |  4 ++--
 EmulatorPkg/Unix/Host/X64/SwitchStack.S      &nb= sp;|  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)
 
diff --git a/EmulatorPkg/BootModePei/BootModePei.c b/EmulatorPkg/Boot= ModePei/BootModePei.c
index a008a2331d..0f8d8f090e 100644
--- a/EmulatorPkg/BootModePei/BootModePei.c
+++ b/EmulatorPkg/BootModePei/BootModePei.c
@@ -18,7 +18,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 //
-// The protocols, PPI and GUID defintions for this module
+// The protocols, PPI and GUID definitions for this module
 //
 #include <Ppi/MasterBootMode.h>
 #include <Ppi/BootInRecoveryMode.h>
diff --git a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c b/Emul= atorPkg/FirmwareVolumePei/FirmwareVolumePei.c
index 4178111096..c8ff6edff3 100644
--- a/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c
+++ b/EmulatorPkg/FirmwareVolumePei/FirmwareVolumePei.c
@@ -77,7 +77,7 @@ Returns:
       if (Index =3D=3D 0) {
         //
         // Assume the first FD was produced= by the NT32.DSC
-        //  All these strange offests are n= eeded to keep in
+        //  All these strange offsets are n= eeded to keep in
         //  sync with the FlashMap and= NT32.dsc file
         //
         BuildResourceDescriptorHob (
diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Hos= t.c
index febfb1f44c..b6d7777d41 100644
--- a/EmulatorPkg/Unix/Host/Host.c
+++ b/EmulatorPkg/Unix/Host/Host.c
@@ -38,7 +38,7 @@ UINTN       gFdInfoCount =3D 0;=
 EMU_FD_INFO *gFdInfo;
 
 //
-// Array that supports seperate memory rantes.
+// Array that supports separate memory ranges.
 //  The memory ranges are set in system.cmd via the EFI_ME= MORY_SIZE variable.
 //  The number of array elements is allocated base on pars= ing
 //  EFI_MEMORY_SIZE and the memory is never freed.
@@ -379,7 +379,7 @@ Arguments:
 Returns:
   EFI_SUCCESS      - The file was opened an= d mapped.
   EFI_NOT_FOUND    - FileName was not found in t= he current directory
-  EFI_DEVICE_ERROR - An error occured attempting to map the ope= ned file
+  EFI_DEVICE_ERROR - An error occurred attempting to map the op= ened file
 
 **/
 EFI_STATUS
@@ -523,7 +523,7 @@ Arguments:
   PeiCorePe32File         - SEC P= E32
 
 Returns:
-  Success means control is transfered and thus we should never = return
+  Success means control is transferred and thus we should never= return
 
 **/
 VOID
@@ -611,7 +611,7 @@ Routine Description:
   It allows discontinuous memory regions to be supported b= y the emulator.
   It uses gSystemMemory[] and gSystemMemoryCount that were= created by
   parsing the host environment variable EFI_MEMORY_SIZE.
-  The size comes from the varaible and the address comes from t= he call to
+  The size comes from the variable and the address comes from t= he call to
   UnixOpenFile.
 
 Arguments:
@@ -661,7 +661,7 @@ Routine Description:
 
  This is all of GCD for system memory passed to DXE Core. FV
  mapping and other device mapped into system memory are not
- inlcuded in the check.
+ included in the check.
 
 Arguments:
   Index      - Which memory region to use
@@ -898,7 +898,7 @@ Routine Description:
   The ModHandle is needed to unload the image.
 
 Arguments:
-  ImageContext - Input data returned from PE Laoder Library. Us= ed to find the
+  ImageContext - Input data returned from PE Loader Library. Us= ed to find the
                  .PDB f= ile name of the PE Image.
   ModHandle    - Returned from LoadLibraryEx() a= nd stored for call to
                  FreeLi= brary().
@@ -922,7 +922,7 @@ AddHandle (
   for (Index =3D 0; Index < mImageContextModHandleArray= Size; Index++, Array++) {
     if (Array->ImageContext =3D=3D NULL) {
       //
-      // Make a copy of the stirng and store the ModH= andle
+      // Make a copy of the string and store the ModH= andle
       //
       Array->ImageContext =3D ImageContext;
       Array->ModHandle    =3D ModHa= ndle;
@@ -933,7 +933,7 @@ AddHandle (
   //
   // No free space in mImageContextModHandleArray so grow = it by
   // IMAGE_CONTEXT_TO_MOD_HANDLE entires. realloc will
-  // copy the old values to the new locaiton. But it does
+  // copy the old values to the new location. But it does
   // not zero the new memory area.
   //
   PreviousSize =3D mImageContextModHandleArraySize * sizeo= f (IMAGE_CONTEXT_TO_MOD_HANDLE);
@@ -961,11 +961,11 @@ Routine Description:
   Return the ModHandle and delete the entry in the array.<= /div>
 
 Arguments:
-  ImageContext - Input data returned from PE Laoder Library. Us= ed to find the
+  ImageContext - Input data returned from PE Loader Library. Us= ed to find the
                  .PDB f= ile name of the PE Image.
 
 Returns:
-  ModHandle - ModHandle assoicated with ImageContext is returne= d
+  ModHandle - ModHandle associated with ImageContext is returne= d
   NULL      - No ModHandle associated with = ImageContext
 
 **/
diff --git a/EmulatorPkg/Unix/Host/LinuxPacketFilter.c b/EmulatorPkg/= Unix/Host/LinuxPacketFilter.c
index a8028d18ff..2b772ab884 100644
--- a/EmulatorPkg/Unix/Host/LinuxPacketFilter.c
+++ b/EmulatorPkg/Unix/Host/LinuxPacketFilter.c
@@ -6,7 +6,7 @@
  is just a template that needs to get filled in.
 
 Copyright (c) 2004 - 2009, Intel Corporation. All rights reserv= ed.<BR>
-Portitions copyright (c) 2011, Apple Inc. All rights reserved.
+Portions copyright (c) 2011, Apple Inc. All rights reserved.
 
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
diff --git a/EmulatorPkg/Unix/Host/Pthreads.c b/EmulatorPkg/Unix/Host= /Pthreads.c
index 7c71a2da4f..3aadab0c28 100644
--- a/EmulatorPkg/Unix/Host/Pthreads.c
+++ b/EmulatorPkg/Unix/Host/Pthreads.c
@@ -133,7 +133,7 @@ PthreadCreate (
     EnabledOnEntry =3D FALSE;
   }
 
-  // Aquire lock for global, SecFakePthreadStart runs in a diff= erent thread.
+  // Acquire lock for global, SecFakePthreadStart runs in a dif= ferent thread.
   pthread_mutex_lock (&mThreadMangle.Mutex);
   mThreadMangle.Start   =3D Start;
 
diff --git a/EmulatorPkg/Unix/Host/X64/Gasket.S b/EmulatorPkg/Unix/Ho= st/X64/Gasket.S
index a9ca707562..030faa8e4c 100644
--- a/EmulatorPkg/Unix/Host/X64/Gasket.S
+++ b/EmulatorPkg/Unix/Host/X64/Gasket.S
@@ -15,11 +15,11 @@
 //
 // Gaskets are EFI ABI to UNIX ABI calls
 // EFI ABI code will sub 40 (0x28) from %rsp before calling a f= unction
-//  This is the 32 (0x20) byte to spill registers and 8 bytes t= o align stack on 16 byte boundry.
+//  This is the 32 (0x20) byte to spill registers and 8 bytes t= o align stack on 16 byte boundary.
 //
   .text
 
-// 32 byte shadow to spill rcx-r9, 8 bytes to align stack on 16 byte= boundry
+// 32 byte shadow to spill rcx-r9, 8 bytes to align stack on 16 byte= boundary
 // Any call with 0 - 4 arguments allocates 40 bytes on the stac= k.
 // For more than 4 args you always have to increase in quanta o= f 16 so 5 or 6 args is 56,
 // 7 or 8 args is 72, and 9 or 10 args is 88
diff --git a/EmulatorPkg/Unix/Host/X64/SwitchStack.S b/EmulatorPkg/Un= ix/Host/X64/SwitchStack.S
index 4126cc9912..36838bf29e 100644
--- a/EmulatorPkg/Unix/Host/X64/SwitchStack.S
+++ b/EmulatorPkg/Unix/Host/X64/SwitchStack.S
@@ -1,7 +1,7 @@
 #--------------------------------------------------------------= ----------------
 #
 # Copyright (c) 2006 - 2008, Intel Corporation. All rights rese= rved.<BR>
-# Portitions copyright (c) 2011, Apple Inc. All rights reserved.
+# Portions copyright (c) 2011, Apple Inc. All rights reserved.
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #--------------------------------------------------------------= ----------------
-- 
2.20.1 (Apple Git-117)
 
--AiO2i3Rgxxg8wkfLt5Tr--