sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove CommonHeader.h in StatusCodeDxe.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3230 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
yshang1
2007-07-13 06:15:56 +00:00
parent 6ef9509940
commit 6f2b45bb67
12 changed files with 109 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
View File

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

14
EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
View File

@@ -22,6 +22,8 @@ Abstract:
#ifndef __DXE_STATUS_CODE_H__
#define __DXE_STATUS_CODE_H__
#include <Common/StatusCode.h>
//
// Data hub worker definition
//
@@ -41,14 +43,10 @@ typedef enum {
} PROCESSOR_MODE;
typedef struct {
UINTN Signature;
LIST_ENTRY Node;
EFI_STATUS_CODE_TYPE CodeType;
EFI_STATUS_CODE_VALUE Value;
UINT32 Instance;
EFI_GUID CallerId;
EFI_STATUS_CODE_DATA Data;
UINT8 ExtendData[EFI_STATUS_CODE_DATA_MAX_SIZE];
UINTN Signature;
LIST_ENTRY Node;
UINT8 Data[sizeof (DATA_HUB_STATUS_CODE_DATA_RECORD) + EFI_STATUS_CODE_DATA_MAX_SIZE];
} DATAHUB_STATUSCODE_RECORD;

2
EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
View File

@@ -108,7 +108,7 @@
<GuidCName>gMemoryStatusCodeRecordGuid</GuidCName>
</GuidCNames>
<GuidCNames Usage="SOMETIMES_CONSUMED">
<GuidCName>gEfiStatusCodeDataTypeStringGuid</GuidCName>
<GuidCName>gEfiStatusCodeDataTypeDebugGuid</GuidCName>
</GuidCNames>
<GuidCNames Usage="SOMETIMES_CONSUMED">
<GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>