InOsEmuPkg: Rename EmuPthreadThunk to EmuThreadThunk

This reflects that the threading system may vary in the
OS/thunk layer.

Signed-off-by: jljusten

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11662 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 20 insertions, 16 deletions

diff --git a/InOsEmuPkg/Unix/Sec/Gasket.h b/InOsEmuPkg/Unix/Sec/Gasket.h
index 9b74276dcf..61297b575a 100644
--- a/InOsEmuPkg/Unix/Sec/Gasket.h
+++ b/InOsEmuPkg/Unix/Sec/Gasket.h
@@ -1,6 +1,7 @@
 /** @file

 

   Copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>

+  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -277,7 +278,7 @@ EFIAPI
 GasketPthreadCreate (

   IN  VOID                      *Thread,

   IN  VOID                      *Attribute,

-  IN  PTREAD_THUNK_THEAD_ENTRY  Start,

+  IN  THREAD_THUNK_THREAD_ENTRY Start,

   IN  VOID                      *Context

   );

  

diff --git a/InOsEmuPkg/Unix/Sec/Pthreads.c b/InOsEmuPkg/Unix/Sec/Pthreads.c
index 273be5dcc9..b6b6ae8ef5 100644
--- a/InOsEmuPkg/Unix/Sec/Pthreads.c
+++ b/InOsEmuPkg/Unix/Sec/Pthreads.c
@@ -2,6 +2,8 @@
  POSIX Pthreads to emulate APs and implement threads
 
 Copyright (c) 2011, Apple Inc. All rights reserved.
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -81,7 +83,7 @@ PthreadMutexDestroy (
 // Can't store this data on PthreadCreate stack so we need a global
 typedef struct {
   pthread_mutex_t             Mutex;
-  PTREAD_THUNK_THEAD_ENTRY    Start;
+  THREAD_THUNK_THREAD_ENTRY   Start;
 } THREAD_MANGLE;
 
 THREAD_MANGLE mThreadMangle = {
@@ -94,7 +96,7 @@ SecFakePthreadStart (
   VOID  *Context
   )
 {
-  PTREAD_THUNK_THEAD_ENTRY  Start;
+  THREAD_THUNK_THREAD_ENTRY Start;
   sigset_t                  SigMask;
   
   // Save global on the stack before we unlock
@@ -120,7 +122,7 @@ UINTN
 PthreadCreate (
   IN  VOID                      *Thread,
   IN  VOID                      *Attribute,
-  IN  PTREAD_THUNK_THEAD_ENTRY  Start,
+  IN  THREAD_THUNK_THREAD_ENTRY Start,
   IN  VOID                      *Context
   )
 {
@@ -178,7 +180,7 @@ PthreadSelf (
 }
 
 
-EMU_PTREAD_THUNK_PROTOCOL gPthreadThunk = {
+EMU_THREAD_THUNK_PROTOCOL gPthreadThunk = {
   GasketPthreadMutexLock,
   GasketPthreadMutexUnLock,
   GasketPthreadMutexTryLock,
@@ -221,7 +223,7 @@ PthreadClose (
 
 
 EMU_IO_THUNK_PROTOCOL gPthreadThunkIo = {
-  &gEmuPthreadThunkProtocolGuid,
+  &gEmuThreadThunkProtocolGuid,
   NULL,
   NULL,
   0,
diff --git a/InOsEmuPkg/Unix/Sec/SecMain.h b/InOsEmuPkg/Unix/Sec/SecMain.h
index 317bd5d8b5..00ab7a61ab 100644
--- a/InOsEmuPkg/Unix/Sec/SecMain.h
+++ b/InOsEmuPkg/Unix/Sec/SecMain.h
@@ -1,14 +1,15 @@
 /*++ @file

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>

-This program and the accompanying materials                          

-are licensed and made available under the terms and conditions of the BSD License         

-which accompanies this distribution.  The full text of the license may be found at        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+This program and the accompanying materials

+are licensed and made available under the terms and conditions of the BSD License

+which accompanies this distribution.  The full text of the license may be found at

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 **/

 

@@ -44,7 +45,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/EmuThunk.h>

 #include <Protocol/EmuIoThunk.h>

 #include <Protocol/EmuGraphicsWindow.h>

-#include <Protocol/EmuPthreadThunk.h>

+#include <Protocol/EmuThread.h>

 

 #include <Guid/FileInfo.h>

 #include <Guid/FileSystemInfo.h>

diff --git a/InOsEmuPkg/Unix/Sec/SecMain.inf b/InOsEmuPkg/Unix/Sec/SecMain.inf
index abc9618813..7939fbfa83 100644
--- a/InOsEmuPkg/Unix/Sec/SecMain.inf
+++ b/InOsEmuPkg/Unix/Sec/SecMain.inf
@@ -67,7 +67,7 @@
   gEmuIoThunkProtocolGuid

   gEmuIoThunkProtocolGuid

   gEmuGraphicsWindowProtocolGuid

-  gEmuPthreadThunkProtocolGuid

+  gEmuThreadThunkProtocolGuid

   gEfiSimpleFileSystemProtocolGuid