From nobody Tue Feb 10 04:17:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+70616+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+70616+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1611222707; cv=none; d=zohomail.com; s=zohoarc; b=XIlRQ9GJGxtmbTxWr/8m4MhzZPZbhSN6WrCojD11gpGu2sc9EZfqUCB45bp5xJI83+uBIypRSord1S5XFuC6DsCOmFQ5wn2LJSJ1LXqhHOb7gsXLuuTbFApgFS+CMdjKOM3a0iMZGZ4MvFws8fDqJZK8Jsbg1uLkeMvJ3e96pwM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611222707; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=EtebqrWfRsGq+RXh6sefm6euyxzn/0oQnF7xPsbOdZI=; b=OK6XuOaJ/7My5+n1E76g13761eA+TXEcwWRCUY3jCGVf+nlMe7FpnzIiLT4EqwterycTZr93VAeQExd9FDnoIglXsH7+6cVA6v4UovEsNe9od7mnw86mN/OqENHCAvQDpZP7W7l2hTuBvUMMzx3NEe8BjNO7VSf78UuYzP0CIgY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+70616+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1611222707471571.7737556910283; Thu, 21 Jan 2021 01:51:47 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id sqSGYY1788612xccZmZkjwbE; Thu, 21 Jan 2021 01:51:47 -0800 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.4984.1611222705156992336 for ; Thu, 21 Jan 2021 01:51:45 -0800 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D3E4C152D; Thu, 21 Jan 2021 01:51:39 -0800 (PST) X-Received: from e120189.arm.com (unknown [10.57.40.199]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 987463F719; Thu, 21 Jan 2021 01:51:38 -0800 (PST) From: "PierreGondois" To: devel@edk2.groups.io, ardb+tianocore@kernel.org, leif@nuviainc.com Cc: sami.mujawar@arm.com Subject: [edk2-devel] [PATCH v1 02/27] ArmPkg: Fix Ecc error 8001 in SemihostLib Date: Thu, 21 Jan 2021 09:50:54 +0000 Message-Id: <20210121095119.22143-3-Pierre.Gondois@arm.com> In-Reply-To: <20210121095119.22143-1-Pierre.Gondois@arm.com> References: <20210121095119.22143-1-Pierre.Gondois@arm.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com X-Gm-Message-State: 4HMKi8Krwf8ILhUgoL3YFGy5x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1611222707; bh=W226BpxQmezx8OJpbswpMtsAohYQB5PPFgJ2I7ECEHE=; h=Cc:Date:From:Reply-To:Subject:To; b=HA7i/aMsXVH9y3hsUes4/kkGdM4Iahq2leXHlFH1sxNbYatsYsHIV4Fy8lTyQf21wsH a0BpA0eMj3xXqiRIVz/qwJnQkgqxWnoTcMBvsY/aaSuUQ02a3owBmeVHGRhVrWP0z0Dg4 jygrlzL2kOeoIOeiUObxD06nOhDgvShv0RA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Pierre Gondois This patch fixes the following Ecc reported error: Only capital letters are allowed to be used for #define declarations Signed-off-by: Pierre Gondois Reviewed-by: Sami Mujawar --- The changes can be seen at: https://github.com/PierreARM/edk2/tree/1552_Ecc= _ArmPkg_BIS_v1 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/Semi= hostLib/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 =3D Mode; OpenBlock.NameLength =3D AsciiStrLen(FileName); - Result =3D Semihost_SYS_OPEN(&OpenBlock); + Result =3D SEMIHOST_SYS_OPEN (&OpenBlock); if (Result =3D=3D -1) { return RETURN_NOT_FOUND; @@ -66,7 +66,7 @@ SemihostFileSeek ( SeekBlock.Handle =3D FileHandle; SeekBlock.Location =3D Offset; - Result =3D Semihost_SYS_SEEK(&SeekBlock); + Result =3D SEMIHOST_SYS_SEEK (&SeekBlock); // Semihosting does not behave as documented. It returns the offset on // success. @@ -95,7 +95,7 @@ SemihostFileRead ( ReadBlock.Buffer =3D Buffer; ReadBlock.Length =3D *Length; - Result =3D Semihost_SYS_READ(&ReadBlock); + Result =3D SEMIHOST_SYS_READ (&ReadBlock); if ((*Length !=3D 0) && (Result =3D=3D *Length)) { return RETURN_ABORTED; @@ -122,7 +122,7 @@ SemihostFileWrite ( WriteBlock.Buffer =3D Buffer; WriteBlock.Length =3D *Length; - *Length =3D Semihost_SYS_WRITE(&WriteBlock); + *Length =3D SEMIHOST_SYS_WRITE (&WriteBlock); if (*Length !=3D 0) return RETURN_ABORTED; @@ -135,7 +135,7 @@ SemihostFileClose ( IN UINTN FileHandle ) { - if (Semihost_SYS_CLOSE (&FileHandle) =3D=3D -1) { + if (SEMIHOST_SYS_CLOSE (&FileHandle) =3D=3D -1) { return RETURN_INVALID_PARAMETER; } else { return RETURN_SUCCESS; @@ -154,7 +154,7 @@ SemihostFileLength ( return RETURN_INVALID_PARAMETER; } - Result =3D Semihost_SYS_FLEN(&FileHandle); + Result =3D SEMIHOST_SYS_FLEN (&FileHandle); if (Result =3D=3D -1) { return RETURN_ABORTED; @@ -195,7 +195,7 @@ SemihostFileTmpName( TmpNameBlock.Identifier =3D Identifier; TmpNameBlock.Length =3D Length; - Result =3D Semihost_SYS_TMPNAME (&TmpNameBlock); + Result =3D SEMIHOST_SYS_TMPNAME (&TmpNameBlock); if (Result !=3D 0) { return RETURN_ABORTED; @@ -220,7 +220,7 @@ SemihostFileRemove ( RemoveBlock.FileName =3D FileName; RemoveBlock.NameLength =3D AsciiStrLen(FileName); - Result =3D Semihost_SYS_REMOVE(&RemoveBlock); + Result =3D SEMIHOST_SYS_REMOVE (&RemoveBlock); if (Result =3D=3D 0) { return RETURN_SUCCESS; @@ -258,7 +258,7 @@ SemihostFileRename( RenameBlock.NewFileName =3D NewFileName; RenameBlock.NewFileNameLength =3D AsciiStrLen (NewFileName); - Result =3D Semihost_SYS_RENAME (&RenameBlock); + Result =3D SEMIHOST_SYS_RENAME (&RenameBlock); if (Result !=3D 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 =3D CommandLine; SystemBlock.CommandLength =3D 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.
- Copyright (c) 2013 - 2014, ARM Ltd. All rights reserved.
+ Copyright (c) 2013 - 2021, Arm Limited. All rights reserved.
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, OpenB= lock) -#define Semihost_SYS_CLOSE(Handle) _Semihost_SYS_CLOSE(0x02, Hand= le) -#define Semihost_SYS_WRITE0(String) _Semihost_SYS_WRITE0(0x04, Str= ing) -#define Semihost_SYS_WRITEC(Character) _Semihost_SYS_WRITEC(0x03, Cha= racter) -#define Semihost_SYS_WRITE(WriteBlock) _Semihost_SYS_WRITE(0x05, Writ= eBlock) -#define Semihost_SYS_READ(ReadBlock) _Semihost_SYS_READ(0x06, ReadB= lock) -#define Semihost_SYS_READC() _Semihost_SYS_READC(0x07, 0) -#define Semihost_SYS_SEEK(SeekBlock) _Semihost_SYS_SEEK(0x0A, SeekB= lock) -#define Semihost_SYS_FLEN(Handle) _Semihost_SYS_FLEN(0x0C, Handl= e) -#define Semihost_SYS_TMPNAME(TmpNameBlock) _Semihost_SYS_TMPNAME(0x0D, Tm= pNameBlock) -#define Semihost_SYS_REMOVE(RemoveBlock) _Semihost_SYS_REMOVE(0x0E, Rem= oveBlock) -#define Semihost_SYS_RENAME(RenameBlock) _Semihost_SYS_RENAME(0x0F, Ren= ameBlock) -#define Semihost_SYS_SYSTEM(SystemBlock) _Semihost_SYS_SYSTEM(0x12, Sys= temBlock) +#define SEMIHOST_SYS_OPEN(OpenBlock) _Semihost_SYS_OPEN(0x01, OpenB= lock) +#define SEMIHOST_SYS_CLOSE(Handle) _Semihost_SYS_CLOSE(0x02, Hand= le) +#define SEMIHOST_SYS_WRITE0(String) _Semihost_SYS_WRITE0(0x04, Str= ing) +#define SEMIHOST_SYS_WRITEC(Character) _Semihost_SYS_WRITEC(0x03, Cha= racter) +#define SEMIHOST_SYS_WRITE(WriteBlock) _Semihost_SYS_WRITE(0x05, Writ= eBlock) +#define SEMIHOST_SYS_READ(ReadBlock) _Semihost_SYS_READ(0x06, ReadB= lock) +#define SEMIHOST_SYS_READC() _Semihost_SYS_READC(0x07, 0) +#define SEMIHOST_SYS_SEEK(SeekBlock) _Semihost_SYS_SEEK(0x0A, SeekB= lock) +#define SEMIHOST_SYS_FLEN(Handle) _Semihost_SYS_FLEN(0x0C, Handl= e) +#define SEMIHOST_SYS_TMPNAME(TmpNameBlock) _Semihost_SYS_TMPNAME(0x0D, Tm= pNameBlock) +#define SEMIHOST_SYS_REMOVE(RemoveBlock) _Semihost_SYS_REMOVE(0x0E, Rem= oveBlock) +#define SEMIHOST_SYS_RENAME(RenameBlock) _Semihost_SYS_RENAME(0x0F, Ren= ameBlock) +#define SEMIHOST_SYS_SYSTEM(SystemBlock) _Semihost_SYS_SYSTEM(0x12, Sys= temBlock) #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 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#70616): https://edk2.groups.io/g/devel/message/70616 Mute This Topic: https://groups.io/mt/80000372/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-