diff options
author | yshang1 <yshang1@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-09-01 05:37:49 +0000 |
---|---|---|
committer | yshang1 <yshang1@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-09-01 05:37:49 +0000 |
commit | a93763b74df753b3e8de6a49eea5cbd1116b2535 (patch) | |
tree | 129b53452c0d5e8cdfa215315af590cf70947b04 /EdkModulePkg/Universal/StatusCode/Pei | |
parent | 5f4eb6b6d5eb39012da23c16fdf3f9d988f9db06 (diff) | |
download | edk2-platforms-a93763b74df753b3e8de6a49eea5cbd1116b2535.tar.xz |
Follow up tracker:
EDKT236, EDKT237, EDKT232, EDKT229 , EDKT233
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1418 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkModulePkg/Universal/StatusCode/Pei')
4 files changed, 43 insertions, 13 deletions
diff --git a/EdkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c b/EdkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c index bffcd3d71f..5614d80c6a 100644 --- a/EdkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c +++ b/EdkModulePkg/Universal/StatusCode/Pei/MemoryStausCodeWorker.c @@ -20,7 +20,7 @@ @param PacketIndex Index of records packet.
- @return The function always return EFI_SUCCESS
+ @return Always return pointer of memory status code packet.
**/
MEMORY_STATUSCODE_PACKET_HEADER *
@@ -36,7 +36,10 @@ CreateMemoryStatusCodePacket ( PacketHeader =
(MEMORY_STATUSCODE_PACKET_HEADER *) BuildGuidHob (
&gMemoryStatusCodeRecordGuid,
- (PcdGet16 (PcdStatusCodeMemorySize) * 1024) + sizeof (MEMORY_STATUSCODE_PACKET_HEADER));
+ PcdGet16 (PcdStatusCodeMemorySize) *
+ 1024 +
+ sizeof (MEMORY_STATUSCODE_PACKET_HEADER)
+ );
ASSERT (PacketHeader != NULL);
PacketHeader->MaxRecordsNumber = (PcdGet16 (PcdStatusCodeMemorySize) * 1024)/ sizeof (MEMORY_STATUSCODE_RECORD);
diff --git a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c index 3de5f58cf3..bbe16c70cb 100644 --- a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c +++ b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c @@ -19,8 +19,8 @@ /**
Report status code to all supported device.
- *
- *
+
+
@param PeiServices
@param Type Indicates the type of status code being reported.
@@ -53,11 +53,12 @@ ReportDispatcher ( IN EFI_STATUS_CODE_DATA *Data OPTIONAL
);
-
+STATIC
EFI_PEI_PROGRESS_CODE_PPI mStatusCodePpi = {
ReportDispatcher
};
+STATIC
EFI_PEI_PPI_DESCRIPTOR mStatusCodePpiDescriptor = {
EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,
&gEfiPeiStatusCodePpiGuid,
@@ -66,8 +67,8 @@ EFI_PEI_PPI_DESCRIPTOR mStatusCodePpiDescriptor = { /**
Report status code to all supported device.
- *
- *
+
+
@param PeiServices
@param CodeType Indicates the type of status code being reported.
@@ -154,13 +155,16 @@ PeiStatusCodeDriverEntry ( // if enable UseOEM, then initialize Oem status code.
//
if (FeaturePcdGet (PcdStatusCodeUseSerial)) {
- SerialPortInitialize();
+ Status = SerialPortInitialize();
+ ASSERT_EFI_ERROR (Status);
}
if (FeaturePcdGet (PcdStatusCodeUseMemory)) {
- MemoryStatusCodeInitializeWorker ();
+ Status = MemoryStatusCodeInitializeWorker ();
+ ASSERT_EFI_ERROR (Status);
}
if (FeaturePcdGet (PcdStatusCodeUseOEM)) {
- OemHookStatusCodeInitialize ();
+ Status = OemHookStatusCodeInitialize ();
+ ASSERT_EFI_ERROR (Status);
}
//
diff --git a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa index 91579b8c9a..100b52a74d 100644 --- a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa +++ b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.msa @@ -75,6 +75,9 @@ <GuidCNames Usage="SOMETIMES_CONSUMED">
<GuidCName>gMemoryStatusCodeRecordGuid</GuidCName>
</GuidCNames>
+ <GuidCNames Usage="SOMETIMES_CONSUMED">
+ <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>
+ </GuidCNames>
</Guids>
<Externs>
<Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
diff --git a/EdkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c b/EdkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c index 3f4ed2ecaf..a5dbfa404b 100644 --- a/EdkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c +++ b/EdkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c @@ -103,7 +103,14 @@ SerialStatusCodeReportWorker ( //
// Print ERROR information into output buffer.
//
- CharCount = AsciiSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, "ERROR: C%x:V%x I%x", CodeType, Value, Instance);
+ CharCount = AsciiSPrint (
+ Buffer,
+ EFI_STATUS_CODE_DATA_MAX_SIZE,
+ "ERROR: C%x:V%x I%x",
+ CodeType,
+ Value,
+ Instance
+ );
//
// Make sure we don't try to print values that weren't intended to be printed, especially NULL GUID pointers.
@@ -133,9 +140,22 @@ SerialStatusCodeReportWorker ( "\n\r"
);
} else if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) {
- CharCount = AsciiSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, "PROGRESS CODE: V%x I%x\n\r", Value, Instance);
+ CharCount = AsciiSPrint (
+ Buffer,
+ EFI_STATUS_CODE_DATA_MAX_SIZE,
+ "PROGRESS CODE: V%x I%x\n\r",
+ Value,
+ Instance
+ );
} else {
- CharCount = AsciiSPrint (Buffer, EFI_STATUS_CODE_DATA_MAX_SIZE, "Undefined: C%x:V%x I%x\n\r", CodeType, Value, Instance);
+ CharCount = AsciiSPrint (
+ Buffer,
+ EFI_STATUS_CODE_DATA_MAX_SIZE,
+ "Undefined: C%x:V%x I%x\n\r",
+ CodeType,
+ Value,
+ Instance
+ );
}
//
|