Remove unnecessary use of gEfiStatusCodeSpecificDataGuid and sync algorithm with...

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

diff --git a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
index b9aee9e13511bb9b03979a10205a17afaae3d2c5..5fed85f1fbc991bb7b2359c0fc786741d26bc3ad 100644 (file)
--- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
+++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.inf
@@ -51,11 +51,6 @@
   HobLib\r
   DebugLib\r
 \r
-\r
-[Guids]\r
-  gEfiStatusCodeSpecificDataGuid                # ALWAYS_CONSUMED\r
-\r
-\r
 [Protocols]\r
   gEfiUnixThunkProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED\r
 \r

diff --git a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index 9653f01ffa0444e4e8f1791e1dc00afff4e176f4..f292dcc4fe5685621a98adf65bb2c5305d9fc2f3 100644 (file)
--- a/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/DxeUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -112,7 +112,6 @@ OemHookStatusCodeReport (
   UINT32          LineNumber;\r
   UINTN           CharCount;\r
   BASE_LIST       Marker;\r
-  EFI_DEBUG_INFO  *DebugInfo;\r
 \r
   Buffer[0] = '\0';\r
 \r
@@ -152,17 +151,6 @@ OemHookStatusCodeReport (
                   Format, \r
                   Marker\r
                   );\r
-  } else if (Data != NULL && \r
-             CompareGuid (&Data->Type, &gEfiStatusCodeSpecificDataGuid) &&\r
-             (CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_DEBUG_CODE) {\r
-    //\r
-    // Print specific data into output buffer.\r
-    //\r
-    DebugInfo = (EFI_DEBUG_INFO *) (Data + 1);\r
-    Marker    = (BASE_LIST) (DebugInfo + 1);\r
-    Format    = (CHAR8 *) (((UINT64 *) Marker) + 12);\r
-\r
-    CharCount = AsciiBSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, Format, Marker);\r
   } else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_ERROR_CODE) {\r
     //\r
     // Print ERROR information into output buffer.\r

diff --git a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
index 0d4c7f63901689253512ce458f1d6ce342f70d75..46809eb77b095a7acdb94e8cebd3364d19a16ecb 100644 (file)
--- a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
+++ b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.inf
@@ -51,11 +51,6 @@
   PrintLib\r
   DebugLib\r
 \r
-\r
-[Guids]\r
-  gEfiStatusCodeSpecificDataGuid                # ALWAYS_CONSUMED\r
-\r
-\r
 [Ppis]\r
   gPeiUnixThunkPpiGuid                          # PPI ALWAYS_CONSUMED\r
 \r

diff --git a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
index ea028b5f2fb109ac7bf13307b23074421b157aba..1ec0b470f6bcc66b378931783a805a0c31838483 100644 (file)
--- a/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
+++ b/UnixPkg/Library/PeiUnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.c
@@ -120,7 +120,6 @@ OemHookStatusCodeReport (
   UINT32          LineNumber;
   UINTN           CharCount;
   BASE_LIST       Marker;
-  EFI_DEBUG_INFO  *DebugInfo;
 
   Buffer[0] = '\0';
 
@@ -160,17 +159,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    = (BASE_LIST) (DebugInfo + 1);
-    Format    = (CHAR8 *) (((UINT64 *) Marker) + 12);
-
-    CharCount = AsciiBSPrint (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.