ArmPkg: Fix Ecc error 8001 in SemihostLib

This patch fixes the following Ecc reported error:
Only capital letters are allowed to be used
for #define declarations

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

2 files changed, 53 insertions, 53 deletions

diff --git a/ArmPkg/Library/SemihostLib/SemihostLib.c b/ArmPkg/Library/SemihostLib/SemihostLib.c
index a75d45850d..d66de71182 100644
--- a/ArmPkg/Library/SemihostLib/SemihostLib.c
+++ b/ArmPkg/Library/SemihostLib/SemihostLib.c
@@ -44,7 +44,7 @@ SemihostFileOpen (
   OpenBlock.Mode        = Mode;

   OpenBlock.NameLength  = AsciiStrLen(FileName);

 

-  Result = Semihost_SYS_OPEN(&OpenBlock);

+  Result = SEMIHOST_SYS_OPEN (&OpenBlock);

 

   if (Result == -1) {

     return RETURN_NOT_FOUND;

@@ -66,7 +66,7 @@ SemihostFileSeek (
   SeekBlock.Handle   = FileHandle;

   SeekBlock.Location = Offset;

 

-  Result = Semihost_SYS_SEEK(&SeekBlock);

+  Result = SEMIHOST_SYS_SEEK (&SeekBlock);

 

   // Semihosting does not behave as documented. It returns the offset on

   // success.

@@ -95,7 +95,7 @@ SemihostFileRead (
   ReadBlock.Buffer = Buffer;

   ReadBlock.Length = *Length;

 

-  Result = Semihost_SYS_READ(&ReadBlock);

+  Result = SEMIHOST_SYS_READ (&ReadBlock);

 

   if ((*Length != 0) && (Result == *Length)) {

     return RETURN_ABORTED;

@@ -122,7 +122,7 @@ SemihostFileWrite (
   WriteBlock.Buffer = Buffer;

   WriteBlock.Length = *Length;

 

-  *Length = Semihost_SYS_WRITE(&WriteBlock);

+  *Length = SEMIHOST_SYS_WRITE (&WriteBlock);

 

   if (*Length != 0)

     return RETURN_ABORTED;

@@ -135,7 +135,7 @@ SemihostFileClose (
   IN UINTN  FileHandle

   )

 {

-  if (Semihost_SYS_CLOSE (&FileHandle) == -1) {

+  if (SEMIHOST_SYS_CLOSE (&FileHandle) == -1) {

     return RETURN_INVALID_PARAMETER;

   } else {

     return RETURN_SUCCESS;

@@ -154,7 +154,7 @@ SemihostFileLength (
     return RETURN_INVALID_PARAMETER;

   }

 

-  Result = Semihost_SYS_FLEN(&FileHandle);

+  Result = SEMIHOST_SYS_FLEN (&FileHandle);

 

   if (Result == -1) {

     return RETURN_ABORTED;

@@ -195,7 +195,7 @@ SemihostFileTmpName(
   TmpNameBlock.Identifier = Identifier;

   TmpNameBlock.Length     = Length;

 

-  Result = Semihost_SYS_TMPNAME (&TmpNameBlock);

+  Result = SEMIHOST_SYS_TMPNAME (&TmpNameBlock);

 

   if (Result != 0) {

     return  RETURN_ABORTED;

@@ -220,7 +220,7 @@ SemihostFileRemove (
   RemoveBlock.FileName    = FileName;

   RemoveBlock.NameLength  = AsciiStrLen(FileName);

 

-  Result = Semihost_SYS_REMOVE(&RemoveBlock);

+  Result = SEMIHOST_SYS_REMOVE (&RemoveBlock);

 

   if (Result == 0) {

     return RETURN_SUCCESS;

@@ -258,7 +258,7 @@ SemihostFileRename(
   RenameBlock.NewFileName       = NewFileName;

   RenameBlock.NewFileNameLength = AsciiStrLen (NewFileName);

 

-  Result = Semihost_SYS_RENAME (&RenameBlock);

+  Result = SEMIHOST_SYS_RENAME (&RenameBlock);

 

   if (Result != 0) {

     return  RETURN_ABORTED;

@@ -272,7 +272,7 @@ SemihostReadCharacter (
   VOID

   )

 {

-  return Semihost_SYS_READC();

+  return SEMIHOST_SYS_READC ();

 }

 

 VOID

@@ -280,7 +280,7 @@ SemihostWriteCharacter (
   IN CHAR8 Character

   )

 {

-  Semihost_SYS_WRITEC(&Character);

+  SEMIHOST_SYS_WRITEC (&Character);

 }

 

 VOID

@@ -288,7 +288,7 @@ SemihostWriteString (
   IN CHAR8 *String

   )

 {

-  Semihost_SYS_WRITE0(String);

+  SEMIHOST_SYS_WRITE0 (String);

 }

 

 UINT32

@@ -301,5 +301,5 @@ SemihostSystem (
   SystemBlock.CommandLine   = CommandLine;

   SystemBlock.CommandLength = AsciiStrLen(CommandLine);

 

-  return Semihost_SYS_SYSTEM(&SystemBlock);

+  return SEMIHOST_SYS_SYSTEM (&SystemBlock);

 }

diff --git a/ArmPkg/Library/SemihostLib/SemihostPrivate.h b/ArmPkg/Library/SemihostLib/SemihostPrivate.h
index 8d1fc6d6eb..30103b04b5 100644
--- a/ArmPkg/Library/SemihostLib/SemihostPrivate.h
+++ b/ArmPkg/Library/SemihostLib/SemihostPrivate.h
@@ -1,7 +1,7 @@
 /** @file

 

   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-  Copyright (c) 2013 - 2014, ARM Ltd. All rights reserved.<BR>

+  Copyright (c) 2013 - 2021, Arm Limited. All rights reserved.<BR>

 

   SPDX-License-Identifier: BSD-2-Clause-Patent

 

@@ -151,19 +151,19 @@ _Semihost_SYS_SYSTEM(
   IN SEMIHOST_SYSTEM_BLOCK *SystemBlock

   );

 

-#define Semihost_SYS_OPEN(OpenBlock)        _Semihost_SYS_OPEN(0x01, OpenBlock)

-#define Semihost_SYS_CLOSE(Handle)          _Semihost_SYS_CLOSE(0x02, Handle)

-#define Semihost_SYS_WRITE0(String)         _Semihost_SYS_WRITE0(0x04, String)

-#define Semihost_SYS_WRITEC(Character)      _Semihost_SYS_WRITEC(0x03, Character)

-#define Semihost_SYS_WRITE(WriteBlock)      _Semihost_SYS_WRITE(0x05, WriteBlock)

-#define Semihost_SYS_READ(ReadBlock)        _Semihost_SYS_READ(0x06, ReadBlock)

-#define Semihost_SYS_READC()                _Semihost_SYS_READC(0x07, 0)

-#define Semihost_SYS_SEEK(SeekBlock)        _Semihost_SYS_SEEK(0x0A, SeekBlock)

-#define Semihost_SYS_FLEN(Handle)           _Semihost_SYS_FLEN(0x0C, Handle)

-#define Semihost_SYS_TMPNAME(TmpNameBlock)  _Semihost_SYS_TMPNAME(0x0D, TmpNameBlock)

-#define Semihost_SYS_REMOVE(RemoveBlock)    _Semihost_SYS_REMOVE(0x0E, RemoveBlock)

-#define Semihost_SYS_RENAME(RenameBlock)    _Semihost_SYS_RENAME(0x0F, RenameBlock)

-#define Semihost_SYS_SYSTEM(SystemBlock)    _Semihost_SYS_SYSTEM(0x12, SystemBlock)

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

+#define SEMIHOST_SYS_CLOSE(Handle)          _Semihost_SYS_CLOSE(0x02, Handle)

+#define SEMIHOST_SYS_WRITE0(String)         _Semihost_SYS_WRITE0(0x04, String)

+#define SEMIHOST_SYS_WRITEC(Character)      _Semihost_SYS_WRITEC(0x03, Character)

+#define SEMIHOST_SYS_WRITE(WriteBlock)      _Semihost_SYS_WRITE(0x05, WriteBlock)

+#define SEMIHOST_SYS_READ(ReadBlock)        _Semihost_SYS_READ(0x06, ReadBlock)

+#define SEMIHOST_SYS_READC()                _Semihost_SYS_READC(0x07, 0)

+#define SEMIHOST_SYS_SEEK(SeekBlock)        _Semihost_SYS_SEEK(0x0A, SeekBlock)

+#define SEMIHOST_SYS_FLEN(Handle)           _Semihost_SYS_FLEN(0x0C, Handle)

+#define SEMIHOST_SYS_TMPNAME(TmpNameBlock)  _Semihost_SYS_TMPNAME(0x0D, TmpNameBlock)

+#define SEMIHOST_SYS_REMOVE(RemoveBlock)    _Semihost_SYS_REMOVE(0x0E, RemoveBlock)

+#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

 

@@ -175,37 +175,37 @@ GccSemihostCall (
   IN UINTN    SystemBlockAddress

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

 

-#define Semihost_SYS_OPEN(OpenBlock)        GccSemihostCall(0x01, (UINTN)(OpenBlock))

-#define Semihost_SYS_CLOSE(Handle)          GccSemihostCall(0x02, (UINTN)(Handle))

-#define Semihost_SYS_WRITE0(String)         GccSemihostCall(0x04, (UINTN)(String))

-#define Semihost_SYS_WRITEC(Character)      GccSemihostCall(0x03, (UINTN)(Character))

-#define Semihost_SYS_WRITE(WriteBlock)      GccSemihostCall(0x05, (UINTN)(WriteBlock))

-#define Semihost_SYS_READ(ReadBlock)        GccSemihostCall(0x06, (UINTN)(ReadBlock))

-#define Semihost_SYS_READC()                GccSemihostCall(0x07, (UINTN)(0))

-#define Semihost_SYS_SEEK(SeekBlock)        GccSemihostCall(0x0A, (UINTN)(SeekBlock))

-#define Semihost_SYS_FLEN(Handle)           GccSemihostCall(0x0C, (UINTN)(Handle))

-#define Semihost_SYS_TMPNAME(TmpNameBlock)  GccSemihostCall(0x0D, (UINTN)(TmpNameBlock))

-#define Semihost_SYS_REMOVE(RemoveBlock)    GccSemihostCall(0x0E, (UINTN)(RemoveBlock))

-#define Semihost_SYS_RENAME(RenameBlock)    GccSemihostCall(0x0F, (UINTN)(RenameBlock))

-#define Semihost_SYS_SYSTEM(SystemBlock)    GccSemihostCall(0x12, (UINTN)(SystemBlock))

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

+#define SEMIHOST_SYS_CLOSE(Handle)          GccSemihostCall(0x02, (UINTN)(Handle))

+#define SEMIHOST_SYS_WRITE0(String)         GccSemihostCall(0x04, (UINTN)(String))

+#define SEMIHOST_SYS_WRITEC(Character)      GccSemihostCall(0x03, (UINTN)(Character))

+#define SEMIHOST_SYS_WRITE(WriteBlock)      GccSemihostCall(0x05, (UINTN)(WriteBlock))

+#define SEMIHOST_SYS_READ(ReadBlock)        GccSemihostCall(0x06, (UINTN)(ReadBlock))

+#define SEMIHOST_SYS_READC()                GccSemihostCall(0x07, (UINTN)(0))

+#define SEMIHOST_SYS_SEEK(SeekBlock)        GccSemihostCall(0x0A, (UINTN)(SeekBlock))

+#define SEMIHOST_SYS_FLEN(Handle)           GccSemihostCall(0x0C, (UINTN)(Handle))

+#define SEMIHOST_SYS_TMPNAME(TmpNameBlock)  GccSemihostCall(0x0D, (UINTN)(TmpNameBlock))

+#define SEMIHOST_SYS_REMOVE(RemoveBlock)    GccSemihostCall(0x0E, (UINTN)(RemoveBlock))

+#define SEMIHOST_SYS_RENAME(RenameBlock)    GccSemihostCall(0x0F, (UINTN)(RenameBlock))

+#define SEMIHOST_SYS_SYSTEM(SystemBlock)    GccSemihostCall(0x12, (UINTN)(SystemBlock))

 

 #else // __CC_ARM

 

 #define SEMIHOST_SUPPORTED  FALSE

 

-#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)

-#define Semihost_SYS_READ(ReadBlock)        ((ReadBlock)->Length)

-#define Semihost_SYS_READC()                ('x')

-#define Semihost_SYS_SEEK(SeekBlock)        (-1)

-#define Semihost_SYS_FLEN(Handle)           (-1)

-#define Semihost_SYS_TMPNAME(TmpNameBlock)  (-1)

-#define Semihost_SYS_REMOVE(RemoveBlock)    (-1)

-#define Semihost_SYS_RENAME(RenameBlock)    (-1)

-#define Semihost_SYS_SYSTEM(SystemBlock)    (-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)

+#define SEMIHOST_SYS_READ(ReadBlock)        ((ReadBlock)->Length)

+#define SEMIHOST_SYS_READC()                ('x')

+#define SEMIHOST_SYS_SEEK(SeekBlock)        (-1)

+#define SEMIHOST_SYS_FLEN(Handle)           (-1)

+#define SEMIHOST_SYS_TMPNAME(TmpNameBlock)  (-1)

+#define SEMIHOST_SYS_REMOVE(RemoveBlock)    (-1)

+#define SEMIHOST_SYS_RENAME(RenameBlock)    (-1)

+#define SEMIHOST_SYS_SYSTEM(SystemBlock)    (-1)

 

 #endif // __CC_ARM