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>

4 files changed, 69 insertions, 67 deletions

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c
index 9a3431b269..33978209fb 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/MemoryStatusCodeWorker.c
@@ -23,7 +23,7 @@ RtMemoryStatusCodeInitializeWorker (
   VOID

   )

 {

-  EFI_STATUS                        Status;

+  EFI_STATUS  Status;

 

   //

   // Allocate runtime memory status code pool.

@@ -43,7 +43,6 @@ RtMemoryStatusCodeInitializeWorker (
   return Status;

 }

 

-

 /**

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

   first record and overwrite it.

@@ -65,19 +64,19 @@ RtMemoryStatusCodeInitializeWorker (
 EFI_STATUS

 EFIAPI

 RtMemoryStatusCodeReportWorker (

-  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 *) (mRtMemoryStatusCodeTable + 1);

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

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

 

   //

@@ -105,6 +104,3 @@ RtMemoryStatusCodeReportWorker (
 

   return EFI_SUCCESS;

 }

-

-

-

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
index 348f55edba..09ba5d797a 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/SerialStatusCodeWorker.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/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,18 +152,18 @@ SerialStatusCodeReportWorker (
   //

   // Call SerialPort Lib function to do print.

   //

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

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

 

   //

   // If register an unregister function of gEfiEventExitBootServicesGuid,

   // then some log called in ExitBootServices() will be lost,

   // so unregister the handler after receive the value of exit boot service.

   //

-  if ((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE &&

-      Value == (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)) {

-    UnregisterSerialBootTimeHandlers();

+  if (((CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) &&

+      (Value == (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)))

+  {

+    UnregisterSerialBootTimeHandlers ();

   }

 

   return EFI_SUCCESS;

 }

-

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
index d50335af8a..6ef41ce101 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.c
@@ -40,8 +40,8 @@ UnregisterSerialBootTimeHandlers (
 VOID

 EFIAPI

 VirtualAddressChangeCallBack (

-  IN EFI_EVENT        Event,

-  IN VOID             *Context

+  IN EFI_EVENT  Event,

+  IN VOID       *Context

   )

 {

   //

@@ -49,7 +49,7 @@ VirtualAddressChangeCallBack (
   //

   EfiConvertPointer (

     0,

-    (VOID **) &mRtMemoryStatusCodeTable

+    (VOID **)&mRtMemoryStatusCodeTable

     );

 }

 

@@ -63,12 +63,12 @@ InitializationDispatcherWorker (
   VOID

   )

 {

-  EFI_PEI_HOB_POINTERS              Hob;

-  EFI_STATUS                        Status;

-  MEMORY_STATUSCODE_PACKET_HEADER   *PacketHeader;

-  MEMORY_STATUSCODE_RECORD          *Record;

-  UINTN                             Index;

-  UINTN                             MaxRecordNumber;

+  EFI_PEI_HOB_POINTERS             Hob;

+  EFI_STATUS                       Status;

+  MEMORY_STATUSCODE_PACKET_HEADER  *PacketHeader;

+  MEMORY_STATUSCODE_RECORD         *Record;

+  UINTN                            Index;

+  UINTN                            MaxRecordNumber;

 

   //

   // If enable UseSerial, then initialize serial port.

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

     ASSERT_EFI_ERROR (Status);

   }

+

   if (PcdGetBool (PcdStatusCodeUseMemory)) {

     Status = RtMemoryStatusCodeInitializeWorker ();

     ASSERT_EFI_ERROR (Status);

@@ -94,17 +95,18 @@ InitializationDispatcherWorker (
     // Journal GUID'ed HOBs to find all record entry, if found,

     // then output record to support replay device.

     //

-    Hob.Raw   = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);

+    Hob.Raw = GetFirstGuidHob (&gMemoryStatusCodeRecordGuid);

     if (Hob.Raw != NULL) {

-      PacketHeader = (MEMORY_STATUSCODE_PACKET_HEADER *) GET_GUID_HOB_DATA (Hob.Guid);

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

-      MaxRecordNumber = (UINTN) PacketHeader->RecordIndex;

+      PacketHeader    = (MEMORY_STATUSCODE_PACKET_HEADER *)GET_GUID_HOB_DATA (Hob.Guid);

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

+      MaxRecordNumber = (UINTN)PacketHeader->RecordIndex;

       if (PacketHeader->PacketIndex > 0) {

         //

         // Record has been wrapped around. So, record number has arrived at max number.

         //

-        MaxRecordNumber = (UINTN) PacketHeader->MaxRecordsNumber;

+        MaxRecordNumber = (UINTN)PacketHeader->MaxRecordsNumber;

       }

+

       for (Index = 0; Index < MaxRecordNumber; Index++) {

         //

         // Dispatch records to devices based on feature flag.

@@ -118,6 +120,7 @@ InitializationDispatcherWorker (
             NULL

             );

         }

+

         if (PcdGetBool (PcdStatusCodeUseMemory)) {

           RtMemoryStatusCodeReportWorker (

             Record[Index].CodeType,

@@ -147,16 +150,16 @@ InitializationDispatcherWorker (
 EFI_STATUS

 EFIAPI

 StatusCodeHandlerRuntimeDxeEntry (

-  IN EFI_HANDLE         ImageHandle,

-  IN EFI_SYSTEM_TABLE   *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS                Status;

+  EFI_STATUS  Status;

 

   Status = gBS->LocateProtocol (

                   &gEfiRscHandlerProtocolGuid,

                   NULL,

-                  (VOID **) &mRscHandlerProtocol

+                  (VOID **)&mRscHandlerProtocol

                   );

   ASSERT_EFI_ERROR (Status);

 

@@ -168,6 +171,7 @@ StatusCodeHandlerRuntimeDxeEntry (
   if (PcdGetBool (PcdStatusCodeUseSerial)) {

     mRscHandlerProtocol->Register (SerialStatusCodeReportWorker, TPL_HIGH_LEVEL);

   }

+

   if (PcdGetBool (PcdStatusCodeUseMemory)) {

     mRscHandlerProtocol->Register (RtMemoryStatusCodeReportWorker, TPL_HIGH_LEVEL);

   }

diff --git a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h
index a2cf2ae0b7..7fa06389bb 100644
--- a/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h
+++ b/MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.h
@@ -33,7 +33,7 @@
 //

 // Define the maximum message length

 //

-#define MAX_DEBUG_MESSAGE_LENGTH 0x100

+#define MAX_DEBUG_MESSAGE_LENGTH  0x100

 

 extern RUNTIME_MEMORY_STATUSCODE_HEADER  *mRtMemoryStatusCodeTable;

 

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

   );

 

-

 /**

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

 

@@ -71,11 +70,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

   );

 

 /**

@@ -111,11 +110,11 @@ RtMemoryStatusCodeInitializeWorker (
 EFI_STATUS

 EFIAPI

 RtMemoryStatusCodeReportWorker (

-  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

   );

 

 /**