* [PATCH v1] EmulatorPkg: Delete EMU_IO_THUNK_PROTOCO_GUID
2023-03-01 4:55 [PATCH v1] EmulatorPkg: Correct Comment Nate DeSimone
@ 2023-03-01 4:55 ` Nate DeSimone
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Fix misspelling Nate DeSimone
` (5 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Nate DeSimone @ 2023-03-01 4:55 UTC (permalink / raw)
To: devel; +Cc: Nate DeSimone, Andrew Fish, Ray Ni, Michael D Kinney, Chasel Chiu
From: Nate DeSimone <nathaniel.l.desimone@intel.com>
Delete this macro because:
1. Nothing uses it.
2. It is misspelled.
3. It is a EDK I style GUID definition which is redundant with
an existing EDK II style GUID definition.
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
EmulatorPkg/Include/Protocol/EmuIoThunk.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/EmulatorPkg/Include/Protocol/EmuIoThunk.h b/EmulatorPkg/Include/Protocol/EmuIoThunk.h
index b6da635177..5f025c0e3c 100644
--- a/EmulatorPkg/Include/Protocol/EmuIoThunk.h
+++ b/EmulatorPkg/Include/Protocol/EmuIoThunk.h
@@ -2,6 +2,7 @@
Emulator Thunk to abstract OS services from pure EFI code
Copyright (c) 2010 - 2011, Apple Inc. All rights reserved.<BR>
+ Copyright (c) 2023, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -10,9 +11,6 @@
#ifndef __EMU_IO_THUNK__
#define __EMU_IO_THUNK__
-#define EMU_IO_THUNK_PROTOCO_GUID \
- { 0x453368F6, 0x7C85, 0x434A, { 0xA9, 0x8A, 0x72, 0xD1, 0xB7, 0xFF, 0xA9, 0x26 } }
-
typedef struct _EMU_IO_THUNK_PROTOCOL EMU_IO_THUNK_PROTOCOL;
typedef
--
2.30.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v1] EmulatorPkg: Fix misspelling
2023-03-01 4:55 [PATCH v1] EmulatorPkg: Correct Comment Nate DeSimone
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Delete EMU_IO_THUNK_PROTOCO_GUID Nate DeSimone
@ 2023-03-01 4:55 ` Nate DeSimone
2023-03-01 5:11 ` Ni, Ray
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Fix SecInterruptEnabled misspelling Nate DeSimone
` (4 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Nate DeSimone @ 2023-03-01 4:55 UTC (permalink / raw)
To: devel; +Cc: Nate DeSimone, Andrew Fish, Ray Ni, Michael D Kinney, Chasel Chiu
From: Nate DeSimone <nathaniel.l.desimone@intel.com>
pased should be passed.
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
EmulatorPkg/Unix/Host/Host.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c
index 1f29dd00a3..42856dbf5a 100644
--- a/EmulatorPkg/Unix/Host/Host.c
+++ b/EmulatorPkg/Unix/Host/Host.c
@@ -1,6 +1,6 @@
/*++ @file
-Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -136,7 +136,7 @@ main (
FirmwareVolumesStr = (CHAR16 *)PcdGetPtr (PcdEmuFirmwareVolume);
//
- // PPIs pased into PEI_CORE
+ // PPIs passed into PEI_CORE
//
SecEmuThunkPpi = AllocateZeroPool (sizeof (EMU_THUNK_PPI) + FixedPcdGet32 (PcdPersistentMemorySize));
if (SecEmuThunkPpi == NULL) {
--
2.30.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v1] EmulatorPkg: Fix misspelling
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Fix misspelling Nate DeSimone
@ 2023-03-01 5:11 ` Ni, Ray
0 siblings, 0 replies; 13+ messages in thread
From: Ni, Ray @ 2023-03-01 5:11 UTC (permalink / raw)
To: Desimone, Nathaniel L, devel@edk2.groups.io
Cc: Andrew Fish, Kinney, Michael D, Chiu, Chasel
Acked-by: Ray Ni <ray.ni@intel.com>
> -----Original Message-----
> From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Sent: Wednesday, March 1, 2023 12:55 PM
> To: devel@edk2.groups.io
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Andrew Fish
> <afish@apple.com>; Ni, Ray <ray.ni@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>
> Subject: [PATCH v1] EmulatorPkg: Fix misspelling
>
> From: Nate DeSimone <nathaniel.l.desimone@intel.com>
>
> pased should be passed.
>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> ---
> EmulatorPkg/Unix/Host/Host.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c
> index 1f29dd00a3..42856dbf5a 100644
> --- a/EmulatorPkg/Unix/Host/Host.c
> +++ b/EmulatorPkg/Unix/Host/Host.c
> @@ -1,6 +1,6 @@
> /*++ @file
>
> -Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
> Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -136,7 +136,7 @@ main (
> FirmwareVolumesStr = (CHAR16 *)PcdGetPtr (PcdEmuFirmwareVolume);
>
> //
> - // PPIs pased into PEI_CORE
> + // PPIs passed into PEI_CORE
> //
> SecEmuThunkPpi = AllocateZeroPool (sizeof (EMU_THUNK_PPI) +
> FixedPcdGet32 (PcdPersistentMemorySize));
> if (SecEmuThunkPpi == NULL) {
> --
> 2.30.2
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v1] EmulatorPkg: Fix SecInterruptEnabled misspelling
2023-03-01 4:55 [PATCH v1] EmulatorPkg: Correct Comment Nate DeSimone
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Delete EMU_IO_THUNK_PROTOCO_GUID Nate DeSimone
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Fix misspelling Nate DeSimone
@ 2023-03-01 4:55 ` Nate DeSimone
2023-03-01 5:11 ` Ni, Ray
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Remove Duplicate gEmuIoThunkProtocolGuid Nate DeSimone
` (3 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Nate DeSimone @ 2023-03-01 4:55 UTC (permalink / raw)
To: devel; +Cc: Nate DeSimone, Andrew Fish, Ray Ni, Michael D Kinney, Chasel Chiu
From: Nate DeSimone <nathaniel.l.desimone@intel.com>
SecInterruptEanbled should be SecInterruptEnabled
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
EmulatorPkg/Unix/Host/EmuThunk.c | 4 ++--
EmulatorPkg/Unix/Host/Host.h | 4 ++--
EmulatorPkg/Unix/Host/Pthreads.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/EmulatorPkg/Unix/Host/EmuThunk.c b/EmulatorPkg/Unix/Host/EmuThunk.c
index 6422f056a6..4bbc6f32a8 100644
--- a/EmulatorPkg/Unix/Host/EmuThunk.c
+++ b/EmulatorPkg/Unix/Host/EmuThunk.c
@@ -9,7 +9,7 @@
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.
-Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2023, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -229,7 +229,7 @@ SecDisableInterrupt (
}
BOOLEAN
-SecInterruptEanbled (
+SecInterruptEnabled (
void
)
{
diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h
index 0c81cdfc01..ed3980c7fd 100644
--- a/EmulatorPkg/Unix/Host/Host.h
+++ b/EmulatorPkg/Unix/Host/Host.h
@@ -1,6 +1,6 @@
/*++ @file
-Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -346,7 +346,7 @@ SecDisableInterrupt (
);
BOOLEAN
-SecInterruptEanbled (
+SecInterruptEnabled (
VOID
);
diff --git a/EmulatorPkg/Unix/Host/Pthreads.c b/EmulatorPkg/Unix/Host/Pthreads.c
index ec3a38e573..d5a7c473f7 100644
--- a/EmulatorPkg/Unix/Host/Pthreads.c
+++ b/EmulatorPkg/Unix/Host/Pthreads.c
@@ -2,7 +2,7 @@
POSIX Pthreads to emulate APs and implement threads
Copyright (c) 2011, Apple Inc. All rights reserved.
-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
@@ -120,7 +120,7 @@ PthreadCreate (
//
// Threads inherit interrupt state so disable interrupts before we start thread
//
- if (SecInterruptEanbled ()) {
+ if (SecInterruptEnabled ()) {
SecDisableInterrupt ();
EnabledOnEntry = TRUE;
} else {
--
2.30.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v1] EmulatorPkg: Fix SecInterruptEnabled misspelling
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Fix SecInterruptEnabled misspelling Nate DeSimone
@ 2023-03-01 5:11 ` Ni, Ray
0 siblings, 0 replies; 13+ messages in thread
From: Ni, Ray @ 2023-03-01 5:11 UTC (permalink / raw)
To: Desimone, Nathaniel L, devel@edk2.groups.io
Cc: Andrew Fish, Kinney, Michael D, Chiu, Chasel
Acked-by: Ray Ni <ray.ni@intel.com>
> -----Original Message-----
> From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Sent: Wednesday, March 1, 2023 12:55 PM
> To: devel@edk2.groups.io
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Andrew Fish
> <afish@apple.com>; Ni, Ray <ray.ni@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>
> Subject: [PATCH v1] EmulatorPkg: Fix SecInterruptEnabled misspelling
>
> From: Nate DeSimone <nathaniel.l.desimone@intel.com>
>
> SecInterruptEanbled should be SecInterruptEnabled
>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> ---
> EmulatorPkg/Unix/Host/EmuThunk.c | 4 ++--
> EmulatorPkg/Unix/Host/Host.h | 4 ++--
> EmulatorPkg/Unix/Host/Pthreads.c | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/EmulatorPkg/Unix/Host/EmuThunk.c
> b/EmulatorPkg/Unix/Host/EmuThunk.c
> index 6422f056a6..4bbc6f32a8 100644
> --- a/EmulatorPkg/Unix/Host/EmuThunk.c
> +++ b/EmulatorPkg/Unix/Host/EmuThunk.c
> @@ -9,7 +9,7 @@
> 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.
>
> -Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2004 - 2023, Intel Corporation. All rights reserved.<BR>
> Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -229,7 +229,7 @@ SecDisableInterrupt (
> }
>
> BOOLEAN
> -SecInterruptEanbled (
> +SecInterruptEnabled (
> void
> )
> {
> diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h
> index 0c81cdfc01..ed3980c7fd 100644
> --- a/EmulatorPkg/Unix/Host/Host.h
> +++ b/EmulatorPkg/Unix/Host/Host.h
> @@ -1,6 +1,6 @@
> /*++ @file
>
> -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
> Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -346,7 +346,7 @@ SecDisableInterrupt (
> );
>
> BOOLEAN
> -SecInterruptEanbled (
> +SecInterruptEnabled (
> VOID
> );
>
> diff --git a/EmulatorPkg/Unix/Host/Pthreads.c
> b/EmulatorPkg/Unix/Host/Pthreads.c
> index ec3a38e573..d5a7c473f7 100644
> --- a/EmulatorPkg/Unix/Host/Pthreads.c
> +++ b/EmulatorPkg/Unix/Host/Pthreads.c
> @@ -2,7 +2,7 @@
> POSIX Pthreads to emulate APs and implement threads
>
> Copyright (c) 2011, Apple Inc. All rights reserved.
> -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
>
> @@ -120,7 +120,7 @@ PthreadCreate (
> //
> // Threads inherit interrupt state so disable interrupts before we start
> thread
> //
> - if (SecInterruptEanbled ()) {
> + if (SecInterruptEnabled ()) {
> SecDisableInterrupt ();
> EnabledOnEntry = TRUE;
> } else {
> --
> 2.30.2
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v1] EmulatorPkg: Remove Duplicate gEmuIoThunkProtocolGuid
2023-03-01 4:55 [PATCH v1] EmulatorPkg: Correct Comment Nate DeSimone
` (2 preceding siblings ...)
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Fix SecInterruptEnabled misspelling Nate DeSimone
@ 2023-03-01 4:55 ` Nate DeSimone
2023-03-01 5:11 ` Ni, Ray
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Rename Variable Nate DeSimone
` (2 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Nate DeSimone @ 2023-03-01 4:55 UTC (permalink / raw)
To: devel; +Cc: Nate DeSimone, Andrew Fish, Ray Ni, Michael D Kinney, Chasel Chiu
From: Nate DeSimone <nathaniel.l.desimone@intel.com>
Host.inf contains two redundant references to
gEmuIoThunkProtocolGuid. Removing one of them as it is superfluous.
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
EmulatorPkg/Unix/Host/Host.inf | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/EmulatorPkg/Unix/Host/Host.inf b/EmulatorPkg/Unix/Host/Host.inf
index f5ebbed683..94997dde6a 100644
--- a/EmulatorPkg/Unix/Host/Host.inf
+++ b/EmulatorPkg/Unix/Host/Host.inf
@@ -2,7 +2,7 @@
# Entry Point of Emu Emulator
#
# Main executable file of Unix Emulator that loads PEI core after initialization finished.
-# Copyright (c) 2008 - 2022, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2008 - 2023, Intel Corporation. All rights reserved.<BR>
# Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -67,7 +67,6 @@
gEmuThunkPpiGuid
[Protocols]
- gEmuIoThunkProtocolGuid
gEmuIoThunkProtocolGuid
gEmuGraphicsWindowProtocolGuid
gEmuThreadThunkProtocolGuid
--
2.30.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v1] EmulatorPkg: Remove Duplicate gEmuIoThunkProtocolGuid
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Remove Duplicate gEmuIoThunkProtocolGuid Nate DeSimone
@ 2023-03-01 5:11 ` Ni, Ray
0 siblings, 0 replies; 13+ messages in thread
From: Ni, Ray @ 2023-03-01 5:11 UTC (permalink / raw)
To: Desimone, Nathaniel L, devel@edk2.groups.io
Cc: Andrew Fish, Kinney, Michael D, Chiu, Chasel
Acked-by: Ray Ni <ray.ni@intel.com>
> -----Original Message-----
> From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Sent: Wednesday, March 1, 2023 12:55 PM
> To: devel@edk2.groups.io
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Andrew Fish
> <afish@apple.com>; Ni, Ray <ray.ni@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>
> Subject: [PATCH v1] EmulatorPkg: Remove Duplicate
> gEmuIoThunkProtocolGuid
>
> From: Nate DeSimone <nathaniel.l.desimone@intel.com>
>
> Host.inf contains two redundant references to
> gEmuIoThunkProtocolGuid. Removing one of them as it is superfluous.
>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> ---
> EmulatorPkg/Unix/Host/Host.inf | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/EmulatorPkg/Unix/Host/Host.inf
> b/EmulatorPkg/Unix/Host/Host.inf
> index f5ebbed683..94997dde6a 100644
> --- a/EmulatorPkg/Unix/Host/Host.inf
> +++ b/EmulatorPkg/Unix/Host/Host.inf
> @@ -2,7 +2,7 @@
> # Entry Point of Emu Emulator
> #
> # Main executable file of Unix Emulator that loads PEI core after initialization
> finished.
> -# Copyright (c) 2008 - 2022, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2008 - 2023, Intel Corporation. All rights reserved.<BR>
> # Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -67,7 +67,6 @@
> gEmuThunkPpiGuid
>
> [Protocols]
> - gEmuIoThunkProtocolGuid
> gEmuIoThunkProtocolGuid
> gEmuGraphicsWindowProtocolGuid
> gEmuThreadThunkProtocolGuid
> --
> 2.30.2
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v1] EmulatorPkg: Rename Variable
2023-03-01 4:55 [PATCH v1] EmulatorPkg: Correct Comment Nate DeSimone
` (3 preceding siblings ...)
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Remove Duplicate gEmuIoThunkProtocolGuid Nate DeSimone
@ 2023-03-01 4:55 ` Nate DeSimone
2023-03-01 5:11 ` Ni, Ray
2023-03-01 4:55 ` [PATCH v1] MdeModulePkg: Fix misspelling Nate DeSimone
2023-03-01 5:10 ` [PATCH v1] EmulatorPkg: Correct Comment Ni, Ray
6 siblings, 1 reply; 13+ messages in thread
From: Nate DeSimone @ 2023-03-01 4:55 UTC (permalink / raw)
To: devel; +Cc: Nate DeSimone, Andrew Fish, Ray Ni, Michael D Kinney, Chasel Chiu
From: Nate DeSimone <nathaniel.l.desimone@intel.com>
Rename PeiCorePe32File to SecCorePe32File, because the variable
actually contains the SEC core... not PEI core.
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
EmulatorPkg/Unix/Host/Host.c | 12 ++++++------
EmulatorPkg/Unix/Host/Host.h | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c
index 1f29dd00a3..940e1953af 100644
--- a/EmulatorPkg/Unix/Host/Host.c
+++ b/EmulatorPkg/Unix/Host/Host.c
@@ -1,6 +1,6 @@
/*++ @file
-Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -535,7 +535,7 @@ Arguments:
LargestRegion - Memory to use for SEC.
LargestRegionSize - Size of Memory to use for PEI
BootFirmwareVolumeBase - Start of the Boot FV
- PeiCorePe32File - SEC PE32
+ SecCorePe32File - SEC PE32
Returns:
Success means control is transferred and thus we should never return
@@ -546,13 +546,13 @@ SecLoadFromCore (
IN UINTN LargestRegion,
IN UINTN LargestRegionSize,
IN UINTN BootFirmwareVolumeBase,
- IN VOID *PeiCorePe32File
+ IN VOID *SecCorePe32File
)
{
EFI_STATUS Status;
EFI_PHYSICAL_ADDRESS TopOfMemory;
VOID *TopOfStack;
- EFI_PHYSICAL_ADDRESS PeiCoreEntryPoint;
+ EFI_PHYSICAL_ADDRESS SecCoreEntryPoint;
EFI_SEC_PEI_HAND_OFF *SecCoreData;
UINTN PeiStackSize;
@@ -597,7 +597,7 @@ SecLoadFromCore (
//
// Find the SEC Core Entry Point
//
- Status = SecPeCoffGetEntryPoint (PeiCorePe32File, (VOID **)&PeiCoreEntryPoint);
+ Status = SecPeCoffGetEntryPoint (SecCorePe32File, (VOID **)&SecCoreEntryPoint);
if (EFI_ERROR (Status)) {
return;
}
@@ -606,7 +606,7 @@ SecLoadFromCore (
// Transfer control to the SEC Core
//
PeiSwitchStacks (
- (SWITCH_STACK_ENTRY_POINT)(UINTN)PeiCoreEntryPoint,
+ (SWITCH_STACK_ENTRY_POINT)(UINTN)SecCoreEntryPoint,
SecCoreData,
(VOID *)gPpiList,
TopOfStack
diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h
index 0c81cdfc01..aecebc0143 100644
--- a/EmulatorPkg/Unix/Host/Host.h
+++ b/EmulatorPkg/Unix/Host/Host.h
@@ -1,6 +1,6 @@
/*++ @file
-Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -162,7 +162,7 @@ SecLoadFromCore (
IN UINTN LargestRegion,
IN UINTN LargestRegionSize,
IN UINTN BootFirmwareVolumeBase,
- IN VOID *PeiCoreFile
+ IN VOID *SecCoreFile
);
EFI_STATUS
--
2.30.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v1] EmulatorPkg: Rename Variable
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Rename Variable Nate DeSimone
@ 2023-03-01 5:11 ` Ni, Ray
0 siblings, 0 replies; 13+ messages in thread
From: Ni, Ray @ 2023-03-01 5:11 UTC (permalink / raw)
To: Desimone, Nathaniel L, devel@edk2.groups.io
Cc: Andrew Fish, Kinney, Michael D, Chiu, Chasel
Nice change😊
Acked-by: Ray Ni <ray.ni@intel.com>
> -----Original Message-----
> From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Sent: Wednesday, March 1, 2023 12:55 PM
> To: devel@edk2.groups.io
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Andrew Fish
> <afish@apple.com>; Ni, Ray <ray.ni@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>
> Subject: [PATCH v1] EmulatorPkg: Rename Variable
>
> From: Nate DeSimone <nathaniel.l.desimone@intel.com>
>
> Rename PeiCorePe32File to SecCorePe32File, because the variable
> actually contains the SEC core... not PEI core.
>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> ---
> EmulatorPkg/Unix/Host/Host.c | 12 ++++++------
> EmulatorPkg/Unix/Host/Host.h | 4 ++--
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c
> index 1f29dd00a3..940e1953af 100644
> --- a/EmulatorPkg/Unix/Host/Host.c
> +++ b/EmulatorPkg/Unix/Host/Host.c
> @@ -1,6 +1,6 @@
> /*++ @file
>
> -Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
> Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -535,7 +535,7 @@ Arguments:
> LargestRegion - Memory to use for SEC.
> LargestRegionSize - Size of Memory to use for PEI
> BootFirmwareVolumeBase - Start of the Boot FV
> - PeiCorePe32File - SEC PE32
> + SecCorePe32File - SEC PE32
>
> Returns:
> Success means control is transferred and thus we should never return
> @@ -546,13 +546,13 @@ SecLoadFromCore (
> IN UINTN LargestRegion,
> IN UINTN LargestRegionSize,
> IN UINTN BootFirmwareVolumeBase,
> - IN VOID *PeiCorePe32File
> + IN VOID *SecCorePe32File
> )
> {
> EFI_STATUS Status;
> EFI_PHYSICAL_ADDRESS TopOfMemory;
> VOID *TopOfStack;
> - EFI_PHYSICAL_ADDRESS PeiCoreEntryPoint;
> + EFI_PHYSICAL_ADDRESS SecCoreEntryPoint;
> EFI_SEC_PEI_HAND_OFF *SecCoreData;
> UINTN PeiStackSize;
>
> @@ -597,7 +597,7 @@ SecLoadFromCore (
> //
> // Find the SEC Core Entry Point
> //
> - Status = SecPeCoffGetEntryPoint (PeiCorePe32File, (VOID
> **)&PeiCoreEntryPoint);
> + Status = SecPeCoffGetEntryPoint (SecCorePe32File, (VOID
> **)&SecCoreEntryPoint);
> if (EFI_ERROR (Status)) {
> return;
> }
> @@ -606,7 +606,7 @@ SecLoadFromCore (
> // Transfer control to the SEC Core
> //
> PeiSwitchStacks (
> - (SWITCH_STACK_ENTRY_POINT)(UINTN)PeiCoreEntryPoint,
> + (SWITCH_STACK_ENTRY_POINT)(UINTN)SecCoreEntryPoint,
> SecCoreData,
> (VOID *)gPpiList,
> TopOfStack
> diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h
> index 0c81cdfc01..aecebc0143 100644
> --- a/EmulatorPkg/Unix/Host/Host.h
> +++ b/EmulatorPkg/Unix/Host/Host.h
> @@ -1,6 +1,6 @@
> /*++ @file
>
> -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
> Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -162,7 +162,7 @@ SecLoadFromCore (
> IN UINTN LargestRegion,
> IN UINTN LargestRegionSize,
> IN UINTN BootFirmwareVolumeBase,
> - IN VOID *PeiCoreFile
> + IN VOID *SecCoreFile
> );
>
> EFI_STATUS
> --
> 2.30.2
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v1] MdeModulePkg: Fix misspelling
2023-03-01 4:55 [PATCH v1] EmulatorPkg: Correct Comment Nate DeSimone
` (4 preceding siblings ...)
2023-03-01 4:55 ` [PATCH v1] EmulatorPkg: Rename Variable Nate DeSimone
@ 2023-03-01 4:55 ` Nate DeSimone
2023-04-04 12:58 ` 回复: [edk2-devel] " gaoliming
2023-03-01 5:10 ` [PATCH v1] EmulatorPkg: Correct Comment Ni, Ray
6 siblings, 1 reply; 13+ messages in thread
From: Nate DeSimone @ 2023-03-01 4:55 UTC (permalink / raw)
To: devel; +Cc: Nate DeSimone, Jian J Wang, Liming Gao, Michael D Kinney,
Dandan Bi
From: Nate DeSimone <nathaniel.l.desimone@intel.com>
confroms should be conforms.
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
---
MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
index fdeaaa39d8..77fb6b8ff9 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
@@ -1,7 +1,7 @@
/** @file
Ia32-specific functionality for DxeLoad.
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -279,7 +279,7 @@ HandOffToDxeCore (
if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {
//
// Compute the top of the stack we were allocated, which is used to load X64 dxe core.
- // Pre-allocate a 32 bytes which confroms to x64 calling convention.
+ // Pre-allocate a 32 bytes which conforms to x64 calling convention.
//
// The first four parameters to a function are passed in rcx, rdx, r8 and r9.
// Any further parameters are pushed on the stack. Furthermore, space (4 * 8bytes) for the
--
2.30.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* 回复: [edk2-devel] [PATCH v1] MdeModulePkg: Fix misspelling
2023-03-01 4:55 ` [PATCH v1] MdeModulePkg: Fix misspelling Nate DeSimone
@ 2023-04-04 12:58 ` gaoliming
0 siblings, 0 replies; 13+ messages in thread
From: gaoliming @ 2023-04-04 12:58 UTC (permalink / raw)
To: devel, nathaniel.l.desimone
Cc: 'Jian J Wang', 'Michael D Kinney',
'Dandan Bi'
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Nate
> DeSimone
> 发送时间: 2023年3月1日 12:55
> 收件人: devel@edk2.groups.io
> 抄送: Nate DeSimone <nathaniel.l.desimone@intel.com>; Jian J Wang
> <jian.j.wang@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Michael
> D Kinney <michael.d.kinney@intel.com>; Dandan Bi <dandan.bi@intel.com>
> 主题: [edk2-devel] [PATCH v1] MdeModulePkg: Fix misspelling
>
> From: Nate DeSimone <nathaniel.l.desimone@intel.com>
>
> confroms should be conforms.
>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Dandan Bi <dandan.bi@intel.com>
> ---
> MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
> b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
> index fdeaaa39d8..77fb6b8ff9 100644
> --- a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
> +++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
> @@ -1,7 +1,7 @@
> /** @file
> Ia32-specific functionality for DxeLoad.
>
> -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
> Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -279,7 +279,7 @@ HandOffToDxeCore (
> if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {
> //
> // Compute the top of the stack we were allocated, which is used to
> load X64 dxe core.
> - // Pre-allocate a 32 bytes which confroms to x64 calling convention.
> + // Pre-allocate a 32 bytes which conforms to x64 calling convention.
> //
> // The first four parameters to a function are passed in rcx, rdx, r8
and
> r9.
> // Any further parameters are pushed on the stack. Furthermore, space
> (4 * 8bytes) for the
> --
> 2.30.2
>
>
>
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v1] EmulatorPkg: Correct Comment
2023-03-01 4:55 [PATCH v1] EmulatorPkg: Correct Comment Nate DeSimone
` (5 preceding siblings ...)
2023-03-01 4:55 ` [PATCH v1] MdeModulePkg: Fix misspelling Nate DeSimone
@ 2023-03-01 5:10 ` Ni, Ray
6 siblings, 0 replies; 13+ messages in thread
From: Ni, Ray @ 2023-03-01 5:10 UTC (permalink / raw)
To: Desimone, Nathaniel L, devel@edk2.groups.io
Cc: Andrew Fish, Kinney, Michael D, Chiu, Chasel
Acked-by: Ray Ni <ray.ni@intel.com>
> -----Original Message-----
> From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Sent: Wednesday, March 1, 2023 12:55 PM
> To: devel@edk2.groups.io
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Andrew Fish
> <afish@apple.com>; Ni, Ray <ray.ni@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>
> Subject: [PATCH v1] EmulatorPkg: Correct Comment
>
> From: Nate DeSimone <nathaniel.l.desimone@intel.com>
>
> EFI_EMU_UGA_IO_PROTOCOL has been replaced by
> EMU_GRAPHICS_WINDOW_PROTOCOL.
>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> ---
> EmulatorPkg/Unix/Host/Gasket.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/EmulatorPkg/Unix/Host/Gasket.h
> b/EmulatorPkg/Unix/Host/Gasket.h
> index 6dafc903cf..b0d61893c3 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
>
> @@ -200,7 +200,7 @@ ReverseGasketUint64Uint64 (
> );
>
> //
> -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL
> +// Gasket functions for EMU_GRAPHICS_WINDOW_PROTOCOL
> //
>
> EFI_STATUS
> --
> 2.30.2
^ permalink raw reply [flat|nested] 13+ messages in thread