ArmPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the ArmPkg 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: Andrew Fish <afish@apple.com>

1 files changed, 61 insertions, 61 deletions

diff --git a/ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c b/ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c
index cc223d6720..12a7e6df5d 100644
--- a/ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c
+++ b/ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c
@@ -28,11 +28,11 @@
 STATIC

 UINT64

 ConvertTo64Bit (

-  IN UINT32 Low,

-  IN UINT32 High

+  IN UINT32  Low,

+  IN UINT32  High

   )

 {

-   return (Low | ((UINT64)High << 32));

+  return (Low | ((UINT64)High << 32));

 }

 

 /** Return version of the clock management protocol supported by SCP firmware.

@@ -74,7 +74,7 @@ ClockGetTotalClocks (
   )

 {

   EFI_STATUS  Status;

-  UINT32     *ReturnValues;

+  UINT32      *ReturnValues;

 

   Status = ScmiGetProtocolAttributes (ScmiProtocolIdClock, &ReturnValues);

   if (EFI_ERROR (Status)) {

@@ -108,12 +108,12 @@ ClockGetClockAttributes (
   OUT CHAR8                *ClockAsciiName

   )

 {

-  EFI_STATUS          Status;

+  EFI_STATUS  Status;

 

-  UINT32              *MessageParams;

-  CLOCK_ATTRIBUTES    *ClockAttributes;

-  SCMI_COMMAND        Cmd;

-  UINT32              PayloadLength;

+  UINT32            *MessageParams;

+  CLOCK_ATTRIBUTES  *ClockAttributes;

+  SCMI_COMMAND      Cmd;

+  UINT32            PayloadLength;

 

   Status = ScmiCommandGetPayload (&MessageParams);

   if (EFI_ERROR (Status)) {

@@ -130,18 +130,19 @@ ClockGetClockAttributes (
   Status = ScmiCommandExecute (

              &Cmd,

              &PayloadLength,

-             (UINT32**)&ClockAttributes

+             (UINT32 **)&ClockAttributes

              );

   if (EFI_ERROR (Status)) {

     return Status;

   }

-   // TRUE if bit 0 of ClockAttributes->Attributes is set.

+

+  // TRUE if bit 0 of ClockAttributes->Attributes is set.

   *Enabled = CLOCK_ENABLED (ClockAttributes->Attributes);

 

   AsciiStrCpyS (

     ClockAsciiName,

     SCMI_MAX_STR_LEN,

-    (CONST CHAR8*)ClockAttributes->ClockName

+    (CONST CHAR8 *)ClockAttributes->ClockName

     );

 

   return EFI_SUCCESS;

@@ -174,29 +175,29 @@ STATIC
 EFI_STATUS

 ClockDescribeRates (

   IN     SCMI_CLOCK_PROTOCOL     *This,

-  IN     UINT32                   ClockId,

+  IN     UINT32                  ClockId,

   OUT    SCMI_CLOCK_RATE_FORMAT  *Format,

   OUT    UINT32                  *TotalRates,

   IN OUT UINT32                  *RateArraySize,

   OUT    SCMI_CLOCK_RATE         *RateArray

   )

 {

-  EFI_STATUS             Status;

+  EFI_STATUS  Status;

 

-  UINT32                 PayloadLength;

-  SCMI_COMMAND           Cmd;

-  UINT32                 *MessageParams;

-  CLOCK_DESCRIBE_RATES   *DescribeRates;

-  CLOCK_RATE_DWORD       *Rate;

+  UINT32                PayloadLength;

+  SCMI_COMMAND          Cmd;

+  UINT32                *MessageParams;

+  CLOCK_DESCRIBE_RATES  *DescribeRates;

+  CLOCK_RATE_DWORD      *Rate;

 

-  UINT32                 RequiredArraySize;

-  UINT32                 RateIndex;

-  UINT32                 RateNo;

-  UINT32                 RateOffset;

+  UINT32  RequiredArraySize;

+  UINT32  RateIndex;

+  UINT32  RateNo;

+  UINT32  RateOffset;

 

-  *TotalRates = 0;

+  *TotalRates       = 0;

   RequiredArraySize = 0;

-  RateIndex = 0;

+  RateIndex         = 0;

 

   Status = ScmiCommandGetPayload (&MessageParams);

   if (EFI_ERROR (Status)) {

@@ -206,20 +207,19 @@ ClockDescribeRates (
   Cmd.ProtocolId = ScmiProtocolIdClock;

   Cmd.MessageId  = ScmiMessageIdClockDescribeRates;

 

-  *MessageParams++  = ClockId;

+  *MessageParams++ = ClockId;

 

   do {

-

     *MessageParams = RateIndex;

 

     // Set Payload length, note PayloadLength is a IN/OUT parameter.

-    PayloadLength  = sizeof (ClockId) + sizeof (RateIndex);

+    PayloadLength = sizeof (ClockId) + sizeof (RateIndex);

 

     // Execute and wait for response on a SCMI channel.

     Status = ScmiCommandExecute (

                &Cmd,

                &PayloadLength,

-               (UINT32**)&DescribeRates

+               (UINT32 **)&DescribeRates

                );

     if (EFI_ERROR (Status)) {

       return Status;

@@ -237,10 +237,10 @@ ClockDescribeRates (
                     + NUM_REMAIN_RATES (DescribeRates->NumRatesFlags);

 

       if (*Format == ScmiClockRateFormatDiscrete) {

-         RequiredArraySize = (*TotalRates) * sizeof (UINT64);

+        RequiredArraySize = (*TotalRates) * sizeof (UINT64);

       } else {

-         // We need to return triplet of 64 bit value for each rate

-         RequiredArraySize = (*TotalRates) * 3 * sizeof (UINT64);

+        // We need to return triplet of 64 bit value for each rate

+        RequiredArraySize = (*TotalRates) * 3 * sizeof (UINT64);

       }

 

       if (RequiredArraySize > (*RateArraySize)) {

@@ -262,7 +262,7 @@ ClockDescribeRates (
       for (RateNo = 0; RateNo < NUM_RATES (DescribeRates->NumRatesFlags); RateNo++) {

         // Linear clock rates from minimum to maximum in steps

         // Minimum clock rate.

-        Rate = &DescribeRates->Rates[RateOffset++];

+        Rate                                    = &DescribeRates->Rates[RateOffset++];

         RateArray[RateIndex].ContinuousRate.Min =

           ConvertTo64Bit (Rate->Low, Rate->High);

 

@@ -304,13 +304,13 @@ ClockRateGet (
   OUT UINT64               *Rate

   )

 {

-  EFI_STATUS     Status;

+  EFI_STATUS  Status;

 

   UINT32            *MessageParams;

   CLOCK_RATE_DWORD  *ClockRate;

   SCMI_COMMAND      Cmd;

 

-  UINT32         PayloadLength;

+  UINT32  PayloadLength;

 

   Status = ScmiCommandGetPayload (&MessageParams);

   if (EFI_ERROR (Status)) {

@@ -318,10 +318,10 @@ ClockRateGet (
   }

 

   // Fill arguments for clock protocol command.

-  *MessageParams  = ClockId;

+  *MessageParams = ClockId;

 

-  Cmd.ProtocolId  = ScmiProtocolIdClock;

-  Cmd.MessageId   = ScmiMessageIdClockRateGet;

+  Cmd.ProtocolId = ScmiProtocolIdClock;

+  Cmd.MessageId  = ScmiMessageIdClockRateGet;

 

   PayloadLength = sizeof (ClockId);

 

@@ -329,7 +329,7 @@ ClockRateGet (
   Status = ScmiCommandExecute (

              &Cmd,

              &PayloadLength,

-             (UINT32**)&ClockRate

+             (UINT32 **)&ClockRate

              );

   if (EFI_ERROR (Status)) {

     return Status;

@@ -358,21 +358,21 @@ ClockRateSet (
   IN UINT64               Rate

   )

 {

-  EFI_STATUS                  Status;

-  CLOCK_RATE_SET_ATTRIBUTES   *ClockRateSetAttributes;

-  SCMI_COMMAND                Cmd;

-  UINT32                      PayloadLength;

+  EFI_STATUS                 Status;

+  CLOCK_RATE_SET_ATTRIBUTES  *ClockRateSetAttributes;

+  SCMI_COMMAND               Cmd;

+  UINT32                     PayloadLength;

 

-  Status = ScmiCommandGetPayload ((UINT32**)&ClockRateSetAttributes);

+  Status = ScmiCommandGetPayload ((UINT32 **)&ClockRateSetAttributes);

   if (EFI_ERROR (Status)) {

     return Status;

   }

 

   // Fill arguments for clock protocol command.

-  ClockRateSetAttributes->ClockId    = ClockId;

-  ClockRateSetAttributes->Flags      = CLOCK_SET_DEFAULT_FLAGS;

-  ClockRateSetAttributes->Rate.Low   = (UINT32)Rate;

-  ClockRateSetAttributes->Rate.High  = (UINT32)(Rate >> 32);

+  ClockRateSetAttributes->ClockId   = ClockId;

+  ClockRateSetAttributes->Flags     = CLOCK_SET_DEFAULT_FLAGS;

+  ClockRateSetAttributes->Rate.Low  = (UINT32)Rate;

+  ClockRateSetAttributes->Rate.High = (UINT32)(Rate >> 32);

 

   Cmd.ProtocolId = ScmiProtocolIdClock;

   Cmd.MessageId  = ScmiMessageIdClockRateSet;

@@ -402,17 +402,17 @@ ClockRateSet (
 STATIC

 EFI_STATUS

 ClockEnable (

-  IN SCMI_CLOCK2_PROTOCOL *This,

-  IN UINT32               ClockId,

-  IN BOOLEAN              Enable

+  IN SCMI_CLOCK2_PROTOCOL  *This,

+  IN UINT32                ClockId,

+  IN BOOLEAN               Enable

   )

 {

-  EFI_STATUS                  Status;

-  CLOCK_CONFIG_SET_ATTRIBUTES *ClockConfigSetAttributes;

-  SCMI_COMMAND                Cmd;

-  UINT32                      PayloadLength;

+  EFI_STATUS                   Status;

+  CLOCK_CONFIG_SET_ATTRIBUTES  *ClockConfigSetAttributes;

+  SCMI_COMMAND                 Cmd;

+  UINT32                       PayloadLength;

 

-  Status = ScmiCommandGetPayload ((UINT32**)&ClockConfigSetAttributes);

+  Status = ScmiCommandGetPayload ((UINT32 **)&ClockConfigSetAttributes);

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -437,17 +437,17 @@ ClockEnable (
 }

 

 // Instance of the SCMI clock management protocol.

-STATIC CONST SCMI_CLOCK_PROTOCOL ScmiClockProtocol = {

+STATIC CONST SCMI_CLOCK_PROTOCOL  ScmiClockProtocol = {

   ClockGetVersion,

   ClockGetTotalClocks,

   ClockGetClockAttributes,

   ClockDescribeRates,

   ClockRateGet,

   ClockRateSet

- };

+};

 

 // Instance of the SCMI clock management protocol.

-STATIC CONST SCMI_CLOCK2_PROTOCOL ScmiClock2Protocol = {

+STATIC CONST SCMI_CLOCK2_PROTOCOL  ScmiClock2Protocol = {

   (SCMI_CLOCK2_GET_VERSION)ClockGetVersion,

   (SCMI_CLOCK2_GET_TOTAL_CLOCKS)ClockGetTotalClocks,

   (SCMI_CLOCK2_GET_CLOCK_ATTRIBUTES)ClockGetClockAttributes,

@@ -456,7 +456,7 @@ STATIC CONST SCMI_CLOCK2_PROTOCOL ScmiClock2Protocol = {
   (SCMI_CLOCK2_RATE_SET)ClockRateSet,

   SCMI_CLOCK2_PROTOCOL_VERSION,

   ClockEnable

- };

+};

 

 /** Initialize clock management protocol and install protocol on a given handle.

 

@@ -466,7 +466,7 @@ STATIC CONST SCMI_CLOCK2_PROTOCOL ScmiClock2Protocol = {
 **/

 EFI_STATUS

 ScmiClockProtocolInit (

-  IN EFI_HANDLE* Handle

+  IN EFI_HANDLE  *Handle

   )

 {

   return gBS->InstallMultipleProtocolInterfaces (