EmulatorPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the EmulatorPkg 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>

1 files changed, 52 insertions, 56 deletions

diff --git a/EmulatorPkg/CpuRuntimeDxe/Cpu.c b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
index 00e93016af..e00f6cf35f 100644
--- a/EmulatorPkg/CpuRuntimeDxe/Cpu.c
+++ b/EmulatorPkg/CpuRuntimeDxe/Cpu.c
@@ -11,7 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 UINT64  mTimerPeriod;

 

-CPU_ARCH_PROTOCOL_PRIVATE mCpuTemplate = {

+CPU_ARCH_PROTOCOL_PRIVATE  mCpuTemplate = {

   CPU_ARCH_PROT_PRIVATE_SIGNATURE,

   NULL,

   {

@@ -39,16 +39,16 @@ CPU_ARCH_PROTOCOL_PRIVATE mCpuTemplate = {
   TRUE

 };

 

-#define EFI_CPU_DATA_MAXIMUM_LENGTH 0x100

+#define EFI_CPU_DATA_MAXIMUM_LENGTH  0x100

 

-SMBIOS_TABLE_TYPE4 mCpuSmbiosType4 = {

-  { EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION, sizeof (SMBIOS_TABLE_TYPE4), 0},

+SMBIOS_TABLE_TYPE4  mCpuSmbiosType4 = {

+  { EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION, sizeof (SMBIOS_TABLE_TYPE4), 0 },

   1,                    // Socket String

   ProcessorOther,       // ProcessorType;          ///< The enumeration value from PROCESSOR_TYPE_DATA.

   ProcessorFamilyOther, // ProcessorFamily;        ///< The enumeration value from PROCESSOR_FAMILY_DATA.

   2,                    // ProcessorManufacture String;

   {                     // ProcessorId;

-    {  // PROCESSOR_SIGNATURE

+    {    // PROCESSOR_SIGNATURE

       0, //  ProcessorSteppingId:4;

       0, //  ProcessorModel:     4;

       0, //  ProcessorFamily:    4;

@@ -58,7 +58,7 @@ SMBIOS_TABLE_TYPE4 mCpuSmbiosType4 = {
       0, //  ProcessorXFamily:   8;

       0, //  ProcessorReserved2: 4;

     },

-    {  // PROCESSOR_FEATURE_FLAGS

+    {    // PROCESSOR_FEATURE_FLAGS

       0, //  ProcessorFpu       :1;

       0, //  ProcessorVme       :1;

       0, //  ProcessorDe        :1;

@@ -93,7 +93,7 @@ SMBIOS_TABLE_TYPE4 mCpuSmbiosType4 = {
     }

   },

   3,                    // ProcessorVersion String;

-  {                     // Voltage;

+  {     // Voltage;

     1,  // ProcessorVoltageCapability5V        :1;

     1,  // ProcessorVoltageCapability3_3V      :1;

     1,  // ProcessorVoltageCapability2_9V      :1;

@@ -119,7 +119,7 @@ SMBIOS_TABLE_TYPE4 mCpuSmbiosType4 = {
   0,                      // ProcessorFamily2;

 };

 

-CHAR8 *mCpuSmbiosType4Strings[] = {

+CHAR8  *mCpuSmbiosType4Strings[] = {

   "Socket",

   "http://www.tianocore.org/edk2/",

   "Emulated Processor",

@@ -129,7 +129,6 @@ CHAR8 *mCpuSmbiosType4Strings[] = {
   NULL

 };

 

-

 /**

   Create SMBIOS record.

 

@@ -159,18 +158,18 @@ CHAR8 *mCpuSmbiosType4Strings[] = {
 **/

 EFI_STATUS

 LogSmbiosData (

-  IN  EFI_SMBIOS_TABLE_HEADER *Template,

-  IN  CHAR8                   **StringPack

+  IN  EFI_SMBIOS_TABLE_HEADER  *Template,

+  IN  CHAR8                    **StringPack

   )

 {

-  EFI_STATUS                Status;

-  EFI_SMBIOS_PROTOCOL       *Smbios;

-  EFI_SMBIOS_HANDLE         SmbiosHandle;

-  EFI_SMBIOS_TABLE_HEADER   *Record;

-  UINTN                     Index;

-  UINTN                     StringSize;

-  UINTN                     Size;

-  CHAR8                     *Str;

+  EFI_STATUS               Status;

+  EFI_SMBIOS_PROTOCOL      *Smbios;

+  EFI_SMBIOS_HANDLE        SmbiosHandle;

+  EFI_SMBIOS_TABLE_HEADER  *Record;

+  UINTN                    Index;

+  UINTN                    StringSize;

+  UINTN                    Size;

+  CHAR8                    *Str;

 

   //

   // Locate Smbios protocol.

@@ -188,12 +187,14 @@ LogSmbiosData (
   } else {

     for (Index = 0; StringPack[Index] != NULL; Index++) {

       StringSize = AsciiStrSize (StringPack[Index]);

-      Size += StringSize;

+      Size      += StringSize;

     }

+

     if (StringPack[0] == NULL) {

       // At least a double null is required

       Size += 1;

     }

+

     // Don't forget the terminating double null

     Size += 1;

   }

@@ -203,6 +204,7 @@ LogSmbiosData (
   if (Record == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

+

   CopyMem (Record, Template, Template->Length);

 

   // Append string pack

@@ -212,32 +214,30 @@ LogSmbiosData (
     CopyMem (Str, StringPack[Index], StringSize);

     Str += StringSize;

   }

+

   *Str = 0;

 

   SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;

-  Status = Smbios->Add (

-                     Smbios,

-                     gImageHandle,

-                     &SmbiosHandle,

-                     Record

-                     );

+  Status       = Smbios->Add (

+                           Smbios,

+                           gImageHandle,

+                           &SmbiosHandle,

+                           Record

+                           );

   ASSERT_EFI_ERROR (Status);

 

   FreePool (Record);

   return Status;

 }

 

-

-

-

 VOID

 CpuUpdateSmbios (

   IN UINTN  MaxCpus

   )

 {

-  mCpuSmbiosType4.CoreCount        = (UINT8) MaxCpus;

-  mCpuSmbiosType4.EnabledCoreCount = (UINT8) MaxCpus;

-  mCpuSmbiosType4.ThreadCount      = (UINT8) MaxCpus;

+  mCpuSmbiosType4.CoreCount        = (UINT8)MaxCpus;

+  mCpuSmbiosType4.EnabledCoreCount = (UINT8)MaxCpus;

+  mCpuSmbiosType4.ThreadCount      = (UINT8)MaxCpus;

   //

   // The value of 1234 is fake value for CPU frequency

   //

@@ -245,7 +245,6 @@ CpuUpdateSmbios (
   LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mCpuSmbiosType4, mCpuSmbiosType4Strings);

 }

 

-

 //

 // Service routines for the driver

 //

@@ -265,6 +264,7 @@ EmuFlushCpuDataCache (
     //

     return EFI_SUCCESS;

   }

+

   //

   // Other flush types are not supported by Emu emulator

   //

@@ -277,7 +277,7 @@ EmuEnableInterrupt (
   IN EFI_CPU_ARCH_PROTOCOL  *This

   )

 {

-  CPU_ARCH_PROTOCOL_PRIVATE *Private;

+  CPU_ARCH_PROTOCOL_PRIVATE  *Private;

 

   Private                 = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);

   Private->InterruptState = TRUE;

@@ -291,7 +291,7 @@ EmuDisableInterrupt (
   IN EFI_CPU_ARCH_PROTOCOL  *This

   )

 {

-  CPU_ARCH_PROTOCOL_PRIVATE *Private;

+  CPU_ARCH_PROTOCOL_PRIVATE  *Private;

 

   Private                 = CPU_ARCH_PROTOCOL_PRIVATE_DATA_FROM_THIS (This);

   Private->InterruptState = FALSE;

@@ -306,7 +306,7 @@ EmuGetInterruptState (
   OUT BOOLEAN               *State

   )

 {

-  CPU_ARCH_PROTOCOL_PRIVATE *Private;

+  CPU_ARCH_PROTOCOL_PRIVATE  *Private;

 

   if (State == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -338,9 +338,10 @@ EmuRegisterInterruptHandler (
   //

   // Do parameter checking for EFI spec conformance

   //

-  if (InterruptType < 0 || InterruptType > 0xff) {

+  if ((InterruptType < 0) || (InterruptType > 0xff)) {

     return EFI_UNSUPPORTED;

   }

+

   //

   // Do nothing for Emu emulation

   //

@@ -350,10 +351,10 @@ EmuRegisterInterruptHandler (
 EFI_STATUS

 EFIAPI

 EmuGetTimerValue (

-  IN  EFI_CPU_ARCH_PROTOCOL *This,

-  IN  UINT32                TimerIndex,

-  OUT UINT64                *TimerValue,

-  OUT UINT64                *TimerPeriod OPTIONAL

+  IN  EFI_CPU_ARCH_PROTOCOL  *This,

+  IN  UINT32                 TimerIndex,

+  OUT UINT64                 *TimerValue,

+  OUT UINT64                 *TimerPeriod OPTIONAL

   )

 {

   if (TimerValue == NULL) {

@@ -373,7 +374,6 @@ EmuGetTimerValue (
   return EFI_SUCCESS;

 }

 

-

 EFI_STATUS

 EFIAPI

 EmuSetMemoryAttributes (

@@ -396,9 +396,6 @@ EmuSetMemoryAttributes (
   return EFI_UNSUPPORTED;

 }

 

-

-

-

 /**

   Callback function for idle events.

 

@@ -410,14 +407,13 @@ EmuSetMemoryAttributes (
 VOID

 EFIAPI

 IdleLoopEventCallback (

-  IN EFI_EVENT                Event,

-  IN VOID                     *Context

+  IN EFI_EVENT  Event,

+  IN VOID       *Context

   )

 {

   gEmuThunk->CpuSleep ();

 }

 

-

 EFI_STATUS

 EFIAPI

 InitializeCpu (

@@ -425,10 +421,10 @@ InitializeCpu (
   IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS    Status;

-  UINT64        Frequency;

-  EFI_EVENT     IdleLoopEvent;

-  UINTN         MaxCpu;

+  EFI_STATUS  Status;

+  UINT64      Frequency;

+  EFI_EVENT   IdleLoopEvent;

+  UINTN       MaxCpu;

 

   //

   // Retrieve the frequency of the performance counter in Hz.

@@ -444,7 +440,6 @@ InitializeCpu (
 

   CpuUpdateSmbios (MaxCpu);

 

-

   Status = gBS->CreateEventEx (

                   EVT_NOTIFY_SIGNAL,

                   TPL_NOTIFY,

@@ -455,11 +450,12 @@ InitializeCpu (
                   );

   ASSERT_EFI_ERROR (Status);

 

-

   Status = gBS->InstallMultipleProtocolInterfaces (

                   &mCpuTemplate.Handle,

-                  &gEfiCpuArchProtocolGuid,   &mCpuTemplate.Cpu,

-                  &gEfiCpuIo2ProtocolGuid,    &mCpuTemplate.CpuIo,

+                  &gEfiCpuArchProtocolGuid,

+                  &mCpuTemplate.Cpu,

+                  &gEfiCpuIo2ProtocolGuid,

+                  &mCpuTemplate.CpuIo,

                   NULL

                   );

   ASSERT_EFI_ERROR (Status);