Remove extra #includes where possible to make build more efficient

If module really is a Framework module and not a PI module, then use FrameworkDxe.h instead of PeDxe.h and FrameworkPei.h instead of PiPei.h



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

7 files changed, 315 insertions, 319 deletions

diff --git a/UnixPkg/CpuRuntimeDxe/Cpu.c b/UnixPkg/CpuRuntimeDxe/Cpu.c
index 689a50a704..dc25d4d812 100644
--- a/UnixPkg/CpuRuntimeDxe/Cpu.c
+++ b/UnixPkg/CpuRuntimeDxe/Cpu.c
@@ -21,7 +21,7 @@ Abstract:
   in this driver.

 

 --*/

-#include "PiDxe.h"

+#include <FrameworkDxe.h>

 #include <Protocol/Cpu.h>

 #include <Protocol/DataHub.h>

 #include <Guid/DataHubRecords.h>

@@ -36,7 +36,6 @@ Abstract:
 #include <Library/BaseMemoryLib.h>

 #include <Library/MemoryAllocationLib.h>

 #include <Library/UefiBootServicesTableLib.h>

-#include <Framework/DataHubRecords.h>

 #include "CpuDriver.h"

 #include "UnixDxe.h"

 #include <Protocol/UnixIo.h>

diff --git a/UnixPkg/CpuRuntimeDxe/CpuIo.c b/UnixPkg/CpuRuntimeDxe/CpuIo.c
index 5c3ebb2f38..5980a03d44 100644
--- a/UnixPkg/CpuRuntimeDxe/CpuIo.c
+++ b/UnixPkg/CpuRuntimeDxe/CpuIo.c
@@ -22,7 +22,7 @@ Abstract:
   Bridge I/O Protocol.

 

 --*/

-#include "PiDxe.h"

+#include <FrameworkDxe.h>

 #include <Protocol/Cpu.h>

 #include <Protocol/DataHub.h>

 #include <Guid/DataHubRecords.h>

diff --git a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index 17b40fdb32..d9c27b15a6 100644
--- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -13,7 +13,7 @@
   Module Name:  UnixOemHookStatusCodeLib.c

 

 **/

-#include "PiDxe.h"

+#include <FrameworkDxe.h>

 #include <Guid/StatusCodeDataTypeId.h>

 #include <Guid/StatusCodeDataTypeDebug.h>

 #include "UnixDxe.h"

diff --git a/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.c b/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.c
index 7a4e670e37..c04a27e722 100644
--- a/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.c
+++ b/UnixPkg/Library/DxeUnixPeCoffExtraActionLib/DxeUnixPeCoffExtraActionLib.c
@@ -1,59 +1,59 @@
-/**@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 DXE phase  
-
-
-**/
-
-#include <PiDxe.h>

+/**@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 DXE phase  

+

+

+**/

+

+#include <FrameworkDxe.h>

 #include <Guid/StatusCodeDataTypeId.h>

-#include <UnixDxe.h>
-#include <Library/PeCoffLib.h>
-#include <Library/PeiServicesLib.h>
-
-#include <Library/BaseLib.h>
-#include <Library/DebugLib.h>
-#include <Library/HobLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/PeCoffExtraActionLib.h>
-
+#include <UnixDxe.h>

+#include <Library/PeCoffLib.h>

+#include <Library/PeiServicesLib.h>

+

+#include <Library/BaseLib.h>

+#include <Library/DebugLib.h>

+#include <Library/HobLib.h>

+#include <Library/BaseMemoryLib.h>

+#include <Library/PeCoffExtraActionLib.h>

+

 //

 // Cache of UnixThunk protocol 

 //

-EFI_UNIX_THUNK_PROTOCOL   *mUnix;
-
-
-/**
-  The constructor function gets  the pointer of the WinNT thunk functions
-  It will ASSERT() if Unix thunk protocol is not installed.
-
-  @retval EFI_SUCCESS   Unix thunk protocol is found and cached.
-
-**/
-EFI_STATUS
-EFIAPI
-DxeUnixPeCoffLibExtraActionConstructor (
-  IN EFI_HANDLE        ImageHandle,
-  IN EFI_SYSTEM_TABLE  *SystemTable
-  )
-{
+EFI_UNIX_THUNK_PROTOCOL   *mUnix;

+

+

+/**

+  The constructor function gets  the pointer of the WinNT thunk functions

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

+

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

+

+**/

+EFI_STATUS

+EFIAPI

+DxeUnixPeCoffLibExtraActionConstructor (

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

+  )

+{

 	 EFI_HOB_GUID_TYPE        *GuidHob;

 

   //

@@ -64,32 +64,32 @@ DxeUnixPeCoffLibExtraActionConstructor (
   mUnix = (EFI_UNIX_THUNK_PROTOCOL *)(*(UINTN *)(GET_GUID_HOB_DATA (GuidHob)));

   ASSERT (mUnix != NULL);

 

-  return EFI_SUCCESS;
-}
-
-/**
+  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;
-  
+  Entry  = NULL;

+  

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

           ImageContext->PdbPointer,

           (UINTN)ImageContext->ImageAddress,

@@ -99,20 +99,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.

   

@@ -120,13 +120,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);

-}
+}

diff --git a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index 4d4056af70..ad68d51c72 100644
--- a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -1,231 +1,231 @@
-/** @file
-  OEM hook status code library functions with no library constructor/destructor
-
-  Copyright (c) 2006 - 2008, 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:  UnixOemHookStatusCodeLib.c
-
-**/
-#include "PiPei.h"
-#include <Guid/StatusCodeDataTypeId.h>
+/** @file

+  OEM hook status code library functions with no library constructor/destructor

+

+  Copyright (c) 2006 - 2008, 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:  UnixOemHookStatusCodeLib.c

+

+**/

+#include <FrameworkPei.h>

+#include <Guid/StatusCodeDataTypeId.h>

 #include <Guid/StatusCodeDataTypeDebug.h>

-#include <Ppi/UnixThunk.h>
-#include <Library/OemHookStatusCodeLib.h>
-#include <Library/DebugLib.h>
-#include <Library/PrintLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/ReportStatusCodeLib.h>
-#include <Library/PeiServicesLib.h>
-
-//
-// Cache of UnixThunk protocol 
-//
-EFI_UNIX_THUNK_PROTOCOL   *mUnix;
-
-//
-// Cache of standard output handle . 
-//
-int                      mStdOut;
-
-/**
-
-  Initialize OEM status code device .
-
-  @return    Always return EFI_SUCCESS.
-
-**/
-EFI_STATUS
-EFIAPI
-OemHookStatusCodeInitialize (
-  VOID
-  )
-{
-  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 ();
-  
-  //
-  // Cache standard output handle.
-  //
-  mStdOut = 1;
-
-  return EFI_SUCCESS;
-}
-
-/**
-  Report status code to OEM device.
- 
-  @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.
- 
-  @param  Value         Describes the current status of a hardware or software entity.  
-                        This included information about the class and subclass that is used to classify the entity 
-                        as well as an operation.  For progress codes, the operation is the current activity. 
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time. 
-                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  
-                        Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.
- 
-  @param  Instance      The enumeration of a hardware or software entity within the system.  
-                        A system may contain multiple entities that match a class/subclass pairing. 
-                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable, 
-                        not meaningful, or not relevant.  Valid instance numbers start with 1.
-
-
-  @param  CallerId      This optional parameter may be used to identify the caller. 
-                        This parameter allows the status code driver to apply different rules to different callers. 
-                        Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.
-
-
-  @param  Data          This optional parameter may be used to pass additional data
- 
-  @return               The function always return EFI_SUCCESS.
-
-**/
-EFI_STATUS
-EFIAPI
-OemHookStatusCodeReport (
-  IN EFI_STATUS_CODE_TYPE     CodeType,
-  IN EFI_STATUS_CODE_VALUE    Value,
-  IN UINT32                   Instance,
-  IN EFI_GUID                 *CallerId, OPTIONAL
-  IN EFI_STATUS_CODE_DATA     *Data      OPTIONAL
-  )
-{
-  CHAR8           *Filename;
-  CHAR8           *Description;
-  CHAR8           *Format;
-  CHAR8           Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE];
-  UINT32          ErrorLevel;
-  UINT32          LineNumber;
-  UINTN           CharCount;
-  BASE_LIST       Marker;
-
-  Buffer[0] = '\0';
-
-  if (Data != NULL &&
-      ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber)) {
-    //
-    // Print ASSERT() information into output buffer.
-    //
-    CharCount = AsciiSPrint (
-                  Buffer,
-                  sizeof (Buffer),
-                  "\n\rASSERT!: %a (%d): %a\n\r",
-                  Filename,
-                  LineNumber,
-                  Description
-                  );
-
-    //
-    // Callout to standard output.
-    //
-    mUnix->Write (
-              mStdOut,
-              Buffer,
-              CharCount
-	      );
-
-    return EFI_SUCCESS;
-
-  } else if (Data != NULL &&
-             ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format)) {
-    //
-    // Print DEBUG() information into output buffer.
-    //
-    CharCount = AsciiBSPrint (
-                  Buffer, 
-                  sizeof (Buffer), 
-                  Format, 
-                  Marker
-                  );
-  } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {
-    //
-    // Print ERROR information into output buffer.
-    //
-    CharCount = AsciiSPrint (
-                  Buffer, 
-                  sizeof (Buffer), 
-                  "ERROR: C%x:V%x I%x", 
-                  CodeType, 
-                  Value, 
-                  Instance
-                  );
-
-    //
-    // Make sure we don't try to print values that weren't intended to be printed, especially NULL GUID pointers.
-    //
-    
-    if (CallerId != NULL) {
-      CharCount += AsciiSPrint (
-                     &Buffer[CharCount - 1],
-                     (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),
-                     " %g",
-                     CallerId
-                     );
-    }
-
-    if (Data != NULL) {
-      CharCount += AsciiSPrint (
-                     &Buffer[CharCount - 1],
-                     (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),
-                     " %x",
-                     Data
-                     );
-    }
-
-    CharCount += AsciiSPrint (
-                   &Buffer[CharCount - 1],
-                   (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),
-                   "\n\r"
-                   );
-  } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) {
-    CharCount = AsciiSPrint (
-                  Buffer, 
-                  sizeof (Buffer), 
-                  "PROGRESS CODE: V%x I%x\n\r", 
-                  Value, 
-                  Instance
-                  );
-  } else {
-    CharCount = AsciiSPrint (
-                  Buffer, 
-                  sizeof (Buffer), 
-                  "Undefined: C%x:V%x I%x\n\r", 
-                  CodeType, 
-                  Value, 
-                  Instance
-                  );
-  }
-
-  //
-  // Callout to standard output.
-  //
-  mUnix->Write (
-            mStdOut,
-            Buffer,
-            CharCount
-            );
-
-  return EFI_SUCCESS;
-}
-
+#include <Ppi/UnixThunk.h>

+#include <Library/OemHookStatusCodeLib.h>

+#include <Library/DebugLib.h>

+#include <Library/PrintLib.h>

+#include <Library/BaseMemoryLib.h>

+#include <Library/ReportStatusCodeLib.h>

+#include <Library/PeiServicesLib.h>

+

+//

+// Cache of UnixThunk protocol 

+//

+EFI_UNIX_THUNK_PROTOCOL   *mUnix;

+

+//

+// Cache of standard output handle . 

+//

+int                      mStdOut;

+

+/**

+

+  Initialize OEM status code device .

+

+  @return    Always return EFI_SUCCESS.

+

+**/

+EFI_STATUS

+EFIAPI

+OemHookStatusCodeInitialize (

+  VOID

+  )

+{

+  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 ();

+  

+  //

+  // Cache standard output handle.

+  //

+  mStdOut = 1;

+

+  return EFI_SUCCESS;

+}

+

+/**

+  Report status code to OEM device.

+ 

+  @param  CodeType      Indicates the type of status code being reported.  Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.

+ 

+  @param  Value         Describes the current status of a hardware or software entity.  

+                        This included information about the class and subclass that is used to classify the entity 

+                        as well as an operation.  For progress codes, the operation is the current activity. 

+                        For error codes, it is the exception.  For debug codes, it is not defined at this time. 

+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  

+                        Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.

+ 

+  @param  Instance      The enumeration of a hardware or software entity within the system.  

+                        A system may contain multiple entities that match a class/subclass pairing. 

+                        The instance differentiates between them.  An instance of 0 indicates that instance information is unavailable, 

+                        not meaningful, or not relevant.  Valid instance numbers start with 1.

+

+

+  @param  CallerId      This optional parameter may be used to identify the caller. 

+                        This parameter allows the status code driver to apply different rules to different callers. 

+                        Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.

+

+

+  @param  Data          This optional parameter may be used to pass additional data

+ 

+  @return               The function always return EFI_SUCCESS.

+

+**/

+EFI_STATUS

+EFIAPI

+OemHookStatusCodeReport (

+  IN EFI_STATUS_CODE_TYPE     CodeType,

+  IN EFI_STATUS_CODE_VALUE    Value,

+  IN UINT32                   Instance,

+  IN EFI_GUID                 *CallerId, OPTIONAL

+  IN EFI_STATUS_CODE_DATA     *Data      OPTIONAL

+  )

+{

+  CHAR8           *Filename;

+  CHAR8           *Description;

+  CHAR8           *Format;

+  CHAR8           Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE];

+  UINT32          ErrorLevel;

+  UINT32          LineNumber;

+  UINTN           CharCount;

+  BASE_LIST       Marker;

+

+  Buffer[0] = '\0';

+

+  if (Data != NULL &&

+      ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber)) {

+    //

+    // Print ASSERT() information into output buffer.

+    //

+    CharCount = AsciiSPrint (

+                  Buffer,

+                  sizeof (Buffer),

+                  "\n\rASSERT!: %a (%d): %a\n\r",

+                  Filename,

+                  LineNumber,

+                  Description

+                  );

+

+    //

+    // Callout to standard output.

+    //

+    mUnix->Write (

+              mStdOut,

+              Buffer,

+              CharCount

+	      );

+

+    return EFI_SUCCESS;

+

+  } else if (Data != NULL &&

+             ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format)) {

+    //

+    // Print DEBUG() information into output buffer.

+    //

+    CharCount = AsciiBSPrint (

+                  Buffer, 

+                  sizeof (Buffer), 

+                  Format, 

+                  Marker

+                  );

+  } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {

+    //

+    // Print ERROR information into output buffer.

+    //

+    CharCount = AsciiSPrint (

+                  Buffer, 

+                  sizeof (Buffer), 

+                  "ERROR: C%x:V%x I%x", 

+                  CodeType, 

+                  Value, 

+                  Instance

+                  );

+

+    //

+    // Make sure we don't try to print values that weren't intended to be printed, especially NULL GUID pointers.

+    //

+    

+    if (CallerId != NULL) {

+      CharCount += AsciiSPrint (

+                     &Buffer[CharCount - 1],

+                     (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),

+                     " %g",

+                     CallerId

+                     );

+    }

+

+    if (Data != NULL) {

+      CharCount += AsciiSPrint (

+                     &Buffer[CharCount - 1],

+                     (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),

+                     " %x",

+                     Data

+                     );

+    }

+

+    CharCount += AsciiSPrint (

+                   &Buffer[CharCount - 1],

+                   (sizeof (Buffer) - (sizeof (Buffer[0]) * CharCount)),

+                   "\n\r"

+                   );

+  } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) {

+    CharCount = AsciiSPrint (

+                  Buffer, 

+                  sizeof (Buffer), 

+                  "PROGRESS CODE: V%x I%x\n\r", 

+                  Value, 

+                  Instance

+                  );

+  } else {

+    CharCount = AsciiSPrint (

+                  Buffer, 

+                  sizeof (Buffer), 

+                  "Undefined: C%x:V%x I%x\n\r", 

+                  CodeType, 

+                  Value, 

+                  Instance

+                  );

+  }

+

+  //

+  // Callout to standard output.

+  //

+  mUnix->Write (

+            mStdOut,

+            Buffer,

+            CharCount

+            );

+

+  return EFI_SUCCESS;

+}

+

diff --git a/UnixPkg/Sec/SecMain.c b/UnixPkg/Sec/SecMain.c
index ae5b1fb306..4e09ddc3e1 100644
--- a/UnixPkg/Sec/SecMain.c
+++ b/UnixPkg/Sec/SecMain.c
@@ -35,7 +35,6 @@ Abstract:
 #include "SecMain.h"
 #include <sys/mman.h>
 #include <Ppi/UnixPeiLoadFile.h>
-#include <Framework/StatusCode.h>
 #include <Ppi/TemporaryRamSupport.h>
 #include <dlfcn.h>
 //
diff --git a/UnixPkg/Sec/SecMain.h b/UnixPkg/Sec/SecMain.h
index d80d6b44b4..236a50ee43 100644
--- a/UnixPkg/Sec/SecMain.h
+++ b/UnixPkg/Sec/SecMain.h
@@ -17,11 +17,9 @@ Abstract:
   Include file for host API based SEC

 

 --*/

-#include "PiPei.h"

-#include "Uefi/UefiSpec.h"

+#include <FrameworkPei.h>

 

 #include <Protocol/UnixThunk.h>

-#include <Pi/PiFirmwareVolume.h>

 #include <Ppi/StatusCode.h>

 

 #include <Library/PeCoffLib.h>