4 files changed, 0 insertions, 35 deletions
diff --git a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf
index 30e10a53e8..576f7b59a8 100644
--- a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf
+++ b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.inf
@@ -51,9 +51,5 @@
   HobLib
   DebugLib
 
-
-[Guids]
-  gEfiStatusCodeSpecificDataGuid                # ALWAYS_CONSUMED
-
 [Protocols]
   gEfiWinNtThunkProtocolGuid                    # ALWAYS_CONSUMED
diff --git a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
index 7d5f4ec565..24f154ca15 100644
--- a/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
+++ b/Nt32Pkg/Library/DxeNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
@@ -20,7 +20,6 @@
 #include <FrameworkDxe.h>
 #include <FrameworkModuleDxe.h>
 #include <WinNtDxe.h>
-#include <DebugInfo.h>
 
 //
 // The protocols, PPI and GUID defintions for this module
@@ -124,7 +123,6 @@ OemHookStatusCodeReport (
   UINT32          LineNumber;
   UINTN           CharCount;
   VA_LIST         Marker;
-  EFI_DEBUG_INFO  *DebugInfo;
 
   Buffer[0] = '\0';
 
@@ -166,17 +164,6 @@ OemHookStatusCodeReport (
                   Format,
                   Marker
                   );
-  } else if (Data != NULL &&
-             CompareGuid (&Data->Type, &gEfiStatusCodeSpecificDataGuid) &&
-             (CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_DEBUG_CODE) {
-    //
-    // Print specific data into output buffer.
-    //
-    DebugInfo = (EFI_DEBUG_INFO *) (Data + 1);
-    Marker    = (VA_LIST) (DebugInfo + 1);
-    Format    = (CHAR8 *) (((UINT64 *) Marker) + 12);
-
-    CharCount = AsciiVSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, Format, Marker);
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {
     //
     // Print ERROR information into output buffer.
diff --git a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
index 689e05278a..a7d68410ba 100644
--- a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
+++ b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.c
@@ -35,7 +35,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/ReportStatusCodeLib.h>
 #include <Library/PeiServicesLib.h>
-#include <DebugInfo.h>
 
 //
 // Cache of WinNtThunk protocol
@@ -133,7 +132,6 @@ OemHookStatusCodeReport (
   UINT32          LineNumber;
   UINTN           CharCount;
   VA_LIST         Marker;
-  EFI_DEBUG_INFO  *DebugInfo;
 
   Buffer[0] = '\0';
 
@@ -175,17 +173,6 @@ OemHookStatusCodeReport (
                   Format,
                   Marker
                   );
-  } else if (Data != NULL &&
-             CompareGuid (&Data->Type, &gEfiStatusCodeSpecificDataGuid) &&
-             (CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_DEBUG_CODE) {
-    //
-    // Print specific data into output buffer.
-    //
-    DebugInfo = (EFI_DEBUG_INFO *) (Data + 1);
-    Marker    = (VA_LIST) (DebugInfo + 1);
-    Format    = (CHAR8 *) (((UINT64 *) Marker) + 12);
-
-    CharCount = AsciiVSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, Format, Marker);
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {
     //
     // Print ERROR information into output buffer.
diff --git a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf
index 54b3d0a809..090e536a50 100644
--- a/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf
+++ b/Nt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.inf
@@ -49,11 +49,6 @@
   PrintLib
   DebugLib
 
-
-[Guids]
-  gEfiStatusCodeSpecificDataGuid                # SOMETIMES_CONSUMED
-
-
 [Ppis]
   gPeiNtThunkPpiGuid                            # PPI ALWAYS_CONSUMED