Follow up EDKT238, EDKT239, EDKT242, EDKT243

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1432 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c b/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c
index d6e91d687dc6f7f3b466de3772a6e43d4351b7a3..7832f3781d3a7bdb7cabf34a38b4de828fe717a3 100644 (file)
--- a/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c
+++ b/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c
@@ -46,8 +46,8 @@ SerialPortInitialize (
 UINTN\r
 EFIAPI\r
 SerialPortWrite (\r
-  IN UINT8        *Buffer,\r
-  IN UINTN        NumberOfBytes\r
+  IN UINT8     *Buffer,\r
+  IN UINTN     NumberOfBytes\r
 )\r
 {\r
   return 0;\r
@@ -70,8 +70,8 @@ SerialPortWrite (
 UINTN\r
 EFIAPI\r
 SerialPortRead (\r
-  OUT UINT8    *Buffer,\r
-  IN  UINTN    NumberOfBytes\r
+  OUT UINT8     *Buffer,\r
+  IN  UINTN     NumberOfBytes\r
 )\r
 {\r
   return 0;\r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c b/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c
index 06a4814375bac22839d2a3604f6403f170b64b82..730a231c0bef0162038d8725eddde99b6e9f87d2 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c
@@ -131,6 +131,9 @@ DxeStatusCodeDriverEntry (
                         Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.  \r
                         The contents of this data type may have additional GUID-specific data.  The standard GUIDs and \r
                         their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.\r
+\r
+  @return               Always return EFI_SUCCESS.\r
+\r
 **/\r
 EFI_STATUS \r
 EFIAPI\r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c b/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
index 11793b52aead2a40c5a75776a1875aad8da0c4b1..91da14d007eda8fd2b2ac414fce626e12b7ec528 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
@@ -67,30 +67,11 @@ AcquireRecordBuffer (
 \r
   @param   Record        Point to record buffer which is acquired by AcquirRecordBuffer()\r
  \r
-  @retval  EFI_SUCCESS   If DataRecord is valid.\r
-  @retval  !EFI_SUCCESS  The record list has empty.\r
-\r
 **/\r
 VOID\r
 FreeRecordBuffer (\r
   IN  DATAHUB_STATUSCODE_RECORD  *Record\r
   )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Release a mRecordBuffer entry allocated by AquireEmptyRecordBuffer ().\r
-\r
-Arguments:\r
-\r
-  RecordBuffer          - Data to free\r
-\r
-Returns:\r
-\r
-  EFI_SUCCESS           - If DataRecord is valid\r
-  EFI_UNSUPPORTED       - The record list has empty\r
-\r
---*/\r
 {\r
   ASSERT (Record != NULL);\r
   ASSERT (mNumberOfRecords != 0);\r
@@ -222,7 +203,7 @@ LogDataHubEventCallBack (
   )\r
 {\r
   DATAHUB_STATUSCODE_RECORD         *Record;\r
-  UINTN                             Size;\r
+  UINT32                            Size;\r
   UINT64                            DataRecordClass;\r
   LIST_ENTRY                        *Node;\r
 \r
@@ -238,7 +219,7 @@ LogDataHubEventCallBack (
     //\r
     // Add in the size of the header we added.\r
     //\r
-    Size = sizeof (DATAHUB_STATUSCODE_RECORD) + Record->Data.Size;\r
+    Size = sizeof (DATAHUB_STATUSCODE_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
@@ -266,7 +247,7 @@ LogDataHubEventCallBack (
                         &gEfiStatusCodeRuntimeProtocolGuid,\r
                         DataRecordClass,\r
                         Record,\r
-                        (UINT32) Size\r
+                        Size\r
                         );\r
 \r
     FreeRecordBuffer (Record);\r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c
index c119cf751b59b621f30b10e07505bddb70dce8d6..c47d34bc2364ae4536ab198e285b9116aa8385c4 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c
@@ -22,7 +22,7 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
-  Module Name:  StatusCode.c\r
+  Module Name:  DxeStatusCode.c\r
 \r
 **/\r
 \r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
index 3eb28b19b9e8d38da0e62af3049ccdd85ba8f8e7..7c76f8b324a05b6668fbc675544ebde6ec657a22 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
@@ -111,6 +111,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>\r
     </Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiStatusCodeRuntimeProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
   </Protocols>\r
   <Guids> \r
     <GuidCNames Usage="SOMETIMES_CONSUMED">\r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c b/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
index a5fbf236782a93fbaa78c7d7011f244c96e40ad7..69e3e10757b749636b351d027165347005cc00e5 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
@@ -32,10 +32,10 @@ EfiSerialStatusCodeInitializeWorker (
   EFI_STATUS Status;\r
 \r
   Status = gBS->LocateProtocol (\r
-            &gEfiSerialIoProtocolGuid,\r
-            NULL,\r
-            (VOID **) &mSerialIoProtocol\r
-            );\r
+             &gEfiSerialIoProtocolGuid,\r
+             NULL,\r
+             (VOID **) &mSerialIoProtocol\r
+             );\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r

diff --git a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
index bbe16c70cb9fcbcfc2f4fddf1b269e48e1e68e47..2ef75041f434ff05b9d3d755221507c4506d9dca 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
+++ b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
@@ -89,6 +89,9 @@ EFI_PEI_PPI_DESCRIPTOR        mStatusCodePpiDescriptor = {
                         Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.  \r
                         The contents of this data type may have additional GUID-specific data.  The standard GUIDs and \r
                         their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.\r
+\r
+  @return               Always return EFI_SUCCESS.\r
+\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r