Make EdkModulePkg pass Intel IPF compiler with /W4 /WX switches, solving warning...

[mirror_edk2.git] / EdkModulePkg / Universal / StatusCode / Pei / PeiStatusCode.c

diff --git a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
index c1e449059499723739d23e78a6d112afac0a9f27..d47be70661dccbff492a6bd76c63d6a8755a9550 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
+++ b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
@@ -17,47 +17,12 @@
 \r
 #include "PeiStatusCode.h"\r
 \r
-/**\r
-  Report status code to all supported device.\r
- * \r
- * \r
-  @param  PeiServices\r
-\r
-  @param  Type          Indicates the type of status code being reported.  \r
-                        The type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.\r
-  @param  Value         Describes the current status of a hardware or software entity.  \r
-                        This includes information about the class and subclass that is used to classify the entity \r
-                        as well as an operation.  For progress codes, the operation is the current activity.  \r
-                        For error codes, it is the exception.  For debug codes, it is not defined at this time.  \r
-                        Type EFI_STATUS_CODE_VALUE is defined in ¡°Related Definitions¡± below.  \r
-                        Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
-  @param  Instance      The enumeration of a hardware or software entity within the system.  \r
-                        A system may contain multiple entities that match a class/subclass pairing.  \r
-                        The instance differentiates between them.  An instance of 0 indicates that instance \r
-                        information is unavailable, not meaningful, or not relevant.  Valid instance numbers start with 1.\r
-  @param  CallerId      This optional parameter may be used to identify the caller. \r
-                        This parameter allows the status code driver to apply different rules to different callers.\r
-  @param  Data          This optional parameter may be used to pass additional data.  \r
-                        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
-EFI_STATUS\r
-EFIAPI\r
-ReportDispatcher (\r
-  IN EFI_PEI_SERVICES         **PeiServices,\r
-  IN EFI_STATUS_CODE_TYPE     Type,\r
-  IN EFI_STATUS_CODE_VALUE    Value,\r
-  IN UINT32                   Instance,\r
-  IN EFI_GUID                 *CallerId OPTIONAL,\r
-  IN EFI_STATUS_CODE_DATA     *Data OPTIONAL\r
-  );\r
-\r
-\r
+STATIC\r
 EFI_PEI_PROGRESS_CODE_PPI     mStatusCodePpi           = { \r
   ReportDispatcher\r
   };\r
 \r
+STATIC\r
 EFI_PEI_PPI_DESCRIPTOR        mStatusCodePpiDescriptor = {\r
   EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST,\r
   &gEfiPeiStatusCodePpiGuid,\r
@@ -66,8 +31,8 @@ EFI_PEI_PPI_DESCRIPTOR        mStatusCodePpiDescriptor = {
 \r
 /**\r
   Report status code to all supported device.\r
- * \r
- * \r
+  \r
+  \r
   @param  PeiServices\r
 \r
   @param  CodeType      Indicates the type of status code being reported.  \r
@@ -76,7 +41,7 @@ EFI_PEI_PPI_DESCRIPTOR        mStatusCodePpiDescriptor = {
                         This includes information about the class and subclass that is used to classify the entity \r
                         as well as an operation.  For progress codes, the operation is the current activity.  \r
                         For error codes, it is the exception.  For debug codes, it is not defined at this time.  \r
-                        Type EFI_STATUS_CODE_VALUE is defined in ¡°Related Definitions¡± below.  \r
+                        Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.  \r
                         Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.\r
   @param  Instance      The enumeration of a hardware or software entity within the system.  \r
                         A system may contain multiple entities that match a class/subclass pairing.  \r
@@ -88,6 +53,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
@@ -140,7 +108,6 @@ ReportDispatcher (
 \r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 PeiStatusCodeDriverEntry (\r
   IN EFI_FFS_FILE_HEADER       *FfsHeader,\r
   IN EFI_PEI_SERVICES          **PeiServices\r
@@ -155,13 +122,16 @@ PeiStatusCodeDriverEntry (
   // if enable UseOEM, then initialize Oem status code.\r
   //\r
   if (FeaturePcdGet (PcdStatusCodeUseSerial)) {\r
-    SerialPortInitialize();\r
+    Status = SerialPortInitialize();\r
+    ASSERT_EFI_ERROR (Status);\r
   }\r
   if (FeaturePcdGet (PcdStatusCodeUseMemory)) {\r
-    MemoryStatusCodeInitializeWorker ();\r
+    Status = MemoryStatusCodeInitializeWorker ();\r
+    ASSERT_EFI_ERROR  (Status);\r
   }\r
   if (FeaturePcdGet (PcdStatusCodeUseOEM)) {\r
-    OemHookStatusCodeInitialize ();\r
+    Status = OemHookStatusCodeInitialize ();\r
+    ASSERT_EFI_ERROR  (Status);\r
   }\r
 \r
   //\r