From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web10.22191.1678062132259075315 for ; Sun, 05 Mar 2023 16:22:13 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=DafZKosl; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: nathaniel.l.desimone@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678062133; x=1709598133; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=o+4lALSmMJ0RC7EgYvxUtAuE5R2eOs17FVjBJdtLlrc=; b=DafZKoslEJHeUzg5YpNYxx2x5o67wVZ0lBkIEA7SkHtmRA0YwXUddjw4 LGmRnty5XStlEnlkDBJMVoSh5TT2fs+n9KntwH54eKdCQP36m/LeEHVum Xk/XqZxTp+jzanHRn6ohK5CFia0Vl4mpA4LPO8a6pARedqUP4DoJgK4Qe 2xdsunxGzSOSpt9OzVccD//OBmbOoSz1wysHFf/kT0Mu7S0TzOhVexxa5 NMyx7WX+YGQV0276HONEYxGZVrgW7pc9WsvH0Kg9vZGZBADWbyKyJ3Cuf Q6aeWcRv79Ygmom3ugl91u2IQPZOn4n7DfjB6Qpzbf+zsBhypF0x+L4md w==; X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="337758115" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="337758115" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2023 16:22:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="669263316" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="669263316" Received: from nldesimo-desk.amr.corp.intel.com ([10.24.12.177]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2023 16:22:11 -0800 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Andrew Fish , Ray Ni , Michael D Kinney , Chasel Chiu Subject: [PATCH v1 3/6] EmulatorPkg: Fix PosixFileSystem function misspellings Date: Sun, 5 Mar 2023 16:22:02 -0800 Message-Id: <20230306002205.1640-4-nathaniel.l.desimone@intel.com> X-Mailer: git-send-email 2.39.2.windows.1 In-Reply-To: <20230306002205.1640-1-nathaniel.l.desimone@intel.com> References: <20230306002205.1640-1-nathaniel.l.desimone@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Fixes spelling errors in the following function names: GasketPosixFileCLose --> GasketPosixFileClose PosixFileCLose --> PosixFileClose GasketPosixFileSetPossition --> GasketPosixFileSetPosition PosixFileSetPossition --> PosixFileSetPosition GasketPosixFileGetPossition --> GasketPosixFileGetPosition PosixFileGetPossition --> PosixFileGetPosition GasketPosixFileSystmeThunkOpen --> GasketPosixFileSystemThunkOpen PosixFileSystmeThunkOpen --> PosixFileSystemThunkOpen GasketPosixFileSystmeThunkClose --> GasketPosixFileSystemThunkClose PosixFileSystmeThunkClose --> PosixFileSystemThunkClose Cc: Andrew Fish Cc: Ray Ni Cc: Michael D Kinney Cc: Chasel Chiu Signed-off-by: Nate DeSimone --- EmulatorPkg/Unix/Host/Gasket.h | 12 +++++----- EmulatorPkg/Unix/Host/Ia32/Gasket.S | 31 +++++++++++++------------ EmulatorPkg/Unix/Host/PosixFileSystem.c | 22 +++++++++--------- EmulatorPkg/Unix/Host/X64/Gasket.S | 31 +++++++++++++------------ 4 files changed, 49 insertions(+), 47 deletions(-) diff --git a/EmulatorPkg/Unix/Host/Gasket.h b/EmulatorPkg/Unix/Host/Gasket.h index 6dafc903cf..90c591e024 100644 --- a/EmulatorPkg/Unix/Host/Gasket.h +++ b/EmulatorPkg/Unix/Host/Gasket.h @@ -1,7 +1,7 @@ /** @file Copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
- Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.
+ Copyright (c) 2011 - 2023, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -360,7 +360,7 @@ GasketPosixFileOpen ( EFI_STATUS EFIAPI -GasketPosixFileCLose ( +GasketPosixFileClose ( IN EFI_FILE_PROTOCOL *This ); @@ -388,14 +388,14 @@ GasketPosixFileWrite ( EFI_STATUS EFIAPI -GasketPosixFileSetPossition ( +GasketPosixFileSetPosition ( IN EFI_FILE_PROTOCOL *This, IN UINT64 Position ); EFI_STATUS EFIAPI -GasketPosixFileGetPossition ( +GasketPosixFileGetPosition ( IN EFI_FILE_PROTOCOL *This, OUT UINT64 *Position ); @@ -426,13 +426,13 @@ GasketPosixFileFlush ( EFI_STATUS EFIAPI -GasketPosixFileSystmeThunkOpen ( +GasketPosixFileSystemThunkOpen ( IN EMU_IO_THUNK_PROTOCOL *This ); EFI_STATUS EFIAPI -GasketPosixFileSystmeThunkClose ( +GasketPosixFileSystemThunkClose ( IN EMU_IO_THUNK_PROTOCOL *This ); diff --git a/EmulatorPkg/Unix/Host/Ia32/Gasket.S b/EmulatorPkg/Unix/Host/Ia32/Gasket.S index 36197ff260..f4c2b456d8 100644 --- a/EmulatorPkg/Unix/Host/Ia32/Gasket.S +++ b/EmulatorPkg/Unix/Host/Ia32/Gasket.S @@ -7,6 +7,7 @@ # the code common. # # Copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
+# Copyright (c) 2023, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # #------------------------------------------------------------------------------ @@ -847,8 +848,8 @@ ASM_PFX(GasketPosixFileOpen): ret -ASM_GLOBAL ASM_PFX(GasketPosixFileCLose) -ASM_PFX(GasketPosixFileCLose): +ASM_GLOBAL ASM_PFX(GasketPosixFileClose) +ASM_PFX(GasketPosixFileClose): pushl %ebp movl %esp, %ebp subl $24, %esp // sub extra 16 from the stack for alignment @@ -856,7 +857,7 @@ ASM_PFX(GasketPosixFileCLose): movl 8(%ebp), %eax movl %eax, (%esp) - call ASM_PFX(PosixFileCLose) + call ASM_PFX(PosixFileClose) leave ret @@ -915,8 +916,8 @@ ASM_PFX(GasketPosixFileWrite): ret -ASM_GLOBAL ASM_PFX(GasketPosixFileSetPossition) -ASM_PFX(GasketPosixFileSetPossition): +ASM_GLOBAL ASM_PFX(GasketPosixFileSetPosition) +ASM_PFX(GasketPosixFileSetPosition): pushl %ebp movl %esp, %ebp subl $40, %esp // sub extra 16 from the stack for alignment @@ -928,14 +929,14 @@ ASM_PFX(GasketPosixFileSetPossition): movl 8(%ebp), %eax movl %eax, (%esp) - call ASM_PFX(PosixFileSetPossition) + call ASM_PFX(PosixFileSetPosition) leave ret -ASM_GLOBAL ASM_PFX(GasketPosixFileGetPossition) -ASM_PFX(GasketPosixFileGetPossition): +ASM_GLOBAL ASM_PFX(GasketPosixFileGetPosition) +ASM_PFX(GasketPosixFileGetPosition): pushl %ebp movl %esp, %ebp subl $24, %esp // sub extra 16 from the stack for alignment @@ -945,7 +946,7 @@ ASM_PFX(GasketPosixFileGetPossition): movl 8(%ebp), %eax movl %eax, (%esp) - call ASM_PFX(PosixFileGetPossition) + call ASM_PFX(PosixFileGetPosition) leave ret @@ -1008,8 +1009,8 @@ ASM_PFX(GasketPosixFileFlush): ret -ASM_GLOBAL ASM_PFX(GasketPosixFileSystmeThunkOpen) -ASM_PFX(GasketPosixFileSystmeThunkOpen): +ASM_GLOBAL ASM_PFX(GasketPosixFileSystemThunkOpen) +ASM_PFX(GasketPosixFileSystemThunkOpen): pushl %ebp movl %esp, %ebp subl $24, %esp // sub extra 16 from the stack for alignment @@ -1017,14 +1018,14 @@ ASM_PFX(GasketPosixFileSystmeThunkOpen): movl 8(%ebp), %eax movl %eax, (%esp) - call ASM_PFX(PosixFileSystmeThunkOpen) + call ASM_PFX(PosixFileSystemThunkOpen) leave ret -ASM_GLOBAL ASM_PFX(GasketPosixFileSystmeThunkClose) -ASM_PFX(GasketPosixFileSystmeThunkClose): +ASM_GLOBAL ASM_PFX(GasketPosixFileSystemThunkClose) +ASM_PFX(GasketPosixFileSystemThunkClose): pushl %ebp movl %esp, %ebp subl $24, %esp // sub extra 16 from the stack for alignment @@ -1032,7 +1033,7 @@ ASM_PFX(GasketPosixFileSystmeThunkClose): movl 8(%ebp), %eax movl %eax, (%esp) - call ASM_PFX(PosixFileSystmeThunkClose) + call ASM_PFX(PosixFileSystemThunkClose) leave ret diff --git a/EmulatorPkg/Unix/Host/PosixFileSystem.c b/EmulatorPkg/Unix/Host/PosixFileSystem.c index b69d3d5520..3a86d6675c 100644 --- a/EmulatorPkg/Unix/Host/PosixFileSystem.c +++ b/EmulatorPkg/Unix/Host/PosixFileSystem.c @@ -2,7 +2,7 @@ POSIX Pthreads to emulate APs and implement threads Copyright (c) 2011, Apple Inc. All rights reserved. -Copyright (c) 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2019 - 2023, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -70,12 +70,12 @@ PosixFileSetInfo ( EFI_FILE_PROTOCOL gPosixFileProtocol = { EFI_FILE_REVISION, GasketPosixFileOpen, - GasketPosixFileCLose, + GasketPosixFileClose, GasketPosixFileDelete, GasketPosixFileRead, GasketPosixFileWrite, - GasketPosixFileGetPossition, - GasketPosixFileSetPossition, + GasketPosixFileGetPosition, + GasketPosixFileSetPosition, GasketPosixFileGetInfo, GasketPosixFileSetInfo, GasketPosixFileFlush @@ -643,7 +643,7 @@ Done:; **/ EFI_STATUS -PosixFileCLose ( +PosixFileClose ( IN EFI_FILE_PROTOCOL *This ) { @@ -883,7 +883,7 @@ PosixFileWrite ( **/ EFI_STATUS -PosixFileSetPossition ( +PosixFileSetPosition ( IN EFI_FILE_PROTOCOL *This, IN UINT64 Position ) @@ -930,7 +930,7 @@ PosixFileSetPossition ( **/ EFI_STATUS -PosixFileGetPossition ( +PosixFileGetPosition ( IN EFI_FILE_PROTOCOL *This, OUT UINT64 *Position ) @@ -1473,7 +1473,7 @@ PosixFileFlush ( } EFI_STATUS -PosixFileSystmeThunkOpen ( +PosixFileSystemThunkOpen ( IN EMU_IO_THUNK_PROTOCOL *This ) { @@ -1530,7 +1530,7 @@ PosixFileSystmeThunkOpen ( } EFI_STATUS -PosixFileSystmeThunkClose ( +PosixFileSystemThunkClose ( IN EMU_IO_THUNK_PROTOCOL *This ) { @@ -1566,7 +1566,7 @@ EMU_IO_THUNK_PROTOCOL gPosixFileSystemThunkIo = { NULL, NULL, 0, - GasketPosixFileSystmeThunkOpen, - GasketPosixFileSystmeThunkClose, + GasketPosixFileSystemThunkOpen, + GasketPosixFileSystemThunkClose, NULL }; diff --git a/EmulatorPkg/Unix/Host/X64/Gasket.S b/EmulatorPkg/Unix/Host/X64/Gasket.S index 030faa8e4c..e82c9d4ad6 100644 --- a/EmulatorPkg/Unix/Host/X64/Gasket.S +++ b/EmulatorPkg/Unix/Host/X64/Gasket.S @@ -8,6 +8,7 @@ # RSI, RDI calle-save on EFI, scatch on UNIX callign # # Copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
+# Copyright (c) 2023, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # #------------------------------------------------------------------------------ @@ -941,8 +942,8 @@ ASM_PFX(GasketPosixFileOpen): ret -ASM_GLOBAL ASM_PFX(GasketPosixFileCLose) -ASM_PFX(GasketPosixFileCLose): +ASM_GLOBAL ASM_PFX(GasketPosixFileClose) +ASM_PFX(GasketPosixFileClose): pushq %rbp // stack frame is for the debugger movq %rsp, %rbp @@ -951,7 +952,7 @@ ASM_PFX(GasketPosixFileCLose): movq %rcx, %rdi // Swizzle args - call ASM_PFX(PosixFileCLose) + call ASM_PFX(PosixFileClose) popq %rdi // restore state popq %rsi @@ -1017,8 +1018,8 @@ ASM_PFX(GasketPosixFileWrite): ret -ASM_GLOBAL ASM_PFX(GasketPosixFileSetPossition) -ASM_PFX(GasketPosixFileSetPossition): +ASM_GLOBAL ASM_PFX(GasketPosixFileSetPosition) +ASM_PFX(GasketPosixFileSetPosition): pushq %rbp // stack frame is for the debugger movq %rsp, %rbp @@ -1028,7 +1029,7 @@ ASM_PFX(GasketPosixFileSetPossition): movq %rcx, %rdi // Swizzle args movq %rdx, %rsi - call ASM_PFX(PosixFileSetPossition) + call ASM_PFX(PosixFileSetPosition) popq %rdi // restore state popq %rsi @@ -1036,8 +1037,8 @@ ASM_PFX(GasketPosixFileSetPossition): ret -ASM_GLOBAL ASM_PFX(GasketPosixFileGetPossition) -ASM_PFX(GasketPosixFileGetPossition): +ASM_GLOBAL ASM_PFX(GasketPosixFileGetPosition) +ASM_PFX(GasketPosixFileGetPosition): pushq %rbp // stack frame is for the debugger movq %rsp, %rbp @@ -1047,7 +1048,7 @@ ASM_PFX(GasketPosixFileGetPossition): movq %rcx, %rdi // Swizzle args movq %rdx, %rsi - call ASM_PFX(PosixFileGetPossition) + call ASM_PFX(PosixFileGetPosition) popq %rdi // restore state popq %rsi @@ -1115,8 +1116,8 @@ ASM_PFX(GasketPosixFileFlush): ret -ASM_GLOBAL ASM_PFX(GasketPosixFileSystmeThunkOpen) -ASM_PFX(GasketPosixFileSystmeThunkOpen): +ASM_GLOBAL ASM_PFX(GasketPosixFileSystemThunkOpen) +ASM_PFX(GasketPosixFileSystemThunkOpen): pushq %rbp // stack frame is for the debugger movq %rsp, %rbp @@ -1125,7 +1126,7 @@ ASM_PFX(GasketPosixFileSystmeThunkOpen): movq %rcx, %rdi // Swizzle args - call ASM_PFX(PosixFileSystmeThunkOpen) + call ASM_PFX(PosixFileSystemThunkOpen) popq %rdi // restore state popq %rsi @@ -1133,8 +1134,8 @@ ASM_PFX(GasketPosixFileSystmeThunkOpen): ret -ASM_GLOBAL ASM_PFX(GasketPosixFileSystmeThunkClose) -ASM_PFX(GasketPosixFileSystmeThunkClose): +ASM_GLOBAL ASM_PFX(GasketPosixFileSystemThunkClose) +ASM_PFX(GasketPosixFileSystemThunkClose): pushq %rbp // stack frame is for the debugger movq %rsp, %rbp @@ -1143,7 +1144,7 @@ ASM_PFX(GasketPosixFileSystmeThunkClose): movq %rcx, %rdi // Swizzle args - call ASM_PFX(PosixFileSystmeThunkClose) + call ASM_PFX(PosixFileSystemThunkClose) popq %rdi // restore state popq %rsi -- 2.30.2