UefiCpuPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the UefiCpuPkg 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: Ray Ni <ray.ni@intel.com>

2 files changed, 114 insertions, 111 deletions

diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPei.c b/UefiCpuPkg/CpuIoPei/CpuIoPei.c
index 98bae46e29..0d0fe3d4bc 100644
--- a/UefiCpuPkg/CpuIoPei/CpuIoPei.c
+++ b/UefiCpuPkg/CpuIoPei/CpuIoPei.c
@@ -43,7 +43,7 @@ EFI_PEI_CPU_IO_PPI  gCpuIoPpi = {
 //

 // PPI Descriptor used to install the CPU I/O PPI

 //

-EFI_PEI_PPI_DESCRIPTOR gPpiList = {

+EFI_PEI_PPI_DESCRIPTOR  gPpiList = {

   (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

   &gEfiPeiCpuIoPpiInstalledGuid,

   NULL

@@ -52,7 +52,7 @@ EFI_PEI_PPI_DESCRIPTOR gPpiList = {
 //

 // Lookup table for increment values based on transfer widths

 //

-UINT8 mInStride[] = {

+UINT8  mInStride[] = {

   1, // EfiPeiCpuIoWidthUint8

   2, // EfiPeiCpuIoWidthUint16

   4, // EfiPeiCpuIoWidthUint32

@@ -70,7 +70,7 @@ UINT8 mInStride[] = {
 //

 // Lookup table for increment values based on transfer widths

 //

-UINT8 mOutStride[] = {

+UINT8  mOutStride[] = {

   1, // EfiPeiCpuIoWidthUint8

   2, // EfiPeiCpuIoWidthUint16

   4, // EfiPeiCpuIoWidthUint32

@@ -131,14 +131,14 @@ CpuIoCheckParameter (
   // For FIFO type, the target address won't increase during the access,

   // so treat Count as 1

   //

-  if (Width >= EfiPeiCpuIoWidthFifoUint8 && Width <= EfiPeiCpuIoWidthFifoUint64) {

+  if ((Width >= EfiPeiCpuIoWidthFifoUint8) && (Width <= EfiPeiCpuIoWidthFifoUint64)) {

     Count = 1;

   }

 

   //

   // Check to see if Width is in the valid range for I/O Port operations

   //

-  Width = (EFI_PEI_CPU_IO_PPI_WIDTH) (Width & 0x03);

+  Width = (EFI_PEI_CPU_IO_PPI_WIDTH)(Width & 0x03);

   if (!MmioOperation && (Width == EfiPeiCpuIoWidthUint64)) {

     return EFI_INVALID_PARAMETER;

   }

@@ -168,6 +168,7 @@ CpuIoCheckParameter (
     if (MaxCount < (Count - 1)) {

       return EFI_UNSUPPORTED;

     }

+

     if (Address > LShiftU64 (MaxCount - Count + 1, Width)) {

       return EFI_UNSUPPORTED;

     }

@@ -220,10 +221,10 @@ CpuMemoryServiceRead (
   //

   // Select loop based on the width of the transfer

   //

-  InStride = mInStride[Width];

-  OutStride = mOutStride[Width];

-  OperationWidth = (EFI_PEI_CPU_IO_PPI_WIDTH) (Width & 0x03);

-  Aligned = (BOOLEAN)(((UINTN)Buffer & (mInStride[OperationWidth] - 1)) == 0x00);

+  InStride       = mInStride[Width];

+  OutStride      = mOutStride[Width];

+  OperationWidth = (EFI_PEI_CPU_IO_PPI_WIDTH)(Width & 0x03);

+  Aligned        = (BOOLEAN)(((UINTN)Buffer & (mInStride[OperationWidth] - 1)) == 0x00);

   for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {

     if (OperationWidth == EfiPeiCpuIoWidthUint8) {

       *Uint8Buffer = MmioRead8 ((UINTN)Address);

@@ -247,6 +248,7 @@ CpuMemoryServiceRead (
       }

     }

   }

+

   return EFI_SUCCESS;

 }

 

@@ -294,10 +296,10 @@ CpuMemoryServiceWrite (
   //

   // Select loop based on the width of the transfer

   //

-  InStride = mInStride[Width];

-  OutStride = mOutStride[Width];

-  OperationWidth = (EFI_PEI_CPU_IO_PPI_WIDTH) (Width & 0x03);

-  Aligned = (BOOLEAN)(((UINTN)Buffer & (mInStride[OperationWidth] - 1)) == 0x00);

+  InStride       = mInStride[Width];

+  OutStride      = mOutStride[Width];

+  OperationWidth = (EFI_PEI_CPU_IO_PPI_WIDTH)(Width & 0x03);

+  Aligned        = (BOOLEAN)(((UINTN)Buffer & (mInStride[OperationWidth] - 1)) == 0x00);

   for (Uint8Buffer = Buffer; Count > 0; Address += InStride, Uint8Buffer += OutStride, Count--) {

     if (OperationWidth == EfiPeiCpuIoWidthUint8) {

       MmioWrite8 ((UINTN)Address, *Uint8Buffer);

@@ -321,6 +323,7 @@ CpuMemoryServiceWrite (
       }

     }

   }

+

   return EFI_SUCCESS;

 }

 

@@ -368,31 +371,31 @@ CpuIoServiceRead (
   //

   // Select loop based on the width of the transfer

   //

-  InStride = mInStride[Width];

-  OutStride = mOutStride[Width];

-  OperationWidth = (EFI_PEI_CPU_IO_PPI_WIDTH) (Width & 0x03);

+  InStride       = mInStride[Width];

+  OutStride      = mOutStride[Width];

+  OperationWidth = (EFI_PEI_CPU_IO_PPI_WIDTH)(Width & 0x03);

 

   //

   // Fifo operations supported for (mInStride[Width] == 0)

   //

   if (InStride == 0) {

     switch (OperationWidth) {

-    case EfiPeiCpuIoWidthUint8:

-      IoReadFifo8 ((UINTN)Address, Count, Buffer);

-      return EFI_SUCCESS;

-    case EfiPeiCpuIoWidthUint16:

-      IoReadFifo16 ((UINTN)Address, Count, Buffer);

-      return EFI_SUCCESS;

-    case EfiPeiCpuIoWidthUint32:

-      IoReadFifo32 ((UINTN)Address, Count, Buffer);

-      return EFI_SUCCESS;

-    default:

-      //

-      // The CpuIoCheckParameter call above will ensure that this

-      // path is not taken.

-      //

-      ASSERT (FALSE);

-      break;

+      case EfiPeiCpuIoWidthUint8:

+        IoReadFifo8 ((UINTN)Address, Count, Buffer);

+        return EFI_SUCCESS;

+      case EfiPeiCpuIoWidthUint16:

+        IoReadFifo16 ((UINTN)Address, Count, Buffer);

+        return EFI_SUCCESS;

+      case EfiPeiCpuIoWidthUint32:

+        IoReadFifo32 ((UINTN)Address, Count, Buffer);

+        return EFI_SUCCESS;

+      default:

+        //

+        // The CpuIoCheckParameter call above will ensure that this

+        // path is not taken.

+        //

+        ASSERT (FALSE);

+        break;

     }

   }

 

@@ -465,31 +468,31 @@ CpuIoServiceWrite (
   //

   // Select loop based on the width of the transfer

   //

-  InStride = mInStride[Width];

-  OutStride = mOutStride[Width];

-  OperationWidth = (EFI_PEI_CPU_IO_PPI_WIDTH) (Width & 0x03);

+  InStride       = mInStride[Width];

+  OutStride      = mOutStride[Width];

+  OperationWidth = (EFI_PEI_CPU_IO_PPI_WIDTH)(Width & 0x03);

 

   //

   // Fifo operations supported for (mInStride[Width] == 0)

   //

   if (InStride == 0) {

     switch (OperationWidth) {

-    case EfiPeiCpuIoWidthUint8:

-      IoWriteFifo8 ((UINTN)Address, Count, Buffer);

-      return EFI_SUCCESS;

-    case EfiPeiCpuIoWidthUint16:

-      IoWriteFifo16 ((UINTN)Address, Count, Buffer);

-      return EFI_SUCCESS;

-    case EfiPeiCpuIoWidthUint32:

-      IoWriteFifo32 ((UINTN)Address, Count, Buffer);

-      return EFI_SUCCESS;

-    default:

-      //

-      // The CpuIoCheckParameter call above will ensure that this

-      // path is not taken.

-      //

-      ASSERT (FALSE);

-      break;

+      case EfiPeiCpuIoWidthUint8:

+        IoWriteFifo8 ((UINTN)Address, Count, Buffer);

+        return EFI_SUCCESS;

+      case EfiPeiCpuIoWidthUint16:

+        IoWriteFifo16 ((UINTN)Address, Count, Buffer);

+        return EFI_SUCCESS;

+      case EfiPeiCpuIoWidthUint32:

+        IoWriteFifo32 ((UINTN)Address, Count, Buffer);

+        return EFI_SUCCESS;

+      default:

+        //

+        // The CpuIoCheckParameter call above will ensure that this

+        // path is not taken.

+        //

+        ASSERT (FALSE);

+        break;

     }

   }

 

@@ -572,9 +575,9 @@ CpuIoRead16 (
 UINT32

 EFIAPI

 CpuIoRead32 (

-  IN CONST EFI_PEI_SERVICES     **PeiServices,

-  IN CONST EFI_PEI_CPU_IO_PPI   *This,

-  IN UINT64                     Address

+  IN CONST EFI_PEI_SERVICES    **PeiServices,

+  IN CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN UINT64                    Address

   )

 {

   return IoRead32 ((UINTN)Address);

diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPei.h b/UefiCpuPkg/CpuIoPei/CpuIoPei.h
index e8676df906..eb1982f947 100644
--- a/UefiCpuPkg/CpuIoPei/CpuIoPei.h
+++ b/UefiCpuPkg/CpuIoPei/CpuIoPei.h
@@ -18,7 +18,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/IoLib.h>

 #include <Library/PeiServicesLib.h>

 

-#define MAX_IO_PORT_ADDRESS   0xFFFF

+#define MAX_IO_PORT_ADDRESS  0xFFFF

 

 /**

   Reads memory-mapped registers.

@@ -149,9 +149,9 @@ CpuIoServiceWrite (
 UINT8

 EFIAPI

 CpuIoRead8 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address

   );

 

 /**

@@ -168,9 +168,9 @@ CpuIoRead8 (
 UINT16

 EFIAPI

 CpuIoRead16 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address

   );

 

 /**

@@ -187,9 +187,9 @@ CpuIoRead16 (
 UINT32

 EFIAPI

 CpuIoRead32 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address

   );

 

 /**

@@ -206,9 +206,9 @@ CpuIoRead32 (
 UINT64

 EFIAPI

 CpuIoRead64 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address

   );

 

 /**

@@ -224,10 +224,10 @@ CpuIoRead64 (
 VOID

 EFIAPI

 CpuIoWrite8 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address,

-  IN  UINT8                       Data

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address,

+  IN  UINT8                     Data

   );

 

 /**

@@ -243,10 +243,10 @@ CpuIoWrite8 (
 VOID

 EFIAPI

 CpuIoWrite16 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address,

-  IN  UINT16                      Data

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address,

+  IN  UINT16                    Data

   );

 

 /**

@@ -262,10 +262,10 @@ CpuIoWrite16 (
 VOID

 EFIAPI

 CpuIoWrite32 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address,

-  IN  UINT32                      Data

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address,

+  IN  UINT32                    Data

   );

 

 /**

@@ -281,10 +281,10 @@ CpuIoWrite32 (
 VOID

 EFIAPI

 CpuIoWrite64 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address,

-  IN  UINT64                      Data

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address,

+  IN  UINT64                    Data

   );

 

 /**

@@ -301,9 +301,9 @@ CpuIoWrite64 (
 UINT8

 EFIAPI

 CpuMemRead8 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address

   );

 

 /**

@@ -320,9 +320,9 @@ CpuMemRead8 (
 UINT16

 EFIAPI

 CpuMemRead16 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address

   );

 

 /**

@@ -339,9 +339,9 @@ CpuMemRead16 (
 UINT32

 EFIAPI

 CpuMemRead32 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address

   );

 

 /**

@@ -358,9 +358,9 @@ CpuMemRead32 (
 UINT64

 EFIAPI

 CpuMemRead64 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address

   );

 

 /**

@@ -376,10 +376,10 @@ CpuMemRead64 (
 VOID

 EFIAPI

 CpuMemWrite8 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address,

-  IN  UINT8                       Data

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address,

+  IN  UINT8                     Data

   );

 

 /**

@@ -395,10 +395,10 @@ CpuMemWrite8 (
 VOID

 EFIAPI

 CpuMemWrite16 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address,

-  IN  UINT16                      Data

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address,

+  IN  UINT16                    Data

   );

 

 /**

@@ -414,10 +414,10 @@ CpuMemWrite16 (
 VOID

 EFIAPI

 CpuMemWrite32 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address,

-  IN  UINT32                      Data

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address,

+  IN  UINT32                    Data

   );

 

 /**

@@ -433,10 +433,10 @@ CpuMemWrite32 (
 VOID

 EFIAPI

 CpuMemWrite64 (

-  IN  CONST EFI_PEI_SERVICES      **PeiServices,

-  IN  CONST EFI_PEI_CPU_IO_PPI    *This,

-  IN  UINT64                      Address,

-  IN  UINT64                      Data

+  IN  CONST EFI_PEI_SERVICES    **PeiServices,

+  IN  CONST EFI_PEI_CPU_IO_PPI  *This,

+  IN  UINT64                    Address,

+  IN  UINT64                    Data

   );

 

 #endif