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 <af...@apple.com>
Cc: Ray Ni <ray...@intel.com>
Cc: Michael D Kinney <michael.d.kin...@intel.com>
Cc: Chasel Chiu <chasel.c...@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desim...@intel.com>
---
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.<BR>
- Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2011 - 2023, Intel Corporation. All rights reserved.<BR>
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.<BR>
+# Copyright (c) 2023, Intel Corporation. All rights reserved.<BR>
# 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.<BR>
+Copyright (c) 2019 - 2023, Intel Corporation. All rights reserved.<BR>
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.<BR>
+# Copyright (c) 2023, Intel Corporation. All rights reserved.<BR>
# 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
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#100707): https://edk2.groups.io/g/devel/message/100707
Mute This Topic: https://groups.io/mt/97414911/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
