Retire <FrameworkModuleBase.h>, <FrameworkModuleDxe.h>, and <FrameworkModulePei.h>

They only provided a single #define that is associated with DEBUG() messages sent through ReportStatusCode.  That one #define has now been added to <Guid/StatusCodeDataTypeDebug.h>


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

3 files changed, 101 insertions, 102 deletions

diff --git a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index 7b8c478149..17b40fdb32 100644
--- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -15,6 +15,7 @@
 **/

 #include "PiDxe.h"

 #include <Guid/StatusCodeDataTypeId.h>

+#include <Guid/StatusCodeDataTypeDebug.h>

 #include "UnixDxe.h"

 #include <Library/OemHookStatusCodeLib.h>

 #include <Library/DebugLib.h>

@@ -22,7 +23,6 @@
 #include <Library/PrintLib.h>

 #include <Library/BaseMemoryLib.h>

 #include <Library/ReportStatusCodeLib.h>

-#include <FrameworkModuleBase.h>

 

 //

 // Cache of UnixThunk protocol 

diff --git a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index ae5883c264..4d4056af70 100644
--- a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -15,8 +15,8 @@
 **/
 #include "PiPei.h"
 #include <Guid/StatusCodeDataTypeId.h>
+#include <Guid/StatusCodeDataTypeDebug.h>

 #include <Ppi/UnixThunk.h>
-#include <FrameworkModuleBase.h>
 #include <Library/OemHookStatusCodeLib.h>
 #include <Library/DebugLib.h>
 #include <Library/PrintLib.h>
diff --git a/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.c b/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.c
index 579553c4e3..3b2af0301b 100644
--- a/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.c
+++ b/UnixPkg/Library/PeiUnixPeCoffExtraActionLib/PeiUnixPeCoffExtraActionLib.c
@@ -1,100 +1,99 @@
-/**@file
-
-Copyright (c) 2006 - 2009, Intel Corporation
-All rights reserved. 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.
-
-Module Name:
-
-  PeiUnixPeCoffExtraActionLib.c
-
-Abstract:
-
-  Provides services to perform additional actions to relocate and unload
-  PE/Coff image for UNIX environment specific purpose such as souce level debug.
-  This version only works for PEI phase
-
-
-**/
-#include <PiPei.h>
-#include <Ppi/UnixThunk.h>
-#include <FrameworkModuleBase.h>
-
-#include <Library/PeCoffLib.h>
-#include <Library/PeiServicesLib.h>
-#include <Library/DebugLib.h>
-#include <Library/BaseLib.h>
-#include <Library/PeCoffExtraActionLib.h>
-
-//
-// Cache of UnixThunk protocol 
-//
-EFI_UNIX_THUNK_PROTOCOL   *mUnix = NULL;
-
-/**
-  The function caches the pointer of the WinNT thunk functions
-  It will ASSERT() if Unix thunk ppi is not installed.
-
-  @retval EFI_SUCCESS   WinNT thunk protocol is found and cached.
-
-**/
-EFI_STATUS
-EFIAPI
-UnixPeCoffGetUnixThunkStucture (
-  )
-{
-	PEI_UNIX_THUNK_PPI  *UnixThunkPpi;
-  EFI_STATUS        Status;
-
-  
-  //
-  // Locate Unix ThunkPpi for retrieving standard output handle
-  //
-  Status = PeiServicesLocatePpi (
-              &gPeiUnixThunkPpiGuid,
-              0,
-              NULL,
-              (VOID **) &UnixThunkPpi
-              );
-
-  ASSERT_EFI_ERROR (Status);
-
-  mUnix  = (EFI_UNIX_THUNK_PROTOCOL *) UnixThunkPpi->UnixThunk ();
-
-  return EFI_SUCCESS;
-}
-
-/**
+/**@file

+

+Copyright (c) 2006 - 2009, Intel Corporation

+All rights reserved. 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.

+

+Module Name:

+

+  PeiUnixPeCoffExtraActionLib.c

+

+Abstract:

+

+  Provides services to perform additional actions to relocate and unload

+  PE/Coff image for UNIX environment specific purpose such as souce level debug.

+  This version only works for PEI phase

+

+

+**/

+#include <PiPei.h>

+#include <Ppi/UnixThunk.h>

+

+#include <Library/PeCoffLib.h>

+#include <Library/PeiServicesLib.h>

+#include <Library/DebugLib.h>

+#include <Library/BaseLib.h>

+#include <Library/PeCoffExtraActionLib.h>

+

+//

+// Cache of UnixThunk protocol 

+//

+EFI_UNIX_THUNK_PROTOCOL   *mUnix = NULL;

+

+/**

+  The function caches the pointer of the WinNT thunk functions

+  It will ASSERT() if Unix thunk ppi is not installed.

+

+  @retval EFI_SUCCESS   WinNT thunk protocol is found and cached.

+

+**/

+EFI_STATUS

+EFIAPI

+UnixPeCoffGetUnixThunkStucture (

+  )

+{

+	PEI_UNIX_THUNK_PPI  *UnixThunkPpi;

+  EFI_STATUS        Status;

+

+  

+  //

+  // Locate Unix ThunkPpi for retrieving standard output handle

+  //

+  Status = PeiServicesLocatePpi (

+              &gPeiUnixThunkPpiGuid,

+              0,

+              NULL,

+              (VOID **) &UnixThunkPpi

+              );

+

+  ASSERT_EFI_ERROR (Status);

+

+  mUnix  = (EFI_UNIX_THUNK_PROTOCOL *) UnixThunkPpi->UnixThunk ();

+

+  return EFI_SUCCESS;

+}

+

+/**

   Performs additional actions after a PE/COFF image has been loaded and relocated.

 

   If ImageContext is NULL, then ASSERT().

 

   @param  ImageContext  Pointer to the image context structure that describes the

                         PE/COFF image that has already been loaded and relocated.

-
-**/
-VOID
-EFIAPI
-PeCoffLoaderRelocateImageExtraAction (
-  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
-  )
-{
+

+**/

+VOID

+EFIAPI

+PeCoffLoaderRelocateImageExtraAction (

+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext

+  )

+{

   VOID * Handle;

   VOID * Entry;

 

   ASSERT (ImageContext != NULL);

 

   Handle = NULL;

-  Entry  = NULL;
-  
-  if (mUnix == NULL) {
-    UnixPeCoffGetUnixThunkStucture ();
-  }
+  Entry  = NULL;

+  

+  if (mUnix == NULL) {

+    UnixPeCoffGetUnixThunkStucture ();

+  }

   DEBUG ((EFI_D_ERROR, "Loading %a 0x%08lx - entry point 0x%08lx\n",

           ImageContext->PdbPointer,

           (UINTN)ImageContext->ImageAddress,

@@ -104,20 +103,20 @@ PeCoffLoaderRelocateImageExtraAction (
   

   if (Handle) {

     Entry = mUnix->Dlsym(Handle, "_ModuleEntryPoint");

-  } else {
+  } else {

   	DEBUG ((EFI_D_ERROR, "%a\n", mUnix->Dlerror()));

   }

   

   if (Entry != NULL) {

-    ImageContext->EntryPoint = Entry;
+    ImageContext->EntryPoint = Entry;

     DEBUG ((EFI_D_ERROR, "Change %a Entrypoint to :0x%08lx\n", ImageContext->PdbPointer, Entry));

   }

 

 

-  return;
- }  
-
-/**
+  return;

+ }  

+

+/**

   Performs additional actions just before a PE/COFF image is unloaded.  Any resources

   that were allocated by PeCoffLoaderRelocateImageExtraAction() must be freed.

   

@@ -125,13 +124,13 @@ PeCoffLoaderRelocateImageExtraAction (
   

   @param  ImageContext  Pointer to the image context structure that describes the

                         PE/COFF image that is being unloaded.

-
-**/
-VOID
-EFIAPI
-PeCoffLoaderUnloadImageExtraAction (
-  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
-  )
-{
+

+**/

+VOID

+EFIAPI

+PeCoffLoaderUnloadImageExtraAction (

+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext

+  )

+{

   ASSERT (ImageContext != NULL);

-}
+}