MdeModulePkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the MdeModulePkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

5 files changed, 57 insertions, 59 deletions

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c
index 14bac8ec3c..80c94e4682 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/MemoryStatusCodeWorker.c
@@ -22,7 +22,7 @@ MemoryStatusCodeInitializeWorker (
   VOID

   )

 {

-  EFI_STATUS                        Status;

+  EFI_STATUS  Status;

 

   //

   // Allocate MM memory status code pool.

@@ -31,16 +31,15 @@ MemoryStatusCodeInitializeWorker (
   ASSERT (mMmMemoryStatusCodeTable != NULL);

 

   mMmMemoryStatusCodeTable->MaxRecordsNumber = (PcdGet16 (PcdStatusCodeMemorySize) * 1024) / sizeof (MEMORY_STATUSCODE_RECORD);

-  Status = gMmst->MmInstallConfigurationTable (

-                    gMmst,

-                    &gMemoryStatusCodeRecordGuid,

-                    &mMmMemoryStatusCodeTable,

-                    sizeof (mMmMemoryStatusCodeTable)

-                    );

+  Status                                     = gMmst->MmInstallConfigurationTable (

+                                                        gMmst,

+                                                        &gMemoryStatusCodeRecordGuid,

+                                                        &mMmMemoryStatusCodeTable,

+                                                        sizeof (mMmMemoryStatusCodeTable)

+                                                        );

   return Status;

 }

 

-

 /**

   Report status code into runtime memory. If the runtime pool is full, roll back to the

   first record and overwrite it.

@@ -62,19 +61,19 @@ MemoryStatusCodeInitializeWorker (
 EFI_STATUS

 EFIAPI

 MemoryStatusCodeReportWorker (

-  IN EFI_STATUS_CODE_TYPE               CodeType,

-  IN EFI_STATUS_CODE_VALUE              Value,

-  IN UINT32                             Instance,

-  IN EFI_GUID                           *CallerId,

-  IN EFI_STATUS_CODE_DATA               *Data OPTIONAL

+  IN EFI_STATUS_CODE_TYPE   CodeType,

+  IN EFI_STATUS_CODE_VALUE  Value,

+  IN UINT32                 Instance,

+  IN EFI_GUID               *CallerId,

+  IN EFI_STATUS_CODE_DATA   *Data OPTIONAL

   )

 {

-  MEMORY_STATUSCODE_RECORD              *Record;

+  MEMORY_STATUSCODE_RECORD  *Record;

 

   //

   // Locate current record buffer.

   //

-  Record = (MEMORY_STATUSCODE_RECORD *) (mMmMemoryStatusCodeTable + 1);

+  Record = (MEMORY_STATUSCODE_RECORD *)(mMmMemoryStatusCodeTable + 1);

   Record = &Record[mMmMemoryStatusCodeTable->RecordIndex++];

 

   //

@@ -102,6 +101,3 @@ MemoryStatusCodeReportWorker (
 

   return EFI_SUCCESS;

 }

-

-

-

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
index bcb75bc7b1..e994e69e48 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/SerialStatusCodeWorker.c
@@ -30,26 +30,27 @@
 EFI_STATUS

 EFIAPI

 SerialStatusCodeReportWorker (

-  IN EFI_STATUS_CODE_TYPE     CodeType,

-  IN EFI_STATUS_CODE_VALUE    Value,

-  IN UINT32                   Instance,

-  IN EFI_GUID                 *CallerId,

-  IN EFI_STATUS_CODE_DATA     *Data OPTIONAL

+  IN EFI_STATUS_CODE_TYPE   CodeType,

+  IN EFI_STATUS_CODE_VALUE  Value,

+  IN UINT32                 Instance,

+  IN EFI_GUID               *CallerId,

+  IN EFI_STATUS_CODE_DATA   *Data OPTIONAL

   )

 {

-  CHAR8           *Filename;

-  CHAR8           *Description;

-  CHAR8           *Format;

-  CHAR8           Buffer[MAX_DEBUG_MESSAGE_LENGTH];

-  UINT32          ErrorLevel;

-  UINT32          LineNumber;

-  UINTN           CharCount;

-  BASE_LIST       Marker;

+  CHAR8      *Filename;

+  CHAR8      *Description;

+  CHAR8      *Format;

+  CHAR8      Buffer[MAX_DEBUG_MESSAGE_LENGTH];

+  UINT32     ErrorLevel;

+  UINT32     LineNumber;

+  UINTN      CharCount;

+  BASE_LIST  Marker;

 

   Buffer[0] = '\0';

 

-  if (Data != NULL &&

-      ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber)) {

+  if ((Data != NULL) &&

+      ReportStatusCodeExtractAssertInfo (CodeType, Value, Data, &Filename, &Description, &LineNumber))

+  {

     //

     // Print ASSERT() information into output buffer.

     //

@@ -61,8 +62,9 @@ SerialStatusCodeReportWorker (
                   LineNumber,

                   Description

                   );

-  } else if (Data != NULL &&

-             ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format)) {

+  } else if ((Data != NULL) &&

+             ReportStatusCodeExtractDebugInfo (Data, &ErrorLevel, &Marker, &Format))

+  {

     //

     // Print DEBUG() information into output buffer.

     //

@@ -120,9 +122,10 @@ SerialStatusCodeReportWorker (
                   Value,

                   Instance

                   );

-  } else if (Data != NULL &&

+  } else if ((Data != NULL) &&

              CompareGuid (&Data->Type, &gEfiStatusCodeDataTypeStringGuid) &&

-             ((EFI_STATUS_CODE_STRING_DATA *) Data)->StringType == EfiStringAscii) {

+             (((EFI_STATUS_CODE_STRING_DATA *)Data)->StringType == EfiStringAscii))

+  {

     //

     // EFI_STATUS_CODE_STRING_DATA

     //

@@ -130,7 +133,7 @@ SerialStatusCodeReportWorker (
                   Buffer,

                   sizeof (Buffer),

                   "%a",

-                  ((EFI_STATUS_CODE_STRING_DATA *) Data)->String.Ascii

+                  ((EFI_STATUS_CODE_STRING_DATA *)Data)->String.Ascii

                   );

   } else {

     //

@@ -149,8 +152,7 @@ SerialStatusCodeReportWorker (
   //

   // Call SerialPort Lib function to do print.

   //

-  SerialPortWrite ((UINT8 *) Buffer, CharCount);

+  SerialPortWrite ((UINT8 *)Buffer, CharCount);

 

   return EFI_SUCCESS;

 }

-

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerMm.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerMm.c
index 4948d3d99a..6286210aad 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerMm.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerMm.c
@@ -9,8 +9,7 @@
 

 #include "StatusCodeHandlerMm.h"

 

-EFI_MM_RSC_HANDLER_PROTOCOL   *mRscHandlerProtocol       = NULL;

-

+EFI_MM_RSC_HANDLER_PROTOCOL  *mRscHandlerProtocol = NULL;

 

 /**

   Dispatch initialization request to sub status code devices based on

@@ -22,7 +21,7 @@ InitializationDispatcherWorker (
   VOID

   )

 {

-  EFI_STATUS                        Status;

+  EFI_STATUS  Status;

 

   //

   // If enable UseSerial, then initialize serial port.

@@ -35,6 +34,7 @@ InitializationDispatcherWorker (
     Status = SerialPortInitialize ();

     ASSERT_EFI_ERROR (Status);

   }

+

   if (PcdGetBool (PcdStatusCodeUseMemory)) {

     Status = MemoryStatusCodeInitializeWorker ();

     ASSERT_EFI_ERROR (Status);

@@ -54,12 +54,12 @@ StatusCodeHandlerCommonEntry (
   VOID

   )

 {

-  EFI_STATUS                Status;

+  EFI_STATUS  Status;

 

   Status = gMmst->MmLocateProtocol (

                     &gEfiMmRscHandlerProtocolGuid,

                     NULL,

-                    (VOID **) &mRscHandlerProtocol

+                    (VOID **)&mRscHandlerProtocol

                     );

   ASSERT_EFI_ERROR (Status);

 

@@ -71,6 +71,7 @@ StatusCodeHandlerCommonEntry (
   if (PcdGetBool (PcdStatusCodeUseSerial)) {

     mRscHandlerProtocol->Register (SerialStatusCodeReportWorker);

   }

+

   if (PcdGetBool (PcdStatusCodeUseMemory)) {

     mRscHandlerProtocol->Register (MemoryStatusCodeReportWorker);

   }

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerMm.h b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerMm.h
index 7871ee4040..e416220cb5 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerMm.h
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerMm.h
@@ -30,7 +30,7 @@
 //

 // Define the maximum message length

 //

-#define MAX_DEBUG_MESSAGE_LENGTH 0x100

+#define MAX_DEBUG_MESSAGE_LENGTH  0x100

 

 extern RUNTIME_MEMORY_STATUSCODE_HEADER  *mMmMemoryStatusCodeTable;

 

@@ -45,7 +45,6 @@ EfiSerialStatusCodeInitializeWorker (
   VOID

   );

 

-

 /**

   Convert status code value and extended data to readable ASCII string, send string to serial I/O device.

 

@@ -68,11 +67,11 @@ EfiSerialStatusCodeInitializeWorker (
 EFI_STATUS

 EFIAPI

 SerialStatusCodeReportWorker (

-  IN EFI_STATUS_CODE_TYPE     CodeType,

-  IN EFI_STATUS_CODE_VALUE    Value,

-  IN UINT32                   Instance,

-  IN EFI_GUID                 *CallerId,

-  IN EFI_STATUS_CODE_DATA     *Data OPTIONAL

+  IN EFI_STATUS_CODE_TYPE   CodeType,

+  IN EFI_STATUS_CODE_VALUE  Value,

+  IN UINT32                 Instance,

+  IN EFI_GUID               *CallerId,

+  IN EFI_STATUS_CODE_DATA   *Data OPTIONAL

   );

 

 /**

@@ -107,11 +106,11 @@ MemoryStatusCodeInitializeWorker (
 EFI_STATUS

 EFIAPI

 MemoryStatusCodeReportWorker (

-  IN EFI_STATUS_CODE_TYPE               CodeType,

-  IN EFI_STATUS_CODE_VALUE              Value,

-  IN UINT32                             Instance,

-  IN EFI_GUID                           *CallerId,

-  IN EFI_STATUS_CODE_DATA               *Data OPTIONAL

+  IN EFI_STATUS_CODE_TYPE   CodeType,

+  IN EFI_STATUS_CODE_VALUE  Value,

+  IN UINT32                 Instance,

+  IN EFI_GUID               *CallerId,

+  IN EFI_STATUS_CODE_DATA   *Data OPTIONAL

   );

 

 /**

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerTraditional.c b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerTraditional.c
index 1105f184b0..da4982908d 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerTraditional.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerTraditional.c
@@ -23,8 +23,8 @@
 EFI_STATUS

 EFIAPI

 StatusCodeHandlerTraditionalMmEntry (

-  IN EFI_HANDLE         ImageHandle,

-  IN EFI_SYSTEM_TABLE   *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

   return StatusCodeHandlerCommonEntry ();