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>

diff --git a/ArmPkg/Library/SemihostLib/SemihostLib.c b/ArmPkg/Library/SemihostLib/SemihostLib.c
index a75d45850d437e3804950db18fefb3ea0cef010f..d66de71182c8f44ba63548e5f1442042f8d4b6f3 100644 (file)
--- a/ArmPkg/Library/SemihostLib/SemihostLib.c
+++ b/ArmPkg/Library/SemihostLib/SemihostLib.c
@@ -44,7 +44,7 @@ SemihostFileOpen (
   OpenBlock.Mode        = Mode;\r
   OpenBlock.NameLength  = AsciiStrLen(FileName);\r
 \r
-  Result = Semihost_SYS_OPEN(&OpenBlock);\r
+  Result = SEMIHOST_SYS_OPEN (&OpenBlock);\r
 \r
   if (Result == -1) {\r
     return RETURN_NOT_FOUND;\r
@@ -66,7 +66,7 @@ SemihostFileSeek (
   SeekBlock.Handle   = FileHandle;\r
   SeekBlock.Location = Offset;\r
 \r
-  Result = Semihost_SYS_SEEK(&SeekBlock);\r
+  Result = SEMIHOST_SYS_SEEK (&SeekBlock);\r
 \r
   // Semihosting does not behave as documented. It returns the offset on\r
   // success.\r
@@ -95,7 +95,7 @@ SemihostFileRead (
   ReadBlock.Buffer = Buffer;\r
   ReadBlock.Length = *Length;\r
 \r
-  Result = Semihost_SYS_READ(&ReadBlock);\r
+  Result = SEMIHOST_SYS_READ (&ReadBlock);\r
 \r
   if ((*Length != 0) && (Result == *Length)) {\r
     return RETURN_ABORTED;\r
@@ -122,7 +122,7 @@ SemihostFileWrite (
   WriteBlock.Buffer = Buffer;\r
   WriteBlock.Length = *Length;\r
 \r
-  *Length = Semihost_SYS_WRITE(&WriteBlock);\r
+  *Length = SEMIHOST_SYS_WRITE (&WriteBlock);\r
 \r
   if (*Length != 0)\r
     return RETURN_ABORTED;\r
@@ -135,7 +135,7 @@ SemihostFileClose (
   IN UINTN  FileHandle\r
   )\r
 {\r
-  if (Semihost_SYS_CLOSE (&FileHandle) == -1) {\r
+  if (SEMIHOST_SYS_CLOSE (&FileHandle) == -1) {\r
     return RETURN_INVALID_PARAMETER;\r
   } else {\r
     return RETURN_SUCCESS;\r
@@ -154,7 +154,7 @@ SemihostFileLength (
     return RETURN_INVALID_PARAMETER;\r
   }\r
 \r
-  Result = Semihost_SYS_FLEN(&FileHandle);\r
+  Result = SEMIHOST_SYS_FLEN (&FileHandle);\r
 \r
   if (Result == -1) {\r
     return RETURN_ABORTED;\r
@@ -195,7 +195,7 @@ SemihostFileTmpName(
   TmpNameBlock.Identifier = Identifier;\r
   TmpNameBlock.Length     = Length;\r
 \r
-  Result = Semihost_SYS_TMPNAME (&TmpNameBlock);\r
+  Result = SEMIHOST_SYS_TMPNAME (&TmpNameBlock);\r
 \r
   if (Result != 0) {\r
     return  RETURN_ABORTED;\r
@@ -220,7 +220,7 @@ SemihostFileRemove (
   RemoveBlock.FileName    = FileName;\r
   RemoveBlock.NameLength  = AsciiStrLen(FileName);\r
 \r
-  Result = Semihost_SYS_REMOVE(&RemoveBlock);\r
+  Result = SEMIHOST_SYS_REMOVE (&RemoveBlock);\r
 \r
   if (Result == 0) {\r
     return RETURN_SUCCESS;\r
@@ -258,7 +258,7 @@ SemihostFileRename(
   RenameBlock.NewFileName       = NewFileName;\r
   RenameBlock.NewFileNameLength = AsciiStrLen (NewFileName);\r
 \r
-  Result = Semihost_SYS_RENAME (&RenameBlock);\r
+  Result = SEMIHOST_SYS_RENAME (&RenameBlock);\r
 \r
   if (Result != 0) {\r
     return  RETURN_ABORTED;\r
@@ -272,7 +272,7 @@ SemihostReadCharacter (
   VOID\r
   )\r
 {\r
-  return Semihost_SYS_READC();\r
+  return SEMIHOST_SYS_READC ();\r
 }\r
 \r
 VOID\r
@@ -280,7 +280,7 @@ SemihostWriteCharacter (
   IN CHAR8 Character\r
   )\r
 {\r
-  Semihost_SYS_WRITEC(&Character);\r
+  SEMIHOST_SYS_WRITEC (&Character);\r
 }\r
 \r
 VOID\r
@@ -288,7 +288,7 @@ SemihostWriteString (
   IN CHAR8 *String\r
   )\r
 {\r
-  Semihost_SYS_WRITE0(String);\r
+  SEMIHOST_SYS_WRITE0 (String);\r
 }\r
 \r
 UINT32\r
@@ -301,5 +301,5 @@ SemihostSystem (
   SystemBlock.CommandLine   = CommandLine;\r
   SystemBlock.CommandLength = AsciiStrLen(CommandLine);\r
 \r
-  return Semihost_SYS_SYSTEM(&SystemBlock);\r
+  return SEMIHOST_SYS_SYSTEM (&SystemBlock);\r
 }\r

diff --git a/ArmPkg/Library/SemihostLib/SemihostPrivate.h b/ArmPkg/Library/SemihostLib/SemihostPrivate.h
index 8d1fc6d6eb5aee89dbcef1b0135cf5405c2e39cb..30103b04b53f0234288afa385c0befe0e26e3bde 100644 (file)
--- a/ArmPkg/Library/SemihostLib/SemihostPrivate.h
+++ b/ArmPkg/Library/SemihostLib/SemihostPrivate.h
@@ -1,7 +1,7 @@
 /** @file\r
 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-  Copyright (c) 2013 - 2014, ARM Ltd. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2021, Arm Limited. All rights reserved.<BR>\r
 \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
@@ -151,19 +151,19 @@ _Semihost_SYS_SYSTEM(
   IN SEMIHOST_SYSTEM_BLOCK *SystemBlock\r
   );\r
 \r
-#define Semihost_SYS_OPEN(OpenBlock)        _Semihost_SYS_OPEN(0x01, OpenBlock)\r
-#define Semihost_SYS_CLOSE(Handle)          _Semihost_SYS_CLOSE(0x02, Handle)\r
-#define Semihost_SYS_WRITE0(String)         _Semihost_SYS_WRITE0(0x04, String)\r
-#define Semihost_SYS_WRITEC(Character)      _Semihost_SYS_WRITEC(0x03, Character)\r
-#define Semihost_SYS_WRITE(WriteBlock)      _Semihost_SYS_WRITE(0x05, WriteBlock)\r
-#define Semihost_SYS_READ(ReadBlock)        _Semihost_SYS_READ(0x06, ReadBlock)\r
-#define Semihost_SYS_READC()                _Semihost_SYS_READC(0x07, 0)\r
-#define Semihost_SYS_SEEK(SeekBlock)        _Semihost_SYS_SEEK(0x0A, SeekBlock)\r
-#define Semihost_SYS_FLEN(Handle)           _Semihost_SYS_FLEN(0x0C, Handle)\r
-#define Semihost_SYS_TMPNAME(TmpNameBlock)  _Semihost_SYS_TMPNAME(0x0D, TmpNameBlock)\r
-#define Semihost_SYS_REMOVE(RemoveBlock)    _Semihost_SYS_REMOVE(0x0E, RemoveBlock)\r
-#define Semihost_SYS_RENAME(RenameBlock)    _Semihost_SYS_RENAME(0x0F, RenameBlock)\r
-#define Semihost_SYS_SYSTEM(SystemBlock)    _Semihost_SYS_SYSTEM(0x12, SystemBlock)\r
+#define SEMIHOST_SYS_OPEN(OpenBlock)        _Semihost_SYS_OPEN(0x01, OpenBlock)\r
+#define SEMIHOST_SYS_CLOSE(Handle)          _Semihost_SYS_CLOSE(0x02, Handle)\r
+#define SEMIHOST_SYS_WRITE0(String)         _Semihost_SYS_WRITE0(0x04, String)\r
+#define SEMIHOST_SYS_WRITEC(Character)      _Semihost_SYS_WRITEC(0x03, Character)\r
+#define SEMIHOST_SYS_WRITE(WriteBlock)      _Semihost_SYS_WRITE(0x05, WriteBlock)\r
+#define SEMIHOST_SYS_READ(ReadBlock)        _Semihost_SYS_READ(0x06, ReadBlock)\r
+#define SEMIHOST_SYS_READC()                _Semihost_SYS_READC(0x07, 0)\r
+#define SEMIHOST_SYS_SEEK(SeekBlock)        _Semihost_SYS_SEEK(0x0A, SeekBlock)\r
+#define SEMIHOST_SYS_FLEN(Handle)           _Semihost_SYS_FLEN(0x0C, Handle)\r
+#define SEMIHOST_SYS_TMPNAME(TmpNameBlock)  _Semihost_SYS_TMPNAME(0x0D, TmpNameBlock)\r
+#define SEMIHOST_SYS_REMOVE(RemoveBlock)    _Semihost_SYS_REMOVE(0x0E, RemoveBlock)\r
+#define SEMIHOST_SYS_RENAME(RenameBlock)    _Semihost_SYS_RENAME(0x0F, RenameBlock)\r
+#define SEMIHOST_SYS_SYSTEM(SystemBlock)    _Semihost_SYS_SYSTEM(0x12, SystemBlock)\r
 \r
 #elif defined(__GNUC__) // __CC_ARM\r
 \r
@@ -175,37 +175,37 @@ GccSemihostCall (
   IN UINTN    SystemBlockAddress\r
   ); // __attribute__ ((interrupt ("SVC")));\r
 \r
-#define Semihost_SYS_OPEN(OpenBlock)        GccSemihostCall(0x01, (UINTN)(OpenBlock))\r
-#define Semihost_SYS_CLOSE(Handle)          GccSemihostCall(0x02, (UINTN)(Handle))\r
-#define Semihost_SYS_WRITE0(String)         GccSemihostCall(0x04, (UINTN)(String))\r
-#define Semihost_SYS_WRITEC(Character)      GccSemihostCall(0x03, (UINTN)(Character))\r
-#define Semihost_SYS_WRITE(WriteBlock)      GccSemihostCall(0x05, (UINTN)(WriteBlock))\r
-#define Semihost_SYS_READ(ReadBlock)        GccSemihostCall(0x06, (UINTN)(ReadBlock))\r
-#define Semihost_SYS_READC()                GccSemihostCall(0x07, (UINTN)(0))\r
-#define Semihost_SYS_SEEK(SeekBlock)        GccSemihostCall(0x0A, (UINTN)(SeekBlock))\r
-#define Semihost_SYS_FLEN(Handle)           GccSemihostCall(0x0C, (UINTN)(Handle))\r
-#define Semihost_SYS_TMPNAME(TmpNameBlock)  GccSemihostCall(0x0D, (UINTN)(TmpNameBlock))\r
-#define Semihost_SYS_REMOVE(RemoveBlock)    GccSemihostCall(0x0E, (UINTN)(RemoveBlock))\r
-#define Semihost_SYS_RENAME(RenameBlock)    GccSemihostCall(0x0F, (UINTN)(RenameBlock))\r
-#define Semihost_SYS_SYSTEM(SystemBlock)    GccSemihostCall(0x12, (UINTN)(SystemBlock))\r
+#define SEMIHOST_SYS_OPEN(OpenBlock)        GccSemihostCall(0x01, (UINTN)(OpenBlock))\r
+#define SEMIHOST_SYS_CLOSE(Handle)          GccSemihostCall(0x02, (UINTN)(Handle))\r
+#define SEMIHOST_SYS_WRITE0(String)         GccSemihostCall(0x04, (UINTN)(String))\r
+#define SEMIHOST_SYS_WRITEC(Character)      GccSemihostCall(0x03, (UINTN)(Character))\r
+#define SEMIHOST_SYS_WRITE(WriteBlock)      GccSemihostCall(0x05, (UINTN)(WriteBlock))\r
+#define SEMIHOST_SYS_READ(ReadBlock)        GccSemihostCall(0x06, (UINTN)(ReadBlock))\r
+#define SEMIHOST_SYS_READC()                GccSemihostCall(0x07, (UINTN)(0))\r
+#define SEMIHOST_SYS_SEEK(SeekBlock)        GccSemihostCall(0x0A, (UINTN)(SeekBlock))\r
+#define SEMIHOST_SYS_FLEN(Handle)           GccSemihostCall(0x0C, (UINTN)(Handle))\r
+#define SEMIHOST_SYS_TMPNAME(TmpNameBlock)  GccSemihostCall(0x0D, (UINTN)(TmpNameBlock))\r
+#define SEMIHOST_SYS_REMOVE(RemoveBlock)    GccSemihostCall(0x0E, (UINTN)(RemoveBlock))\r
+#define SEMIHOST_SYS_RENAME(RenameBlock)    GccSemihostCall(0x0F, (UINTN)(RenameBlock))\r
+#define SEMIHOST_SYS_SYSTEM(SystemBlock)    GccSemihostCall(0x12, (UINTN)(SystemBlock))\r
 \r
 #else // __CC_ARM\r
 \r
 #define SEMIHOST_SUPPORTED  FALSE\r
 \r
-#define Semihost_SYS_OPEN(OpenBlock)        (-1)\r
-#define Semihost_SYS_CLOSE(Handle)          (-1)\r
-#define Semihost_SYS_WRITE0(String)\r
-#define Semihost_SYS_WRITEC(Character)\r
-#define Semihost_SYS_WRITE(WriteBlock)      (0)\r
-#define Semihost_SYS_READ(ReadBlock)        ((ReadBlock)->Length)\r
-#define Semihost_SYS_READC()                ('x')\r
-#define Semihost_SYS_SEEK(SeekBlock)        (-1)\r
-#define Semihost_SYS_FLEN(Handle)           (-1)\r
-#define Semihost_SYS_TMPNAME(TmpNameBlock)  (-1)\r
-#define Semihost_SYS_REMOVE(RemoveBlock)    (-1)\r
-#define Semihost_SYS_RENAME(RenameBlock)    (-1)\r
-#define Semihost_SYS_SYSTEM(SystemBlock)    (-1)\r
+#define SEMIHOST_SYS_OPEN(OpenBlock)        (-1)\r
+#define SEMIHOST_SYS_CLOSE(Handle)          (-1)\r
+#define SEMIHOST_SYS_WRITE0(String)\r
+#define SEMIHOST_SYS_WRITEC(Character)\r
+#define SEMIHOST_SYS_WRITE(WriteBlock)      (0)\r
+#define SEMIHOST_SYS_READ(ReadBlock)        ((ReadBlock)->Length)\r
+#define SEMIHOST_SYS_READC()                ('x')\r
+#define SEMIHOST_SYS_SEEK(SeekBlock)        (-1)\r
+#define SEMIHOST_SYS_FLEN(Handle)           (-1)\r
+#define SEMIHOST_SYS_TMPNAME(TmpNameBlock)  (-1)\r
+#define SEMIHOST_SYS_REMOVE(RemoveBlock)    (-1)\r
+#define SEMIHOST_SYS_RENAME(RenameBlock)    (-1)\r
+#define SEMIHOST_SYS_SYSTEM(SystemBlock)    (-1)\r
 \r
 #endif // __CC_ARM\r
 \r