roll back last check-in.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10613 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff 2010-06-29 09:29:39 +00:00
parent 7df41b1150
commit 445b3570b8
3 changed files with 13 additions and 19 deletions

View File

@ -104,10 +104,11 @@ MemoryStatusCodeReportWorker (
PacketIndex = 0; PacketIndex = 0;
// //
// Journal GUID'ed HOBs to find empty record entry. // Journal GUID'ed HOBs to find empty record entry. if found, then save status code in it.
// otherwise, create a new GUID'ed HOB.
// //
Hob.Raw = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid); Hob.Raw = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);
while ((Hob.Raw = GetNextGuidHob (&gMemoryStatusCodeRecordGuid, Hob.Raw)) != NULL) { while (Hob.Raw != NULL) {
PacketHeader = (MEMORY_STATUSCODE_PACKET_HEADER *) GET_GUID_HOB_DATA (Hob.Guid); PacketHeader = (MEMORY_STATUSCODE_PACKET_HEADER *) GET_GUID_HOB_DATA (Hob.Guid);
// //
@ -123,14 +124,17 @@ MemoryStatusCodeReportWorker (
// //
PacketIndex++; PacketIndex++;
Hob.Raw = GET_NEXT_HOB (Hob); Hob.Raw = GetNextGuidHob (&gMemoryStatusCodeRecordGuid, Hob.Raw);
} }
if (Record == NULL) { if (Record == NULL) {
// //
// No available entry found // No available entry found, so create new packet.
// //
return EFI_OUT_OF_RESOURCES; PacketHeader = CreateMemoryStatusCodePacket (PacketIndex);
Record = (MEMORY_STATUSCODE_RECORD *) (PacketHeader + 1);
Record = &Record[PacketHeader->RecordIndex++];
} }
Record->CodeType = CodeType; Record->CodeType = CodeType;

View File

@ -24,7 +24,7 @@ EFI_EVENT mLogDataHubEvent;
// //
// Cache data hub protocol. // Cache data hub protocol.
// //
EFI_DATA_HUB_PROTOCOL *mDataHubProtocol = NULL; EFI_DATA_HUB_PROTOCOL *mDataHubProtocol;
/** /**
@ -189,7 +189,6 @@ DataHubStatusCodeReportWorker (
BASE_LIST Marker; BASE_LIST Marker;
CHAR8 *Format; CHAR8 *Format;
UINTN CharCount; UINTN CharCount;
EFI_STATUS Status;
// //
// Use atom operation to avoid the reentant of report. // Use atom operation to avoid the reentant of report.
@ -206,13 +205,6 @@ DataHubStatusCodeReportWorker (
return EFI_DEVICE_ERROR; return EFI_DEVICE_ERROR;
} }
if (mDataHubProtocol == NULL) {
Status = DataHubStatusCodeInitializeWorker ();
if (EFI_ERROR (Status)) {
return Status;
}
}
Record = AcquireRecordBuffer (); Record = AcquireRecordBuffer ();
if (Record == NULL) { if (Record == NULL) {
// //
@ -366,10 +358,7 @@ DataHubStatusCodeInitializeWorker (
NULL, NULL,
(VOID **) &mDataHubProtocol (VOID **) &mDataHubProtocol
); );
if (EFI_ERROR (Status)) { ASSERT_EFI_ERROR (Status);
mDataHubProtocol = NULL;
return Status;
}
// //
// Create a Notify Event to log data in Data Hub // Create a Notify Event to log data in Data Hub

View File

@ -226,7 +226,8 @@ InitializationDispatcherWorker (
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
} }
if (FeaturePcdGet (PcdStatusCodeUseDataHub)) { if (FeaturePcdGet (PcdStatusCodeUseDataHub)) {
DataHubStatusCodeInitializeWorker (); Status = DataHubStatusCodeInitializeWorker ();
ASSERT_EFI_ERROR (Status);
} }
if (FeaturePcdGet (PcdStatusCodeUseOEM)) { if (FeaturePcdGet (PcdStatusCodeUseOEM)) {
// //