Follow up EDKT247-253

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

6 files changed, 27 insertions, 16 deletions

diff --git a/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c b/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c
index 7832f3781d..1c42eb0a37 100644
--- a/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c
+++ b/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c
@@ -50,6 +50,9 @@ SerialPortWrite (
   IN UINTN     NumberOfBytes

 )

 {

+  ASSERT (NULL != Buffer);

+  ASSERT (0 != NumberOfBytes);

+

   return 0;

 }

 

@@ -74,6 +77,9 @@ SerialPortRead (
   IN  UINTN     NumberOfBytes

 )

 {

+  ASSERT (NULL != Buffer);

+  ASSERT (0 != NumberOfBytes);

+

   return 0;

 }

 

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Common/StatusCode.dxs b/EdkModulePkg/Universal/StatusCode/Dxe/Common/StatusCode.dxs
index 6371258e9a..9e0cc6b9f1 100644
--- a/EdkModulePkg/Universal/StatusCode/Dxe/Common/StatusCode.dxs
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/Common/StatusCode.dxs
@@ -11,7 +11,7 @@
 # 

 # Module Name:

 #

-#   Ia32StatusCode.dxs

+#   StatusCode.dxs

 #

 # Abstract:

 #

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c
index c47d34bc23..27ea8dcd1c 100644
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c
@@ -137,7 +137,7 @@ InitializationDispatcherWorker (
       //

       // See whether there is gap of packet or not

       //

-      if (HobStart) {

+      if (NULL != HobStart) {

         HobStart  = NULL;

         Hob.Raw   = HobStart;

         continue;

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
index 72fe0977ae..16fa3e8097 100644
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
@@ -35,10 +35,10 @@ Abstract:
 // The point type always equal to PHYSICAL_MODE on IA32/X64/EBC architecture

 // Otherwise, VIRTUAL_MODE/PHYSICAL_MODE would be used on Ipf architecture, 

 // 

-enum {

+typedef enum {

   PHYSICAL_MODE,

   VIRTUAL_MODE

-};

+} PROCESSOR_MODE;

 

 typedef struct {

   UINTN                     Signature;

@@ -124,7 +124,8 @@ EfiSerialStatusCodeInitializeWorker (
 

   @param  Data          This optional parameter may be used to pass additional data

  

-  @return               The function always return EFI_SUCCESS.

+  @retval EFI_SUCCESS         Success to report status code to serial I/O.

+  @retval EFI_DEVICE_ERROR    EFI serial device can not work after ExitBootService() is called .

 

 **/

 EFI_STATUS

@@ -218,6 +219,7 @@ DataHubStatusCodeInitializeWorker (
   @param  Data          This optional parameter may be used to pass additional data

  

   @retval EFI_OUT_OF_RESOURCES   Can not acquire record buffer.

+  @retval EFI_DEVICE_ERROR       EFI serial device can not work after ExitBootService() is called .

   @retval EFI_SUCCESS            Success to cache status code and signal log data event.

 

 **/

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
index 47442a9764..3838069bb5 100644
--- a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
@@ -1,5 +1,5 @@
 /** @file

-  Status code driver for IA32/X64/EBC architecture.

+* Status code driver for IPF architecture.

 

   Copyright (c) 2006, Intel Corporation                                                         

   All rights reserved. This program and the accompanying materials                          

@@ -76,8 +76,8 @@ ReportEsalServiceEntry (
     // Use atom operation to avoid the reentant of report.

     // If current status is not zero, then the function is reentrancy.

     //

-    if (InterlockedCompareExchange32 (&DxeStatusCode->StatusCodeNestStatus, 0, 1)) {

-      ReturnVal.Status = EFI_DEVICE_ERROR ;

+    if (1 == InterlockedCompareExchange32 (&DxeStatusCode->StatusCodeNestStatus, 0, 1)) {

+      ReturnVal.Status = EFI_DEVICE_ERROR;

       return ReturnVal;

     }

 

@@ -150,6 +150,8 @@ DxeStatusCodeDriverEntry (
   IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

+  EFI_STATUS Status;

+

   //

   // Dispatch initialization request to supported devices

   //

@@ -158,13 +160,14 @@ DxeStatusCodeDriverEntry (
   //

   // Initialize ESAL capabilities.

   //

-  RegisterEsalClass (

-    &gEfiExtendedSalStatusCodeServicesProtocolGuid,

-    &gDxeStatusCode,

-    ReportEsalServiceEntry,

-    StatusCode,

-    NULL

-    );

+  Status = RegisterEsalClass (

+             &gEfiExtendedSalStatusCodeServicesProtocolGuid,

+             &gDxeStatusCode,

+             ReportEsalServiceEntry,

+             StatusCode,

+             NULL

+             );

+  ASSERT_EFI_ERROR (Status);

 

   return EFI_SUCCESS;

 }

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/StatusCode.dxs b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/StatusCode.dxs
index aaa3efe3e1..8aae3fc6d7 100644
--- a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/StatusCode.dxs
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/StatusCode.dxs
@@ -11,7 +11,7 @@
 # 

 # Module Name:

 #

-#   IpfStatusCode.dxs

+#   StatusCode.dxs

 #

 # Abstract:

 #