From mboxrd@z Thu Jan 1 00:00:00 1970 Subject: [PATCH v2 6/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:30 -0700 Message-ID: <16119.1562085810476132077@groups.io> Content-Type: multipart/alternative; boundary="YaWe5xiaxIZV4N6jNgGc" --YaWe5xiaxIZV4N6jNgGc 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/Unix/GdbRun.sh=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0|=C2=A0 4 ++-- EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c |=C2=A0 2 +- EmulatorPkg/Unix/Host/BlockIo.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 | 12 ++++++------ EmulatorPkg/Unix/Host/EmuThunk.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = = =C2=A0|=C2=A0 2 +- EmulatorPkg/Unix/lldbefi.py=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 | 14 +++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/EmulatorPkg/Unix/GdbRun.sh b/EmulatorPkg/Unix/GdbRun.sh index 8c761ff2c9..b050ad5e2c 100644 --- a/EmulatorPkg/Unix/GdbRun.sh +++ b/EmulatorPkg/Unix/GdbRun.sh @@ -62,8 +62,8 @@ define RemoveFirmwareSymbolFile end if gInXcode =3D=3D 1 -=C2=A0 # in Xcode the program is already runing. Issuing a run command -=C2=A0 # will cause a fatal debugger error. The break point sciprt that +=C2=A0 # in Xcode the program is already running. Issuing a run command +=C2=A0 # will cause a fatal debugger error. The break point script that # is used to source this script sets gInCode to 1. else # diff --git a/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c b/EmulatorPkg/Un= ix/Host/BerkeleyPacketFilter.c index e318a90740..dcc315ac72 100644 --- a/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c +++ b/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c @@ -5,7 +5,7 @@ Tested on Mac OS X. 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/BlockIo.c b/EmulatorPkg/Unix/Host/Block= Io.c index 07e39347e4..18368060d5 100644 --- a/EmulatorPkg/Unix/Host/BlockIo.c +++ b/EmulatorPkg/Unix/Host/BlockIo.c @@ -398,7 +398,7 @@ EmuBlockIoReadBlocks ( Done: if (Token !=3D NULL) { if (Token->Event !=3D NULL) { -=C2=A0 =C2=A0 =C2=A0 // Caller is responcible for signaling EFI Event +=C2=A0 =C2=A0 =C2=A0 // Caller is responsible for signaling EFI Event Token->TransactionStatus =3D Status; return EFI_SUCCESS; } @@ -429,7 +429,7 @@ Done: the Event is NULL. @retval EFI_WRITE_PROTECTED=C2=A0 =C2=A0The device can not be written to. @retval EFI_NO_MEDIA=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 There is no media i= n the device. -=C2=A0 @retval EFI_MEDIA_CHNAGED=C2=A0 =C2=A0 =C2=A0The MediaId does not = matched the current device. +=C2=A0 @retval EFI_MEDIA_CHANGED=C2=A0 =C2=A0 =C2=A0The MediaId does not = match the current device. @retval EFI_DEVICE_ERROR=C2=A0 =C2=A0 =C2=A0 The device reported an error = while performing the write. @retval EFI_BAD_BUFFER_SIZE=C2=A0 =C2=A0The Buffer was not a multiple of t= he block size of the device. @retval EFI_INVALID_PARAMETER The write request contains LBAs that are not= valid, @@ -477,7 +477,7 @@ EmuBlockIoWriteBlocks ( Done: if (Token !=3D NULL) { if (Token->Event !=3D NULL) { -=C2=A0 =C2=A0 =C2=A0 // Caller is responcible for signaling EFI Event +=C2=A0 =C2=A0 =C2=A0 // Caller is responsible for signaling EFI Event Token->TransactionStatus =3D Status; return EFI_SUCCESS; } @@ -500,7 +500,7 @@ Done: @retval EFI_SUCCESS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 The flush request wa= s queued if Event is not NULL. All outstanding data was written correctly to the device if the Event is NULL. -=C2=A0 @retval EFI_DEVICE_ERROR=C2=A0 =C2=A0 =C2=A0The device reported an= error while writting back +=C2=A0 @retval EFI_DEVICE_ERROR=C2=A0 =C2=A0 =C2=A0The device reported an= error while writing back the data. @retval EFI_WRITE_PROTECTED=C2=A0 The device cannot be written to. @retval EFI_NO_MEDIA=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0There is no media in= the device. @@ -529,7 +529,7 @@ EmuBlockIoFlushBlocks ( if (Token !=3D NULL) { if (Token->Event !=3D NULL) { -=C2=A0 =C2=A0 =C2=A0 // Caller is responcible for signaling EFI Event +=C2=A0 =C2=A0 =C2=A0 // Caller is responsible for signaling EFI Event Token->TransactionStatus =3D EFI_SUCCESS; return EFI_SUCCESS; } @@ -544,7 +544,7 @@ EmuBlockIoFlushBlocks ( @param[in]=C2=A0 This=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0Indicates a pointer to the calling context. @param[in]=C2=A0 ExtendedVerification Indicates that the driver may perfor= m a more -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= = =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0exhausive verfication = operation of the device +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= = =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0exhaustive verificatio= n operation of the device during reset. @retval EFI_SUCCESS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 The device was reset= . diff --git a/EmulatorPkg/Unix/Host/EmuThunk.c b/EmulatorPkg/Unix/Host/EmuT= hunk.c index f1330c8234..b831c67946 100644 --- a/EmulatorPkg/Unix/Host/EmuThunk.c +++ b/EmulatorPkg/Unix/Host/EmuThunk.c @@ -6,7 +6,7 @@ The mUnixThunkTable exists so that a change to EFI_EMU_THUNK_PROTOCOL will cause an error in initializing the array if all the member functions are not added. It looks like adding a element to end and not initializing -=C2=A0 it may cause the table to be initaliized with the members at the e= nd being +=C2=A0 it may cause the table to be initialized with the members at the e= nd being set to zero. This is bad as jumping to zero will crash. Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.
diff --git a/EmulatorPkg/Unix/lldbefi.py b/EmulatorPkg/Unix/lldbefi.py index 218326b8cb..f3e35865c2 100755 --- a/EmulatorPkg/Unix/lldbefi.py +++ b/EmulatorPkg/Unix/lldbefi.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -#=C2=A0 Copyright 2014 Apple Inc. All righes reserved. +#=C2=A0 Copyright 2014 Apple Inc. All rights reserved. # #=C2=A0 SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -278,7 +278,7 @@ def EFI_DEVICE_PATH_PROTOCOL_TypeSummary (valobj,inter= nal_dict): Address =3D long ("%d" % valobj.addr) if (Address =3D=3D lldb.LLDB_INVALID_ADDRESS): -=C2=A0 =C2=A0 =C2=A0 # Need to reserach this, it seems to be the nested s= truct case +=C2=A0 =C2=A0 =C2=A0 # Need to research this, it seems to be the nested s= truct case ExprStr =3D "" elif (Type & 0x7f =3D=3D 0x7f): ExprStr =3D "End Device Path" if SubType =3D=3D 0xff else "End This Instan= ce" @@ -304,7 +304,7 @@ def EFI_DEVICE_PATH_PROTOCOL_TypeSummary (valobj,inter= nal_dict): def TypePrintFormating(debugger): # -=C2=A0 =C2=A0 # Set the default print formating for EFI types in lldb. +=C2=A0 =C2=A0 # Set the default print formatting for EFI types in lldb. # seems lldb defaults to decimal. # category =3D debugger.GetDefaultCategory() @@ -384,7 +384,7 @@ def LoadEmulatorEfiSymbols(frame, bp_loc , internal_di= ct): FileName =3D frame.thread.process.ReadCStringFromMemory (FileNamePtr, File= NameLen, Error) if not Error.Success(): print "!ReadCStringFromMemory() did not find a %d byte C string at %x" % (= FileNameLen, FileNamePtr) -=C2=A0 =C2=A0 =C2=A0 =C2=A0 # make breakpoint command contiue +=C2=A0 =C2=A0 =C2=A0 =C2=A0 # make breakpoint command continue frame.GetThread().GetProcess().Continue() debugger =3D frame.thread.process.target.debugger @@ -404,12 +404,12 @@ def LoadEmulatorEfiSymbols(frame, bp_loc , internal_= dict): if not target.RemoveModule (SBModule): print "!lldb.target.RemoveModule (%s) FAILED" % SBModule -=C2=A0 =C2=A0 # make breakpoint command contiue +=C2=A0 =C2=A0 # make breakpoint command continue frame.thread.process.Continue() def GuidToCStructStr (guid, Name=3DFalse): # -=C2=A0 # Convert a 16-byte bytesarry (or bytearray compat object) to C gu= id string +=C2=A0 # Convert a 16-byte bytesarray (or bytearray compat object) to C g= uid string # { 0xB402621F, 0xA940, 0x1E4A, { 0x86, 0x6B, 0x4D, 0xC9, 0x16, 0x2B, 0x34= , 0x7C } } # # Name=3DTrue means lookup name in GuidNameDict and us it if you find it @@ -516,7 +516,7 @@ def __lldb_init_module (debugger, internal_dict): if len(data) >=3D 2: guid_dict[data[0].upper()] =3D data[1].strip('\n') -=C2=A0 =C2=A0 # init EFI specific type formaters +=C2=A0 =C2=A0 # init EFI specific type formatters TypePrintFormating (debugger) -- 2.20.1 (Apple Git-117) --YaWe5xiaxIZV4N6jNgGc 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/Unix/GdbRun.sh          &n= bsp;        |  4 ++--
 EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c |  2 +-
 EmulatorPkg/Unix/Host/BlockIo.c        &nbs= p;     | 12 ++++++------
 EmulatorPkg/Unix/Host/EmuThunk.c        &nb= sp;    |  2 +-
 EmulatorPkg/Unix/lldbefi.py          &= nbsp;       | 14 +++++++-------
 5 files changed, 17 insertions(+), 17 deletions(-)
 
diff --git a/EmulatorPkg/Unix/GdbRun.sh b/EmulatorPkg/Unix/GdbRun.sh<= /div>
index 8c761ff2c9..b050ad5e2c 100644
--- a/EmulatorPkg/Unix/GdbRun.sh
+++ b/EmulatorPkg/Unix/GdbRun.sh
@@ -62,8 +62,8 @@ define RemoveFirmwareSymbolFile
 end
 
 if gInXcode =3D=3D 1
-  # in Xcode the program is already runing. Issuing a run comma= nd
-  # will cause a fatal debugger error. The break point sciprt t= hat
+  # in Xcode the program is already running. Issuing a run comm= and
+  # will cause a fatal debugger error. The break point script t= hat
   # is used to source this script sets gInCode to 1.
 else
   #
diff --git a/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c b/EmulatorP= kg/Unix/Host/BerkeleyPacketFilter.c
index e318a90740..dcc315ac72 100644
--- a/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c
+++ b/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c
@@ -5,7 +5,7 @@
  Tested on Mac OS X.
 
 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/BlockIo.c b/EmulatorPkg/Unix/Host/= BlockIo.c
index 07e39347e4..18368060d5 100644
--- a/EmulatorPkg/Unix/Host/BlockIo.c
+++ b/EmulatorPkg/Unix/Host/BlockIo.c
@@ -398,7 +398,7 @@ EmuBlockIoReadBlocks (
 Done:
   if (Token !=3D NULL) {
     if (Token->Event !=3D NULL) {
-      // Caller is responcible for signaling EFI Even= t
+      // Caller is responsible for signaling EFI Even= t
       Token->TransactionStatus =3D Status;
       return EFI_SUCCESS;
     }
@@ -429,7 +429,7 @@ Done:
                   =              the Event is NULL.
   @retval EFI_WRITE_PROTECTED   The device can n= ot be written to.
   @retval EFI_NO_MEDIA          T= here 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 match the current device.
   @retval EFI_DEVICE_ERROR      The device = reported an error while performing the write.
   @retval EFI_BAD_BUFFER_SIZE   The Buffer was n= ot a multiple of the block size of the device.
   @retval EFI_INVALID_PARAMETER The write request contains= LBAs that are not valid,
@@ -477,7 +477,7 @@ EmuBlockIoWriteBlocks (
 Done:
   if (Token !=3D NULL) {
     if (Token->Event !=3D NULL) {
-      // Caller is responcible for signaling EFI Even= t
+      // Caller is responsible for signaling EFI Even= t
       Token->TransactionStatus =3D Status;
       return EFI_SUCCESS;
     }
@@ -500,7 +500,7 @@ Done:
   @retval EFI_SUCCESS          Th= e 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 report= ed an error while writting back
+  @retval EFI_DEVICE_ERROR     The device report= ed an error while writing back
                   =             the data.
   @retval EFI_WRITE_PROTECTED  The device cannot be w= ritten to.
   @retval EFI_NO_MEDIA         Th= ere is no media in the device.
@@ -529,7 +529,7 @@ EmuBlockIoFlushBlocks (
 
   if (Token !=3D NULL) {
     if (Token->Event !=3D NULL) {
-      // Caller is responcible for signaling EFI Even= t
+      // Caller is responsible for signaling EFI Even= t
       Token->TransactionStatus =3D EFI_SUCCES= S;
       return EFI_SUCCESS;
     }
@@ -544,7 +544,7 @@ EmuBlockIoFlushBlocks (
 
   @param[in]  This          =        Indicates a pointer to the calling context.
   @param[in]  ExtendedVerification Indicates that the= driver may perform a more
-                   = ;                exhausive verficat= ion operation of the device
+                   = ;                exhaustive verific= ation operation of the device
                   =                 during reset.
 
   @retval EFI_SUCCESS          Th= e device was reset.
diff --git a/EmulatorPkg/Unix/Host/EmuThunk.c b/EmulatorPkg/Unix/Host= /EmuThunk.c
index f1330c8234..b831c67946 100644
--- a/EmulatorPkg/Unix/Host/EmuThunk.c
+++ b/EmulatorPkg/Unix/Host/EmuThunk.c
@@ -6,7 +6,7 @@
   The mUnixThunkTable exists so that a change to EFI_EMU_T= HUNK_PROTOCOL
   will cause an error in initializing the array if all the= member functions
   are not added. It looks like adding a element to end and= not initializing
-  it may cause the table to be initaliized with the members at = the end being
+  it may cause the table to be initialized with the members at = the end being
   set to zero. This is bad as jumping to zero will crash.<= /div>
 
 Copyright (c) 2004 - 2009, Intel Corporation. All rights reserv= ed.<BR>
diff --git a/EmulatorPkg/Unix/lldbefi.py b/EmulatorPkg/Unix/lldbefi.p= y
index 218326b8cb..f3e35865c2 100755
--- a/EmulatorPkg/Unix/lldbefi.py
+++ b/EmulatorPkg/Unix/lldbefi.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 #
-#  Copyright 2014 Apple Inc. All righes reserved.
+#  Copyright 2014 Apple Inc. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -278,7 +278,7 @@ def EFI_DEVICE_PATH_PROTOCOL_TypeSummary (valobj,= internal_dict):
 
     Address =3D long ("%d" % valobj.addr)
     if (Address =3D=3D lldb.LLDB_INVALID_ADDRESS):
-      # Need to reserach this, it seems to be the nes= ted struct case
+      # Need to research this, it seems to be the nes= ted struct case
       ExprStr =3D ""
     elif (Type & 0x7f =3D=3D 0x7f):
       ExprStr =3D "End Device Path" if SubType = =3D=3D 0xff else "End This Instance"
@@ -304,7 +304,7 @@ def EFI_DEVICE_PATH_PROTOCOL_TypeSummary (valobj,= internal_dict):
 
 def TypePrintFormating(debugger):
     #
-    # Set the default print formating for EFI types in lld= b.
+    # Set the default print formatting for EFI types in ll= db.
     # seems lldb defaults to decimal.
     #
     category =3D debugger.GetDefaultCategory()
@@ -384,7 +384,7 @@ def LoadEmulatorEfiSymbols(frame, bp_loc , intern= al_dict):
     FileName =3D frame.thread.process.ReadCStringFrom= Memory (FileNamePtr, FileNameLen, Error)
     if not Error.Success():
         print "!ReadCStringFromMemory() did= not find a %d byte C string at %x" % (FileNameLen, FileNamePtr)
-        # make breakpoint command contiue
+        # make breakpoint command continue
         frame.GetThread().GetProcess().Cont= inue()
 
     debugger =3D frame.thread.process.target.debugger=
@@ -404,12 +404,12 @@ def LoadEmulatorEfiSymbols(frame, bp_loc , inte= rnal_dict):
                 if not = target.RemoveModule (SBModule):
                   =  print "!lldb.target.RemoveModule (%s) FAILED" % SBModule
 
-    # make breakpoint command contiue
+    # make breakpoint command continue
     frame.thread.process.Continue()
 
 def GuidToCStructStr (guid, Name=3DFalse):
   #
-  # Convert a 16-byte bytesarry (or bytearray compat object) to= C guid string
+  # Convert a 16-byte bytesarray (or bytearray compat object) t= o C guid string
   # { 0xB402621F, 0xA940, 0x1E4A, { 0x86, 0x6B, 0x4D, 0xC9= , 0x16, 0x2B, 0x34, 0x7C } }
   #
   # Name=3DTrue means lookup name in GuidNameDict and us i= t if you find it
@@ -516,7 +516,7 @@ def __lldb_init_module (debugger, internal_dict):=
             if len(data) >=3D = 2:
                 guid_di= ct[data[0].upper()] =3D data[1].strip('\n')
 
-    # init EFI specific type formaters
+    # init EFI specific type formatters
     TypePrintFormating (debugger)
 
 
-- 
2.20.1 (Apple Git-117)
 
--YaWe5xiaxIZV4N6jNgGc--