From: "PierreGondois" <pierre.gondois@arm.com>
To: devel@edk2.groups.io, ardb+tianocore@kernel.org,
leif@nuviainc.com, sami.mujawar@arm.com
Subject: [PATCH v3 02/26] ArmPkg: Fix Ecc error 8001 in SemihostLib
Date: Tue, 23 Feb 2021 13:13:42 +0000 [thread overview]
Message-ID: <20210223131406.3484-3-Pierre.Gondois@arm.com> (raw)
In-Reply-To: <20210223131406.3484-1-Pierre.Gondois@arm.com>
From: Pierre Gondois <Pierre.Gondois@arm.com>
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>
---
The changes can be seen at: https://github.com/PierreARM/edk2/tree/1552_Ecc_ArmPkg_BIS_v3
ArmPkg/Library/SemihostLib/SemihostLib.c | 26 +++----
ArmPkg/Library/SemihostLib/SemihostPrivate.h | 80 ++++++++++----------
2 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/ArmPkg/Library/SemihostLib/SemihostLib.c b/ArmPkg/Library/SemihostLib/SemihostLib.c
index a75d45850d43..d66de71182c8 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 8d1fc6d6eb5a..30103b04b53f 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
--
2.17.1
next prev parent reply other threads:[~2021-02-23 13:14 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-23 13:13 [PATCH v3 00/26] Fix Ecc reported errors in ArmPkg PierreGondois
2021-02-23 13:13 ` [PATCH v3 01/26] ArmPkg: Fix Ecc error 8001 in Chipset PierreGondois
2021-02-23 13:13 ` PierreGondois [this message]
2021-02-23 13:13 ` [PATCH v3 03/26] ArmPkg: Fix Ecc error 8001 in ArmArchTimerLib PierreGondois
2021-02-23 13:13 ` [PATCH v3 04/26] ArmPkg: Fix Ecc error 9005 in CpuDxe PierreGondois
2021-02-23 13:13 ` [PATCH v3 05/26] ArmPkg: Fix Ecc error 10006 in ArmPkg.dsc PierreGondois
2021-02-23 13:13 ` [PATCH v3 06/26] ArmPkg: Fix Ecc error 10016 in StandaloneMmMmuLib PierreGondois
2021-02-23 13:13 ` [PATCH v3 07/26] ArmPkg: Fix Ecc error 10014 in ArmScmiDxe PierreGondois
2021-02-23 13:13 ` [PATCH v3 08/26] ArmPkg: Fix Ecc error 10014 in GenericWatchdogDxe PierreGondois
2021-02-23 13:13 ` [PATCH v3 09/26] ArmPkg: Fix Ecc error 10014 in MmCommunicationDxe PierreGondois
2021-02-23 13:13 ` [PATCH v3 10/26] ArmPkg: Fix Ecc error 10014 in SemihostLib PierreGondois
2021-02-23 13:13 ` [PATCH v3 11/26] ArmPkg: Remove ArmGic/ArmGicSecLib.c PierreGondois
2021-02-23 13:13 ` [PATCH v3 12/26] ArmPkg: Fix Ecc error 5003 in ArmExceptionLib PierreGondois
2021-02-23 13:13 ` [PATCH v3 13/26] ArmPkg: Fix Ecc error 6001 in MmCommunicationDxe PierreGondois
2021-02-23 13:13 ` [PATCH v3 14/26] ArmPkg: Fix Ecc error 6001 in ArmSoftFloatLib PierreGondois
2021-02-23 13:13 ` [PATCH v3 15/26] ArmPkg: Rename include guard in ArmGicLib.h PierreGondois
2021-02-23 13:13 ` [PATCH v3 16/26] ArmPkg: Fix Ecc error 7008 for SCMI_CLOCK_RATE PierreGondois
2021-02-23 13:13 ` [PATCH v3 17/26] ArmPkg: Fix Ecc error 7008 for OPTEE_MESSAGE_PARAM PierreGondois
2021-02-23 13:13 ` [PATCH v3 18/26] ArmPkg: Fix Ecc error 8005/8007 in ArmDisassemblerLib PierreGondois
2021-02-23 13:13 ` [PATCH v3 19/26] ArmPkg: Fix Ecc error 8005 for SCMI_PROTOCOL_ID PierreGondois
2021-02-23 13:14 ` [PATCH v3 20/26] ArmPkg: Fix Ecc error 8005 for SCMI_MESSAGE_TYPE PierreGondois
2021-02-23 13:14 ` [PATCH v3 21/26] ArmPkg: Fix Ecc error 8005 for SCMI_STATUS PierreGondois
2021-02-23 13:14 ` [PATCH v3 22/26] ArmPkg: Fix Ecc error 8005 for SCMI_MESSAGE_ID PierreGondois
2021-02-23 13:14 ` [PATCH v3 23/26] ArmPkg: Fix Ecc error 8005 for SCMI_MESSAGE_ID_BASE PierreGondois
2021-02-25 12:51 ` [edk2-devel] " Sami Mujawar
2021-02-23 13:14 ` [PATCH v3 24/26] ArmPkg: Fix Ecc error 8005 for SCMI_MESSAGE_ID_CLOCK PierreGondois
2021-02-25 12:52 ` [edk2-devel] " Sami Mujawar
2021-02-23 13:14 ` [PATCH v3 25/26] ArmPkg: Fix Ecc error 8005 for SCMI_CLOCK_RATE_FORMAT PierreGondois
2021-02-23 13:14 ` [PATCH v3 26/26] ArmPkg: Fix Ecc error 8005 for SCMI_MESSAGE_ID_PERFORMANCE PierreGondois
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210223131406.3484-3-Pierre.Gondois@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox