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

diff --git a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index 7b8c478149f87928a4acd1104a9cb54f07ce7a4b..17b40fdb320da00ace65654d56aaf6fd23a442ba 100644 (file)
--- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -15,6 +15,7 @@
 **/\r
 #include "PiDxe.h"\r
 #include <Guid/StatusCodeDataTypeId.h>\r
+#include <Guid/StatusCodeDataTypeDebug.h>\r
 #include "UnixDxe.h"\r
 #include <Library/OemHookStatusCodeLib.h>\r
 #include <Library/DebugLib.h>\r
@@ -22,7 +23,6 @@
 #include <Library/PrintLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/ReportStatusCodeLib.h>\r
-#include <FrameworkModuleBase.h>\r
 \r
 //\r
 // Cache of UnixThunk protocol \r

diff --git a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index ae5883c2646848232467c371e48dad0851fbeb22..4d4056af701b6978d254fa198c006cc7ec1acd8f 100644 (file)
--- 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>\r
 #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 579553c4e3ead4a6efd49f4b34258d44c87c7ce7..3b2af0301bf8b776ef10adbe67d9daf19feca7c3 100644 (file)
--- 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\r
+\r
+Copyright (c) 2006 - 2009, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+Module Name:\r
+\r
+  PeiUnixPeCoffExtraActionLib.c\r
+\r
+Abstract:\r
+\r
+  Provides services to perform additional actions to relocate and unload\r
+  PE/Coff image for UNIX environment specific purpose such as souce level debug.\r
+  This version only works for PEI phase\r
+\r
+\r
+**/\r
+#include <PiPei.h>\r
+#include <Ppi/UnixThunk.h>\r
+\r
+#include <Library/PeCoffLib.h>\r
+#include <Library/PeiServicesLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/BaseLib.h>\r
+#include <Library/PeCoffExtraActionLib.h>\r
+\r
+//\r
+// Cache of UnixThunk protocol \r
+//\r
+EFI_UNIX_THUNK_PROTOCOL   *mUnix = NULL;\r
+\r
+/**\r
+  The function caches the pointer of the WinNT thunk functions\r
+  It will ASSERT() if Unix thunk ppi is not installed.\r
+\r
+  @retval EFI_SUCCESS   WinNT thunk protocol is found and cached.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+UnixPeCoffGetUnixThunkStucture (\r
+  )\r
+{\r
+       PEI_UNIX_THUNK_PPI  *UnixThunkPpi;\r
+  EFI_STATUS        Status;\r
+\r
+  \r
+  //\r
+  // Locate Unix ThunkPpi for retrieving standard output handle\r
+  //\r
+  Status = PeiServicesLocatePpi (\r
+              &gPeiUnixThunkPpiGuid,\r
+              0,\r
+              NULL,\r
+              (VOID **) &UnixThunkPpi\r
+              );\r
+\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+  mUnix  = (EFI_UNIX_THUNK_PROTOCOL *) UnixThunkPpi->UnixThunk ();\r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+/**\r
   Performs additional actions after a PE/COFF image has been loaded and relocated.\r
 \r
   If ImageContext is NULL, then ASSERT().\r
 \r
   @param  ImageContext  Pointer to the image context structure that describes the\r
                         PE/COFF image that has already been loaded and relocated.\r
-
-**/
-VOID
-EFIAPI
-PeCoffLoaderRelocateImageExtraAction (
-  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
-  )
-{
+\r
+**/\r
+VOID\r
+EFIAPI\r
+PeCoffLoaderRelocateImageExtraAction (\r
+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r
+  )\r
+{\r
   VOID * Handle;\r
   VOID * Entry;\r
 \r
   ASSERT (ImageContext != NULL);\r
 \r
   Handle = NULL;\r
-  Entry  = NULL;
-  
-  if (mUnix == NULL) {
-    UnixPeCoffGetUnixThunkStucture ();
-  }
+  Entry  = NULL;\r
+  \r
+  if (mUnix == NULL) {\r
+    UnixPeCoffGetUnixThunkStucture ();\r
+  }\r
   DEBUG ((EFI_D_ERROR, "Loading %a 0x%08lx - entry point 0x%08lx\n",\r
           ImageContext->PdbPointer,\r
           (UINTN)ImageContext->ImageAddress,\r
@@ -104,20 +103,20 @@ PeCoffLoaderRelocateImageExtraAction (
   \r
   if (Handle) {\r
     Entry = mUnix->Dlsym(Handle, "_ModuleEntryPoint");\r
-  } else {
+  } else {\r
        DEBUG ((EFI_D_ERROR, "%a\n", mUnix->Dlerror()));\r
   }\r
   \r
   if (Entry != NULL) {\r
-    ImageContext->EntryPoint = Entry;
+    ImageContext->EntryPoint = Entry;\r
     DEBUG ((EFI_D_ERROR, "Change %a Entrypoint to :0x%08lx\n", ImageContext->PdbPointer, Entry));\r
   }\r
 \r
 \r
-  return;
- }  
-
-/**
+  return;\r
+ }  \r
+\r
+/**\r
   Performs additional actions just before a PE/COFF image is unloaded.  Any resources\r
   that were allocated by PeCoffLoaderRelocateImageExtraAction() must be freed.\r
   \r
@@ -125,13 +124,13 @@ PeCoffLoaderRelocateImageExtraAction (
   \r
   @param  ImageContext  Pointer to the image context structure that describes the\r
                         PE/COFF image that is being unloaded.\r
-
-**/
-VOID
-EFIAPI
-PeCoffLoaderUnloadImageExtraAction (
-  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
-  )
-{
+\r
+**/\r
+VOID\r
+EFIAPI\r
+PeCoffLoaderUnloadImageExtraAction (\r
+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext\r
+  )\r
+{\r
   ASSERT (ImageContext != NULL);\r
-}
+}\r