Remove CommonHeader.h in StatusCodeDxe.

[mirror_edk2.git] / EdkModulePkg / Universal / StatusCode / Dxe / DataHubStatusCodeWorker.c

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c b/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
index 72d699df44ba4f01701cc462c7637e0d1864c475..737bc8a3a1182dae805e92da46cba68f411fce2c 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
@@ -13,6 +13,8 @@
   Module Name:  DataHubStatusCodeWorker.c\r
 \r
 **/\r
+\r
+#include <Common/StatusCode.h>\r
 #include "DxeStatusCode.h"\r
 \r
 //\r
@@ -41,7 +43,7 @@ EFI_DATA_HUB_PROTOCOL     *mDataHubProtocol;
 \r
 **/\r
 STATIC\r
-DATAHUB_STATUSCODE_RECORD *\r
+DATA_HUB_STATUS_CODE_DATA_RECORD *\r
 AcquireRecordBuffer (\r
   VOID\r
   )\r
@@ -81,7 +83,7 @@ AcquireRecordBuffer (
 \r
   gBS->RestoreTPL (CurrentTpl);\r
 \r
-  return Record;\r
+  return (DATA_HUB_STATUS_CODE_DATA_RECORD *) (Record->Data);\r
 }\r
 \r
 \r
@@ -94,14 +96,15 @@ AcquireRecordBuffer (
 \r
 **/\r
 STATIC\r
-DATAHUB_STATUSCODE_RECORD *\r
+DATA_HUB_STATUS_CODE_DATA_RECORD *\r
 RetrieveRecord (\r
   VOID\r
   )\r
 {\r
-  DATAHUB_STATUSCODE_RECORD   *Record = NULL;\r
-  LIST_ENTRY                  *Node;\r
-  EFI_TPL                     CurrentTpl;\r
+  DATA_HUB_STATUS_CODE_DATA_RECORD  *RecordData = NULL;\r
+  DATAHUB_STATUSCODE_RECORD         *Record;\r
+  LIST_ENTRY                        *Node;\r
+  EFI_TPL                           CurrentTpl;\r
 \r
   CurrentTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);\r
 \r
@@ -112,11 +115,12 @@ RetrieveRecord (
     RemoveEntryList (&Record->Node);\r
     InsertTailList (&mRecordsBuffer, &Record->Node);\r
     Record->Signature = 0;\r
+    RecordData = (DATA_HUB_STATUS_CODE_DATA_RECORD *) Record->Data;\r
   }\r
 \r
   gBS->RestoreTPL (CurrentTpl);\r
 \r
-  return Record;\r
+  return RecordData;\r
 }\r
 \r
 \r
@@ -159,11 +163,11 @@ DataHubStatusCodeReportWorker (
   IN EFI_STATUS_CODE_DATA     *Data OPTIONAL\r
   )\r
 {\r
-  DATAHUB_STATUSCODE_RECORD  *Record;\r
-  UINT32                     ErrorLevel;\r
-  VA_LIST                    Marker;\r
-  CHAR8                      *Format;\r
-  UINTN                      CharCount;\r
+  DATA_HUB_STATUS_CODE_DATA_RECORD  *Record;\r
+  UINT32                            ErrorLevel;\r
+  VA_LIST                           Marker;\r
+  CHAR8                             *Format;\r
+  UINTN                             CharCount;\r
 \r
   //\r
   // See whether in runtime phase or not.\r
@@ -193,7 +197,7 @@ DataHubStatusCodeReportWorker (
   if (Data != NULL) {\r
     if (ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format)) {\r
       CharCount = UnicodeVSPrintAsciiFormat (\r
-                    (CHAR16 *) Record->ExtendData,\r
+                    (CHAR16 *) (Record + 1),\r
                     EFI_STATUS_CODE_DATA_MAX_SIZE,\r
                     Format,\r
                     Marker\r
@@ -201,7 +205,7 @@ DataHubStatusCodeReportWorker (
       //\r
       // Change record data type from DebugType to String Type.\r
       //\r
-      CopyGuid (&Record->Data.Type, &gEfiStatusCodeDataTypeStringGuid);\r
+      CopyGuid (&Record->Data.Type, &gEfiStatusCodeDataTypeDebugGuid);\r
       Record->Data.HeaderSize = Data->HeaderSize;\r
       Record->Data.Size = (UINT16) ((CharCount + 1) * sizeof (CHAR16));\r
     } else {\r
@@ -213,7 +217,7 @@ DataHubStatusCodeReportWorker (
       if (Data->Size > EFI_STATUS_CODE_DATA_MAX_SIZE) {\r
         Record->Data.Size = EFI_STATUS_CODE_DATA_MAX_SIZE;\r
       }\r
-      CopyMem (Record->ExtendData, Data + 1, Record->Data.Size);\r
+      CopyMem ((VOID *) (Record + 1), Data + 1, Record->Data.Size);\r
     }\r
   }\r
 \r
@@ -239,7 +243,7 @@ LogDataHubEventCallBack (
   IN  VOID          *Context\r
   )\r
 {\r
-  DATAHUB_STATUSCODE_RECORD         *Record;\r
+  DATA_HUB_STATUS_CODE_DATA_RECORD  *Record;\r
   UINT32                            Size;\r
   UINT64                            DataRecordClass;\r
 \r
@@ -255,7 +259,7 @@ LogDataHubEventCallBack (
     //\r
     // Add in the size of the header we added.\r
     //\r
-    Size = sizeof (DATAHUB_STATUSCODE_RECORD) + (UINT32) Record->Data.Size;\r
+    Size = sizeof (DATA_HUB_STATUS_CODE_DATA_RECORD) + (UINT32) Record->Data.Size;\r
 \r
     if ((Record->CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) {\r
       DataRecordClass = EFI_DATA_RECORD_CLASS_PROGRESS_CODE;\r