Follow up EDKT247-253

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

diff --git a/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c b/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c
index 7832f3781d3a7bdb7cabf34a38b4de828fe717a3..1c42eb0a37c2b8bd5b35a5044dbfc43cabebaa93 100644 (file)
--- a/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c
+++ b/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c
@@ -50,6 +50,9 @@ SerialPortWrite (
   IN UINTN     NumberOfBytes\r
 )\r
 {\r
   IN UINTN     NumberOfBytes\r
 )\r
 {\r

+  ASSERT (NULL != Buffer);\r
+  ASSERT (0 != NumberOfBytes);\r
+\r

   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r


@@ -74,6 +77,9 @@ SerialPortRead (
   IN  UINTN     NumberOfBytes\r
 )\r
 {\r
   IN  UINTN     NumberOfBytes\r
 )\r
 {\r

+  ASSERT (NULL != Buffer);\r
+  ASSERT (0 != NumberOfBytes);\r
+\r

   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Common/StatusCode.dxs b/EdkModulePkg/Universal/StatusCode/Dxe/Common/StatusCode.dxs
index 6371258e9a6e4b92c4999767bae878c0e7d58cf5..9e0cc6b9f1dae4c951cb1682d8bc3154a06a011a 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/Common/StatusCode.dxs
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/Common/StatusCode.dxs
@@ -11,7 +11,7 @@
 # \r
 # Module Name:\r
 #\r
 # \r
 # Module Name:\r
 #\r

-#   Ia32StatusCode.dxs\r
+#   StatusCode.dxs\r

 #\r
 # Abstract:\r
 #\r
 #\r
 # Abstract:\r
 #\r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c
index c47d34bc2364ae4536ab198e285b9116aa8385c4..27ea8dcd1c9fdbc3f78f4e477b48eee550a55b31 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c
@@ -137,7 +137,7 @@ InitializationDispatcherWorker (
       //\r
       // See whether there is gap of packet or not\r
       //\r
       //\r
       // See whether there is gap of packet or not\r
       //\r

-      if (HobStart) {\r
+      if (NULL != HobStart) {\r

         HobStart  = NULL;\r
         Hob.Raw   = HobStart;\r
         continue;\r
         HobStart  = NULL;\r
         Hob.Raw   = HobStart;\r
         continue;\r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
index 72fe0977ae2ec4e3d7d5462ce3298b373b8b9559..16fa3e8097ceabd032c9248c310cdbbe4dacb29c 100644 (file)
--- 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\r
 // Otherwise, VIRTUAL_MODE/PHYSICAL_MODE would be used on Ipf architecture, \r
 // \r
 // The point type always equal to PHYSICAL_MODE on IA32/X64/EBC architecture\r
 // Otherwise, VIRTUAL_MODE/PHYSICAL_MODE would be used on Ipf architecture, \r
 // \r

-enum {\r
+typedef enum {\r

   PHYSICAL_MODE,\r
   VIRTUAL_MODE\r
   PHYSICAL_MODE,\r
   VIRTUAL_MODE\r

-};\r
+} PROCESSOR_MODE;\r

 \r
 typedef struct {\r
   UINTN                     Signature;\r
 \r
 typedef struct {\r
   UINTN                     Signature;\r


@@ -124,7 +124,8 @@ EfiSerialStatusCodeInitializeWorker (
 \r
   @param  Data          This optional parameter may be used to pass additional data\r
  \r
 \r
   @param  Data          This optional parameter may be used to pass additional data\r
  \r

-  @return               The function always return EFI_SUCCESS.\r
+  @retval EFI_SUCCESS         Success to report status code to serial I/O.\r
+  @retval EFI_DEVICE_ERROR    EFI serial device can not work after ExitBootService() is called .\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -218,6 +219,7 @@ DataHubStatusCodeInitializeWorker (
   @param  Data          This optional parameter may be used to pass additional data\r
  \r
   @retval EFI_OUT_OF_RESOURCES   Can not acquire record buffer.\r
   @param  Data          This optional parameter may be used to pass additional data\r
  \r
   @retval EFI_OUT_OF_RESOURCES   Can not acquire record buffer.\r

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

   @retval EFI_SUCCESS            Success to cache status code and signal log data event.\r
 \r
 **/\r
   @retval EFI_SUCCESS            Success to cache status code and signal log data event.\r
 \r
 **/\r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
index 47442a97644dd17e31b9f3047bd17200dd3fbe61..3838069bb57764f3cecaa3c8ce3e165c93ef682f 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c
@@ -1,5 +1,5 @@
 /** @file\r
 /** @file\r

-  Status code driver for IA32/X64/EBC architecture.\r
+* Status code driver for IPF architecture.\r

 \r
   Copyright (c) 2006, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r
 \r
   Copyright (c) 2006, Intel Corporation                                                         \r
   All rights reserved. This program and the accompanying materials                          \r


@@ -76,8 +76,8 @@ ReportEsalServiceEntry (
     // Use atom operation to avoid the reentant of report.\r
     // If current status is not zero, then the function is reentrancy.\r
     //\r
     // Use atom operation to avoid the reentant of report.\r
     // If current status is not zero, then the function is reentrancy.\r
     //\r

-    if (InterlockedCompareExchange32 (&DxeStatusCode->StatusCodeNestStatus, 0, 1)) {\r
-      ReturnVal.Status = EFI_DEVICE_ERROR ;\r
+    if (1 == InterlockedCompareExchange32 (&DxeStatusCode->StatusCodeNestStatus, 0, 1)) {\r
+      ReturnVal.Status = EFI_DEVICE_ERROR;\r

       return ReturnVal;\r
     }\r
 \r
       return ReturnVal;\r
     }\r
 \r


@@ -150,6 +150,8 @@ DxeStatusCodeDriverEntry (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r

+  EFI_STATUS Status;\r
+\r

   //\r
   // Dispatch initialization request to supported devices\r
   //\r
   //\r
   // Dispatch initialization request to supported devices\r
   //\r


@@ -158,13 +160,14 @@ DxeStatusCodeDriverEntry (
   //\r
   // Initialize ESAL capabilities.\r
   //\r
   //\r
   // Initialize ESAL capabilities.\r
   //\r

-  RegisterEsalClass (\r
-    &gEfiExtendedSalStatusCodeServicesProtocolGuid,\r
-    &gDxeStatusCode,\r
-    ReportEsalServiceEntry,\r
-    StatusCode,\r
-    NULL\r
-    );\r
+  Status = RegisterEsalClass (\r
+             &gEfiExtendedSalStatusCodeServicesProtocolGuid,\r
+             &gDxeStatusCode,\r
+             ReportEsalServiceEntry,\r
+             StatusCode,\r
+             NULL\r
+             );\r
+  ASSERT_EFI_ERROR (Status);\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/StatusCode.dxs b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/StatusCode.dxs
index aaa3efe3e16e6d172607453b9de72449917a76be..8aae3fc6d75b2a27bc0235d8efe142f05e50502f 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/StatusCode.dxs
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/Ipf/StatusCode.dxs
@@ -11,7 +11,7 @@
 # \r
 # Module Name:\r
 #\r
 # \r
 # Module Name:\r
 #\r

-#   IpfStatusCode.dxs\r
+#   StatusCode.dxs\r

 #\r
 # Abstract:\r
 #\r
 #\r
 # Abstract:\r
 #\r