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>

2 files changed, 94 insertions, 93 deletions

diff --git a/ArmPkg/Library/SemihostLib/SemihostLib.c b/ArmPkg/Library/SemihostLib/SemihostLib.c
index d66de71..9e6fc37 100644
--- a/ArmPkg/Library/SemihostLib/SemihostLib.c
+++ b/ArmPkg/Library/SemihostLib/SemihostLib.c
@@ -23,9 +23,9 @@ SemihostConnectionSupported (
 

 RETURN_STATUS

 SemihostFileOpen (

-  IN  CHAR8  *FileName,

-  IN  UINT32 Mode,

-  OUT UINTN  *FileHandle

+  IN  CHAR8   *FileName,

+  IN  UINT32  Mode,

+  OUT UINTN   *FileHandle

   )

 {

   SEMIHOST_FILE_OPEN_BLOCK  OpenBlock;

@@ -40,9 +40,9 @@ SemihostFileOpen (
     FileName++;

   }

 

-  OpenBlock.FileName    = FileName;

-  OpenBlock.Mode        = Mode;

-  OpenBlock.NameLength  = AsciiStrLen(FileName);

+  OpenBlock.FileName   = FileName;

+  OpenBlock.Mode       = Mode;

+  OpenBlock.NameLength = AsciiStrLen (FileName);

 

   Result = SEMIHOST_SYS_OPEN (&OpenBlock);

 

@@ -124,10 +124,11 @@ SemihostFileWrite (
 

   *Length = SEMIHOST_SYS_WRITE (&WriteBlock);

 

-  if (*Length != 0)

+  if (*Length != 0) {

     return RETURN_ABORTED;

-  else

+  } else {

     return RETURN_SUCCESS;

+  }

 }

 

 RETURN_STATUS

@@ -148,7 +149,7 @@ SemihostFileLength (
   OUT UINTN  *Length

   )

 {

-  INT32       Result;

+  INT32  Result;

 

   if (Length == NULL) {

     return RETURN_INVALID_PARAMETER;

@@ -178,7 +179,7 @@ SemihostFileLength (
 

 **/

 RETURN_STATUS

-SemihostFileTmpName(

+SemihostFileTmpName (

   OUT  VOID   *Buffer,

   IN   UINT8  Identifier,

   IN   UINTN  Length

@@ -198,15 +199,15 @@ SemihostFileTmpName(
   Result = SEMIHOST_SYS_TMPNAME (&TmpNameBlock);

 

   if (Result != 0) {

-    return  RETURN_ABORTED;

+    return RETURN_ABORTED;

   } else {

-    return  RETURN_SUCCESS;

+    return RETURN_SUCCESS;

   }

 }

 

 RETURN_STATUS

 SemihostFileRemove (

-  IN CHAR8 *FileName

+  IN CHAR8  *FileName

   )

 {

   SEMIHOST_FILE_REMOVE_BLOCK  RemoveBlock;

@@ -217,8 +218,8 @@ SemihostFileRemove (
     FileName++;

   }

 

-  RemoveBlock.FileName    = FileName;

-  RemoveBlock.NameLength  = AsciiStrLen(FileName);

+  RemoveBlock.FileName   = FileName;

+  RemoveBlock.NameLength = AsciiStrLen (FileName);

 

   Result = SEMIHOST_SYS_REMOVE (&RemoveBlock);

 

@@ -241,7 +242,7 @@ SemihostFileRemove (
 

 **/

 RETURN_STATUS

-SemihostFileRename(

+SemihostFileRename (

   IN  CHAR8  *FileName,

   IN  CHAR8  *NewFileName

   )

@@ -261,9 +262,9 @@ SemihostFileRename(
   Result = SEMIHOST_SYS_RENAME (&RenameBlock);

 

   if (Result != 0) {

-    return  RETURN_ABORTED;

+    return RETURN_ABORTED;

   } else {

-    return  RETURN_SUCCESS;

+    return RETURN_SUCCESS;

   }

 }

 

@@ -277,7 +278,7 @@ SemihostReadCharacter (
 

 VOID

 SemihostWriteCharacter (

-  IN CHAR8 Character

+  IN CHAR8  Character

   )

 {

   SEMIHOST_SYS_WRITEC (&Character);

@@ -285,7 +286,7 @@ SemihostWriteCharacter (
 

 VOID

 SemihostWriteString (

-  IN CHAR8 *String

+  IN CHAR8  *String

   )

 {

   SEMIHOST_SYS_WRITE0 (String);

@@ -293,13 +294,13 @@ SemihostWriteString (
 

 UINT32

 SemihostSystem (

-  IN CHAR8 *CommandLine

+  IN CHAR8  *CommandLine

   )

 {

-  SEMIHOST_SYSTEM_BLOCK SystemBlock;

+  SEMIHOST_SYSTEM_BLOCK  SystemBlock;

 

   SystemBlock.CommandLine   = CommandLine;

-  SystemBlock.CommandLength = AsciiStrLen(CommandLine);

+  SystemBlock.CommandLength = AsciiStrLen (CommandLine);

 

   return SEMIHOST_SYS_SYSTEM (&SystemBlock);

 }

diff --git a/ArmPkg/Library/SemihostLib/SemihostPrivate.h b/ArmPkg/Library/SemihostLib/SemihostPrivate.h
index 8864726..22abbf3 100644
--- a/ArmPkg/Library/SemihostLib/SemihostPrivate.h
+++ b/ArmPkg/Library/SemihostLib/SemihostPrivate.h
@@ -11,14 +11,14 @@
 #define SEMIHOST_PRIVATE_H_

 

 typedef struct {

-  CHAR8   *FileName;

+  CHAR8    *FileName;

   UINTN    Mode;

   UINTN    NameLength;

 } SEMIHOST_FILE_OPEN_BLOCK;

 

 typedef struct {

   UINTN    Handle;

-  VOID    *Buffer;

+  VOID     *Buffer;

   UINTN    Length;

 } SEMIHOST_FILE_READ_WRITE_BLOCK;

 

@@ -28,127 +28,127 @@ typedef struct {
 } SEMIHOST_FILE_SEEK_BLOCK;

 

 typedef struct {

-  VOID    *Buffer;

+  VOID     *Buffer;

   UINTN    Identifier;

   UINTN    Length;

 } SEMIHOST_FILE_TMPNAME_BLOCK;

 

 typedef struct {

-  CHAR8   *FileName;

+  CHAR8    *FileName;

   UINTN    NameLength;

 } SEMIHOST_FILE_REMOVE_BLOCK;

 

 typedef struct {

-  CHAR8   *FileName;

+  CHAR8    *FileName;

   UINTN    FileNameLength;

-  CHAR8   *NewFileName;

+  CHAR8    *NewFileName;

   UINTN    NewFileNameLength;

 } SEMIHOST_FILE_RENAME_BLOCK;

 

 typedef struct {

-  CHAR8   *CommandLine;

+  CHAR8    *CommandLine;

   UINTN    CommandLength;

 } SEMIHOST_SYSTEM_BLOCK;

 

-#if defined(__CC_ARM)

+#if defined (__CC_ARM)

 

-#if defined(__thumb__)

-#define SWI 0xAB

-#else

-#define SWI 0x123456

-#endif

+  #if defined (__thumb__)

+#define SWI  0xAB

+  #else

+#define SWI  0x123456

+  #endif

 

 #define SEMIHOST_SUPPORTED  TRUE

 

-__swi(SWI)

+__swi (SWI)

 INT32

-_Semihost_SYS_OPEN(

-  IN UINTN                    SWI_0x01,

-  IN SEMIHOST_FILE_OPEN_BLOCK *OpenBlock

+_Semihost_SYS_OPEN (

+  IN UINTN                     SWI_0x01,

+  IN SEMIHOST_FILE_OPEN_BLOCK  *OpenBlock

   );

 

-__swi(SWI)

+__swi (SWI)

 INT32

-_Semihost_SYS_CLOSE(

-  IN UINTN  SWI_0x02,

-  IN UINT32 *Handle

+_Semihost_SYS_CLOSE (

+  IN UINTN   SWI_0x02,

+  IN UINT32  *Handle

   );

 

-__swi(SWI)

+__swi (SWI)

 VOID

-_Semihost_SYS_WRITEC(

-  IN UINTN    SWI_0x03,

-  IN CHAR8    *Character

+_Semihost_SYS_WRITEC (

+  IN UINTN  SWI_0x03,

+  IN CHAR8  *Character

   );

 

-__swi(SWI)

+__swi (SWI)

 VOID

-_Semihost_SYS_WRITE0(

-  IN UINTN SWI_0x04,

-  IN CHAR8 *String

+_Semihost_SYS_WRITE0 (

+  IN UINTN  SWI_0x04,

+  IN CHAR8  *String

   );

 

-__swi(SWI)

+__swi (SWI)

 UINT32

-_Semihost_SYS_WRITE(

-  IN     UINTN                          SWI_0x05,

-  IN OUT SEMIHOST_FILE_READ_WRITE_BLOCK *WriteBlock

+_Semihost_SYS_WRITE (

+  IN     UINTN                           SWI_0x05,

+  IN OUT SEMIHOST_FILE_READ_WRITE_BLOCK  *WriteBlock

   );

 

-__swi(SWI)

+__swi (SWI)

 UINT32

-_Semihost_SYS_READ(

-  IN     UINTN                          SWI_0x06,

-  IN OUT SEMIHOST_FILE_READ_WRITE_BLOCK *ReadBlock

+_Semihost_SYS_READ (

+  IN     UINTN                           SWI_0x06,

+  IN OUT SEMIHOST_FILE_READ_WRITE_BLOCK  *ReadBlock

   );

 

-__swi(SWI)

+__swi (SWI)

 CHAR8

-_Semihost_SYS_READC(

-  IN     UINTN SWI_0x07,

-  IN     UINTN Zero

+_Semihost_SYS_READC (

+  IN     UINTN  SWI_0x07,

+  IN     UINTN  Zero

   );

 

-__swi(SWI)

+__swi (SWI)

 INT32

-_Semihost_SYS_SEEK(

-  IN UINTN                    SWI_0x0A,

-  IN SEMIHOST_FILE_SEEK_BLOCK *SeekBlock

+_Semihost_SYS_SEEK (

+  IN UINTN                     SWI_0x0A,

+  IN SEMIHOST_FILE_SEEK_BLOCK  *SeekBlock

   );

 

-__swi(SWI)

+__swi (SWI)

 INT32

-_Semihost_SYS_FLEN(

-  IN UINTN  SWI_0x0C,

-  IN UINT32 *Handle

+_Semihost_SYS_FLEN (

+  IN UINTN   SWI_0x0C,

+  IN UINT32  *Handle

   );

 

-__swi(SWI)

+__swi (SWI)

 UINT32

-_Semihost_SYS_TMPNAME(

-  IN UINTN                       SWI_0x0D,

-  IN SEMIHOST_FILE_TMPNAME_BLOCK *TmpNameBlock

+_Semihost_SYS_TMPNAME (

+  IN UINTN                        SWI_0x0D,

+  IN SEMIHOST_FILE_TMPNAME_BLOCK  *TmpNameBlock

   );

 

-__swi(SWI)

+__swi (SWI)

 UINT32

-_Semihost_SYS_REMOVE(

-  IN UINTN                      SWI_0x0E,

-  IN SEMIHOST_FILE_REMOVE_BLOCK *RemoveBlock

+_Semihost_SYS_REMOVE (

+  IN UINTN                       SWI_0x0E,

+  IN SEMIHOST_FILE_REMOVE_BLOCK  *RemoveBlock

   );

 

-__swi(SWI)

+__swi (SWI)

 UINT32

-_Semihost_SYS_RENAME(

-  IN UINTN                      SWI_0x0F,

-  IN SEMIHOST_FILE_RENAME_BLOCK *RenameBlock

+_Semihost_SYS_RENAME (

+  IN UINTN                       SWI_0x0F,

+  IN SEMIHOST_FILE_RENAME_BLOCK  *RenameBlock

   );

 

-__swi(SWI)

+__swi (SWI)

 UINT32

-_Semihost_SYS_SYSTEM(

-  IN UINTN                 SWI_0x12,

-  IN SEMIHOST_SYSTEM_BLOCK *SystemBlock

+_Semihost_SYS_SYSTEM (

+  IN UINTN                  SWI_0x12,

+  IN SEMIHOST_SYSTEM_BLOCK  *SystemBlock

   );

 

 #define SEMIHOST_SYS_OPEN(OpenBlock)        _Semihost_SYS_OPEN(0x01, OpenBlock)

@@ -165,14 +165,14 @@ _Semihost_SYS_SYSTEM(
 #define SEMIHOST_SYS_RENAME(RenameBlock)    _Semihost_SYS_RENAME(0x0F, RenameBlock)

 #define SEMIHOST_SYS_SYSTEM(SystemBlock)    _Semihost_SYS_SYSTEM(0x12, SystemBlock)

 

-#elif defined(__GNUC__) // __CC_ARM

+#elif defined (__GNUC__) // __CC_ARM

 

 #define SEMIHOST_SUPPORTED  TRUE

 

 UINT32

 GccSemihostCall (

-  IN UINT32   Operation,

-  IN UINTN    SystemBlockAddress

+  IN UINT32  Operation,

+  IN UINTN   SystemBlockAddress

   ); // __attribute__ ((interrupt ("SVC")));

 

 #define SEMIHOST_SYS_OPEN(OpenBlock)        GccSemihostCall(0x01, (UINTN)(OpenBlock))

@@ -193,8 +193,8 @@ GccSemihostCall (
 

 #define SEMIHOST_SUPPORTED  FALSE

 

-#define SEMIHOST_SYS_OPEN(OpenBlock)        (-1)

-#define SEMIHOST_SYS_CLOSE(Handle)          (-1)

+#define SEMIHOST_SYS_OPEN(OpenBlock)  (-1)

+#define SEMIHOST_SYS_CLOSE(Handle)    (-1)

 #define SEMIHOST_SYS_WRITE0(String)

 #define SEMIHOST_SYS_WRITEC(Character)

 #define SEMIHOST_SYS_WRITE(WriteBlock)      (0)