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

MdeModulePkg: Apply uncrustify changes

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the MdeModulePkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Michael Kubacki
2021-12-05 14:54:02 -08:00
committed by mergify[bot]
parent 7c7184e201
commit 1436aea4d5
994 changed files with 107608 additions and 101311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
MdeModulePkg/Universal/StatusCodeHandler/Pei/MemoryStausCodeWorker.c
View File

@ -22,7 +22,7 @@ MemoryStatusCodeInitializeWorker (
//
// Create memory status code GUID'ed HOB.
//
MEMORY_STATUSCODE_PACKET_HEADER *PacketHeader;
MEMORY_STATUSCODE_PACKET_HEADER *PacketHeader;
//
// Build GUID'ed HOB with PCD defined size.
@ -40,7 +40,6 @@ MemoryStatusCodeInitializeWorker (
return EFI_SUCCESS;
}
/**
Report status code into GUID'ed HOB.
@ -70,18 +69,17 @@ MemoryStatusCodeInitializeWorker (
EFI_STATUS
EFIAPI
MemoryStatusCodeReportWorker (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN CONST EFI_GUID *CallerId,
IN CONST EFI_STATUS_CODE_DATA *Data OPTIONAL
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN CONST EFI_GUID *CallerId,
IN CONST EFI_STATUS_CODE_DATA *Data OPTIONAL
)
{
EFI_PEI_HOB_POINTERS Hob;
MEMORY_STATUSCODE_PACKET_HEADER *PacketHeader;
MEMORY_STATUSCODE_RECORD *Record;
EFI_PEI_HOB_POINTERS Hob;
MEMORY_STATUSCODE_PACKET_HEADER *PacketHeader;
MEMORY_STATUSCODE_RECORD *Record;
//
// Find GUID'ed HOBs to locate current record buffer.
@ -89,9 +87,9 @@ MemoryStatusCodeReportWorker (
Hob.Raw = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);
ASSERT (Hob.Raw != NULL);
PacketHeader = (MEMORY_STATUSCODE_PACKET_HEADER *) GET_GUID_HOB_DATA (Hob.Guid);
Record = (MEMORY_STATUSCODE_RECORD *) (PacketHeader + 1);
Record = &Record[PacketHeader->RecordIndex++];
PacketHeader = (MEMORY_STATUSCODE_PACKET_HEADER *)GET_GUID_HOB_DATA (Hob.Guid);
Record = (MEMORY_STATUSCODE_RECORD *)(PacketHeader + 1);
Record = &Record[PacketHeader->RecordIndex++];
//
// Save status code.
@ -113,9 +111,8 @@ MemoryStatusCodeReportWorker (
// Wrap around record index.
//
PacketHeader->RecordIndex = 0;
PacketHeader->PacketIndex ++;
PacketHeader->PacketIndex++;
}
return EFI_SUCCESS;
}

50
MdeModulePkg/Universal/StatusCodeHandler/Pei/SerialStatusCodeWorker.c
View File

@ -33,27 +33,28 @@
EFI_STATUS
EFIAPI
SerialStatusCodeReportWorker (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN CONST EFI_GUID *CallerId,
IN CONST EFI_STATUS_CODE_DATA *Data OPTIONAL
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN CONST EFI_GUID *CallerId,
IN CONST EFI_STATUS_CODE_DATA *Data OPTIONAL
)
{
CHAR8 *Filename;
CHAR8 *Description;
CHAR8 *Format;
CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
UINT32 ErrorLevel;
UINT32 LineNumber;
UINTN CharCount;
BASE_LIST Marker;
CHAR8 *Filename;
CHAR8 *Description;
CHAR8 *Format;
CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
UINT32 ErrorLevel;
UINT32 LineNumber;
UINTN CharCount;
BASE_LIST Marker;
Buffer[0] = '\0';
if (Data != NULL &&
ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber)) {
if ((Data != NULL) &&
ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber))
{
//
// Print ASSERT() information into output buffer.
//
@ -65,8 +66,9 @@ SerialStatusCodeReportWorker (
LineNumber,
Description
);
} else if (Data != NULL &&
ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format)) {
} else if ((Data != NULL) &&
ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format))
{
//
// Print DEBUG() information into output buffer.
//
@ -89,7 +91,7 @@ SerialStatusCodeReportWorker (
Instance
);
ASSERT(CharCount > 0);
ASSERT (CharCount > 0);
if (CallerId != NULL) {
CharCount += AsciiSPrint (
@ -125,9 +127,10 @@ SerialStatusCodeReportWorker (
Value,
Instance
);
} else if (Data != NULL &&
} else if ((Data != NULL) &&
CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) &&
((EFI_STATUS_CODE_STRING_DATA *) Data)->StringType == EfiStringAscii) {
(((EFI_STATUS_CODE_STRING_DATA *)Data)->StringType == EfiStringAscii))
{
//
// EFI_STATUS_CODE_STRING_DATA
//
@ -135,7 +138,7 @@ SerialStatusCodeReportWorker (
Buffer,
sizeof (Buffer),
"%a",
((EFI_STATUS_CODE_STRING_DATA *) Data)->String.Ascii
((EFI_STATUS_CODE_STRING_DATA *)Data)->String.Ascii
);
} else {
//
@ -154,8 +157,7 @@ SerialStatusCodeReportWorker (
//
// Call SerialPort Lib function to do print.
//
SerialPortWrite ((UINT8 *) Buffer, CharCount);
SerialPortWrite ((UINT8 *)Buffer, CharCount);
return EFI_SUCCESS;
}

10
MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.c
View File

@ -29,14 +29,14 @@ StatusCodeHandlerPeiEntry (
IN CONST EFI_PEI_SERVICES **PeiServices
)
{
EFI_STATUS Status;
EFI_PEI_RSC_HANDLER_PPI *RscHandlerPpi;
EFI_STATUS Status;
EFI_PEI_RSC_HANDLER_PPI *RscHandlerPpi;
Status = PeiServicesLocatePpi (
&gEfiPeiRscHandlerPpiGuid,
0,
NULL,
(VOID **) &RscHandlerPpi
(VOID **)&RscHandlerPpi
);
ASSERT_EFI_ERROR (Status);
@ -46,11 +46,12 @@ StatusCodeHandlerPeiEntry (
// if enable UseMemory, then initialize memory status code worker.
//
if (PcdGetBool (PcdStatusCodeUseSerial)) {
Status = SerialPortInitialize();
Status = SerialPortInitialize ();
ASSERT_EFI_ERROR (Status);
Status = RscHandlerPpi->Register (SerialStatusCodeReportWorker);
ASSERT_EFI_ERROR (Status);
}
if (PcdGetBool (PcdStatusCodeUseMemory)) {
Status = MemoryStatusCodeInitializeWorker ();
ASSERT_EFI_ERROR (Status);
@ -60,4 +61,3 @@ StatusCodeHandlerPeiEntry (
return EFI_SUCCESS;
}

30
MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.h
View File

@ -9,7 +9,6 @@
#ifndef __STATUS_CODE_HANDLER_PEI_H__
#define __STATUS_CODE_HANDLER_PEI_H__
#include <Ppi/ReportStatusCodeHandler.h>
#include <Guid/MemoryStatusCodeRecord.h>
@ -29,7 +28,7 @@
//
// Define the maximum message length
//
#define MAX_DEBUG_MESSAGE_LENGTH 0x100
#define MAX_DEBUG_MESSAGE_LENGTH 0x100
/**
Convert status code value and extended data to readable ASCII string, send string to serial I/O device.
@ -57,15 +56,14 @@
EFI_STATUS
EFIAPI
SerialStatusCodeReportWorker (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN CONST EFI_GUID *CallerId,
IN CONST EFI_STATUS_CODE_DATA *Data OPTIONAL
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN CONST EFI_GUID *CallerId,
IN CONST EFI_STATUS_CODE_DATA *Data OPTIONAL
);
/**
Create the first memory status code GUID'ed HOB as initialization for memory status code worker.
@ -106,14 +104,12 @@ MemoryStatusCodeInitializeWorker (
EFI_STATUS
EFIAPI
MemoryStatusCodeReportWorker (
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN CONST EFI_GUID *CallerId,
IN CONST EFI_STATUS_CODE_DATA *Data OPTIONAL
IN CONST EFI_PEI_SERVICES **PeiServices,
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN CONST EFI_GUID *CallerId,
IN CONST EFI_STATUS_CODE_DATA *Data OPTIONAL
);
#endif

20
MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c
View File

@ -23,7 +23,7 @@ RtMemoryStatusCodeInitializeWorker (
VOID
)
{
EFI_STATUS Status;
EFI_STATUS Status;
//
// Allocate runtime memory status code pool.
@ -43,7 +43,6 @@ RtMemoryStatusCodeInitializeWorker (
return Status;
}
/**
Report status code into runtime memory. If the runtime pool is full, roll back to the
first record and overwrite it.
@ -65,19 +64,19 @@ RtMemoryStatusCodeInitializeWorker (
EFI_STATUS
EFIAPI
RtMemoryStatusCodeReportWorker (
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
)
{
MEMORY_STATUSCODE_RECORD *Record;
MEMORY_STATUSCODE_RECORD *Record;
//
// Locate current record buffer.
//
Record = (MEMORY_STATUSCODE_RECORD *) (mRtMemoryStatusCodeTable + 1);
Record = (MEMORY_STATUSCODE_RECORD *)(mRtMemoryStatusCodeTable + 1);
Record = &Record[mRtMemoryStatusCodeTable->RecordIndex++];
//
@ -105,6 +104,3 @@ RtMemoryStatusCodeReportWorker (
return EFI_SUCCESS;
}

53
MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
View File

@ -30,26 +30,27 @@
EFI_STATUS
EFIAPI
SerialStatusCodeReportWorker (
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
)
{
CHAR8 *Filename;
CHAR8 *Description;
CHAR8 *Format;
CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
UINT32 ErrorLevel;
UINT32 LineNumber;
UINTN CharCount;
BASE_LIST Marker;
CHAR8 *Filename;
CHAR8 *Description;
CHAR8 *Format;
CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
UINT32 ErrorLevel;
UINT32 LineNumber;
UINTN CharCount;
BASE_LIST Marker;
Buffer[0] = '\0';
if (Data != NULL &&
ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber)) {
if ((Data != NULL) &&
ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber))
{
//
// Print ASSERT() information into output buffer.
//
@ -61,8 +62,9 @@ SerialStatusCodeReportWorker (
LineNumber,
Description
);
} else if (Data != NULL &&
ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format)) {
} else if ((Data != NULL) &&
ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format))
{
//
// Print DEBUG() information into output buffer.
//
@ -120,9 +122,10 @@ SerialStatusCodeReportWorker (
Value,
Instance
);
} else if (Data != NULL &&
} else if ((Data != NULL) &&
CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) &&
((EFI_STATUS_CODE_STRING_DATA *) Data)->StringType == EfiStringAscii) {
(((EFI_STATUS_CODE_STRING_DATA *)Data)->StringType == EfiStringAscii))
{
//
// EFI_STATUS_CODE_STRING_DATA
//
@ -130,7 +133,7 @@ SerialStatusCodeReportWorker (
Buffer,
sizeof (Buffer),
"%a",
((EFI_STATUS_CODE_STRING_DATA *) Data)->String.Ascii
((EFI_STATUS_CODE_STRING_DATA *)Data)->String.Ascii
);
} else {
//
@ -149,18 +152,18 @@ SerialStatusCodeReportWorker (
//
// Call SerialPort Lib function to do print.
//
SerialPortWrite ((UINT8 *) Buffer, CharCount);
SerialPortWrite ((UINT8 *)Buffer, CharCount);
//
// If register an unregister function of gEfiEventExitBootServicesGuid,
// then some log called in ExitBootServices() will be lost,
// so unregister the handler after receive the value of exit boot service.
//
if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE &&
Value == (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)) {
UnregisterSerialBootTimeHandlers();
if (((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) &&
(Value == (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)))
{
UnregisterSerialBootTimeHandlers ();
}
return EFI_SUCCESS;
}

40
MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
View File

@ -40,8 +40,8 @@ UnregisterSerialBootTimeHandlers (
VOID
EFIAPI
VirtualAddressChangeCallBack (
IN EFI_EVENT Event,
IN VOID *Context
IN EFI_EVENT Event,
IN VOID *Context
)
{
//
@ -49,7 +49,7 @@ VirtualAddressChangeCallBack (
//
EfiConvertPointer (
0,
(VOID **) &mRtMemoryStatusCodeTable
(VOID **)&mRtMemoryStatusCodeTable
);
}
@ -63,12 +63,12 @@ InitializationDispatcherWorker (
VOID
)
{
EFI_PEI_HOB_POINTERS Hob;
EFI_STATUS Status;
MEMORY_STATUSCODE_PACKET_HEADER *PacketHeader;
MEMORY_STATUSCODE_RECORD *Record;
UINTN Index;
UINTN MaxRecordNumber;
EFI_PEI_HOB_POINTERS Hob;
EFI_STATUS Status;
MEMORY_STATUSCODE_PACKET_HEADER *PacketHeader;
MEMORY_STATUSCODE_RECORD *Record;
UINTN Index;
UINTN MaxRecordNumber;
//
// If enable UseSerial, then initialize serial port.
@ -81,6 +81,7 @@ InitializationDispatcherWorker (
Status = SerialPortInitialize ();
ASSERT_EFI_ERROR (Status);
}
if (PcdGetBool (PcdStatusCodeUseMemory)) {
Status = RtMemoryStatusCodeInitializeWorker ();
ASSERT_EFI_ERROR (Status);
@ -94,17 +95,18 @@ InitializationDispatcherWorker (
// Journal GUID'ed HOBs to find all record entry, if found,
// then output record to support replay device.
//
Hob.Raw = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);
Hob.Raw = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);
if (Hob.Raw != NULL) {
PacketHeader = (MEMORY_STATUSCODE_PACKET_HEADER *) GET_GUID_HOB_DATA (Hob.Guid);
Record = (MEMORY_STATUSCODE_RECORD *) (PacketHeader + 1);
MaxRecordNumber = (UINTN) PacketHeader->RecordIndex;
PacketHeader = (MEMORY_STATUSCODE_PACKET_HEADER *)GET_GUID_HOB_DATA (Hob.Guid);
Record = (MEMORY_STATUSCODE_RECORD *)(PacketHeader + 1);
MaxRecordNumber = (UINTN)PacketHeader->RecordIndex;
if (PacketHeader->PacketIndex > 0) {
//
// Record has been wrapped around. So, record number has arrived at max number.
//
MaxRecordNumber = (UINTN) PacketHeader->MaxRecordsNumber;
MaxRecordNumber = (UINTN)PacketHeader->MaxRecordsNumber;
}
for (Index = 0; Index < MaxRecordNumber; Index++) {
//
// Dispatch records to devices based on feature flag.
@ -118,6 +120,7 @@ InitializationDispatcherWorker (
NULL
);
}
if (PcdGetBool (PcdStatusCodeUseMemory)) {
RtMemoryStatusCodeReportWorker (
Record[Index].CodeType,
@ -147,16 +150,16 @@ InitializationDispatcherWorker (
EFI_STATUS
EFIAPI
StatusCodeHandlerRuntimeDxeEntry (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_STATUS Status;
EFI_STATUS Status;
Status = gBS->LocateProtocol (
&gEfiRscHandlerProtocolGuid,
NULL,
(VOID **) &mRscHandlerProtocol
(VOID **)&mRscHandlerProtocol
);
ASSERT_EFI_ERROR (Status);
@ -168,6 +171,7 @@ StatusCodeHandlerRuntimeDxeEntry (
if (PcdGetBool (PcdStatusCodeUseSerial)) {
mRscHandlerProtocol->Register (SerialStatusCodeReportWorker, TPL_HIGH_LEVEL);
}
if (PcdGetBool (PcdStatusCodeUseMemory)) {
mRscHandlerProtocol->Register (RtMemoryStatusCodeReportWorker, TPL_HIGH_LEVEL);
}

23
MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h
View File

@ -33,7 +33,7 @@
//
// Define the maximum message length
//
#define MAX_DEBUG_MESSAGE_LENGTH 0x100
#define MAX_DEBUG_MESSAGE_LENGTH 0x100
extern RUNTIME_MEMORY_STATUSCODE_HEADER *mRtMemoryStatusCodeTable;
@ -48,7 +48,6 @@ EfiSerialStatusCodeInitializeWorker (
VOID
);
/**
Convert status code value and extended data to readable ASCII string, send string to serial I/O device.
@ -71,11 +70,11 @@ EfiSerialStatusCodeInitializeWorker (
EFI_STATUS
EFIAPI
SerialStatusCodeReportWorker (
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
);
/**
@ -111,11 +110,11 @@ RtMemoryStatusCodeInitializeWorker (
EFI_STATUS
EFIAPI
RtMemoryStatusCodeReportWorker (
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
);
/**

32
MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c
View File

@ -22,7 +22,7 @@ MemoryStatusCodeInitializeWorker (
VOID
)
{
EFI_STATUS Status;
EFI_STATUS Status;
//
// Allocate MM memory status code pool.
@ -31,16 +31,15 @@ MemoryStatusCodeInitializeWorker (
ASSERT (mMmMemoryStatusCodeTable != NULL);
mMmMemoryStatusCodeTable->MaxRecordsNumber = (PcdGet16 (PcdStatusCodeMemorySize) * 1024) / sizeof (MEMORY_STATUSCODE_RECORD);
Status = gMmst->MmInstallConfigurationTable (
gMmst,
&gMemoryStatusCodeRecordGuid,
&mMmMemoryStatusCodeTable,
sizeof (mMmMemoryStatusCodeTable)
);
Status = gMmst->MmInstallConfigurationTable (
gMmst,
&gMemoryStatusCodeRecordGuid,
&mMmMemoryStatusCodeTable,
sizeof (mMmMemoryStatusCodeTable)
);
return Status;
}
/**
Report status code into runtime memory. If the runtime pool is full, roll back to the
first record and overwrite it.
@ -62,19 +61,19 @@ MemoryStatusCodeInitializeWorker (
EFI_STATUS
EFIAPI
MemoryStatusCodeReportWorker (
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
)
{
MEMORY_STATUSCODE_RECORD *Record;
MEMORY_STATUSCODE_RECORD *Record;
//
// Locate current record buffer.
//
Record = (MEMORY_STATUSCODE_RECORD *) (mMmMemoryStatusCodeTable + 1);
Record = (MEMORY_STATUSCODE_RECORD *)(mMmMemoryStatusCodeTable + 1);
Record = &Record[mMmMemoryStatusCodeTable->RecordIndex++];
//
@ -102,6 +101,3 @@ MemoryStatusCodeReportWorker (
return EFI_SUCCESS;
}

46
MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
View File

@ -30,26 +30,27 @@
EFI_STATUS
EFIAPI
SerialStatusCodeReportWorker (
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
)
{
CHAR8 *Filename;
CHAR8 *Description;
CHAR8 *Format;
CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
UINT32 ErrorLevel;
UINT32 LineNumber;
UINTN CharCount;
BASE_LIST Marker;
CHAR8 *Filename;
CHAR8 *Description;
CHAR8 *Format;
CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
UINT32 ErrorLevel;
UINT32 LineNumber;
UINTN CharCount;
BASE_LIST Marker;
Buffer[0] = '\0';
if (Data != NULL &&
ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber)) {
if ((Data != NULL) &&
ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber))
{
//
// Print ASSERT() information into output buffer.
//
@ -61,8 +62,9 @@ SerialStatusCodeReportWorker (
LineNumber,
Description
);
} else if (Data != NULL &&
ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format)) {
} else if ((Data != NULL) &&
ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format))
{
//
// Print DEBUG() information into output buffer.
//
@ -120,9 +122,10 @@ SerialStatusCodeReportWorker (
Value,
Instance
);
} else if (Data != NULL &&
} else if ((Data != NULL) &&
CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) &&
((EFI_STATUS_CODE_STRING_DATA *) Data)->StringType == EfiStringAscii) {
(((EFI_STATUS_CODE_STRING_DATA *)Data)->StringType == EfiStringAscii))
{
//
// EFI_STATUS_CODE_STRING_DATA
//
@ -130,7 +133,7 @@ SerialStatusCodeReportWorker (
Buffer,
sizeof (Buffer),
"%a",
((EFI_STATUS_CODE_STRING_DATA *) Data)->String.Ascii
((EFI_STATUS_CODE_STRING_DATA *)Data)->String.Ascii
);
} else {
//
@ -149,8 +152,7 @@ SerialStatusCodeReportWorker (
//
// Call SerialPort Lib function to do print.
//
SerialPortWrite ((UINT8 *) Buffer, CharCount);
SerialPortWrite ((UINT8 *)Buffer, CharCount);
return EFI_SUCCESS;
}

11
MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerMm.c
View File

@ -9,8 +9,7 @@
#include "StatusCodeHandlerMm.h"
EFI_MM_RSC_HANDLER_PROTOCOL *mRscHandlerProtocol = NULL;
EFI_MM_RSC_HANDLER_PROTOCOL *mRscHandlerProtocol = NULL;
/**
Dispatch initialization request to sub status code devices based on
@ -22,7 +21,7 @@ InitializationDispatcherWorker (
VOID
)
{
EFI_STATUS Status;
EFI_STATUS Status;
//
// If enable UseSerial, then initialize serial port.
@ -35,6 +34,7 @@ InitializationDispatcherWorker (
Status = SerialPortInitialize ();
ASSERT_EFI_ERROR (Status);
}
if (PcdGetBool (PcdStatusCodeUseMemory)) {
Status = MemoryStatusCodeInitializeWorker ();
ASSERT_EFI_ERROR (Status);
@ -54,12 +54,12 @@ StatusCodeHandlerCommonEntry (
VOID
)
{
EFI_STATUS Status;
EFI_STATUS Status;
Status = gMmst->MmLocateProtocol (
&gEfiMmRscHandlerProtocolGuid,
NULL,
(VOID **) &mRscHandlerProtocol
(VOID **)&mRscHandlerProtocol
);
ASSERT_EFI_ERROR (Status);
@ -71,6 +71,7 @@ StatusCodeHandlerCommonEntry (
if (PcdGetBool (PcdStatusCodeUseSerial)) {
mRscHandlerProtocol->Register (SerialStatusCodeReportWorker);
}
if (PcdGetBool (PcdStatusCodeUseMemory)) {
mRscHandlerProtocol->Register (MemoryStatusCodeReportWorker);
}

23
MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerMm.h
View File

@ -30,7 +30,7 @@
//
// Define the maximum message length
//
#define MAX_DEBUG_MESSAGE_LENGTH 0x100
#define MAX_DEBUG_MESSAGE_LENGTH 0x100
extern RUNTIME_MEMORY_STATUSCODE_HEADER *mMmMemoryStatusCodeTable;
@ -45,7 +45,6 @@ EfiSerialStatusCodeInitializeWorker (
VOID
);
/**
Convert status code value and extended data to readable ASCII string, send string to serial I/O device.
@ -68,11 +67,11 @@ EfiSerialStatusCodeInitializeWorker (
EFI_STATUS
EFIAPI
SerialStatusCodeReportWorker (
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
);
/**
@ -107,11 +106,11 @@ MemoryStatusCodeInitializeWorker (
EFI_STATUS
EFIAPI
MemoryStatusCodeReportWorker (
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
IN EFI_STATUS_CODE_TYPE CodeType,
IN EFI_STATUS_CODE_VALUE Value,
IN UINT32 Instance,
IN EFI_GUID *CallerId,
IN EFI_STATUS_CODE_DATA *Data OPTIONAL
);
/**

4
MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerTraditional.c
View File

@ -23,8 +23,8 @@
EFI_STATUS
EFIAPI
StatusCodeHandlerTraditionalMmEntry (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
return StatusCodeHandlerCommonEntry ();