From patchwork Tue Jun 6 13:29:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiang W X-Patchwork-Id: 1791195 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=fA9aPs+N; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.a=rsa-sha256 header.s=s110527 header.b=FW1NcuvM; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QbBF266Gdz20WK for ; Tue, 6 Jun 2023 23:30:46 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=JHRDZhOddYYa1/lWrMxIxPlO6hm4oeCWos3uZ3x3eHM=; b=fA9aPs+Nxs8zDX qlcumwPG6+DRYQI2s0WSQl62tcsecs7C/LrOfG13AccjQ6GO2oHFaBe/VR0X3kyT0Iz5GCaUJIGhb 3gx4QO0RMwEn7FRNJhgsiXvUUJYt66RZLx3hXZ8zLRsG+ebHZGMow8fQ0fWredhukldpCxrOQjVPU jc6WmPlXZ75DcKE0nGsGangmLFs6HZK1itXe2sf/sH6vm2yj1JYOZuWSh5zvb5BoBk9IWACgEgqfd JiV4evsaZjpFVmDkpfAwy1+VHY6DW8qr97DWZhmCDX+CRutqWpmRc+5d4DrJzcZi45QNtMnTWcHKR g95LGsgaHCHDFugkeIhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6Wld-001rPN-0W; Tue, 06 Jun 2023 13:30:33 +0000 Received: from m126.mail.126.com ([220.181.12.26]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6WlZ-001rOl-1z for opensbi@lists.infradead.org; Tue, 06 Jun 2023 13:30:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=3UZnc 0RZkUK3YpjX+qu6bVrWrKbrAbVfIY8M1ZBvj+8=; b=FW1NcuvMnCsA21O9KNT7T d+18ZvbyxoapMkN/x8trkwPCNYxlLpANLfqpznC5czeMt5ejDZbl257l4QRI9KCp 2gfAjDMt2guIOY3FACOIilUN0Y+BqrZTR259V5u7xkNCSebHL6eUrtsp9oL1ehLk 8xekiS7oH5D7FIpT7tUXxU= Received: from x390.lan (unknown [58.247.180.116]) by zwqz-smtp-mta-g4-1 (Coremail) with SMTP id _____wA38xquNH9kiN0gAw--.49930S2; Tue, 06 Jun 2023 21:29:19 +0800 (CST) From: Xiang W To: opensbi@lists.infradead.org Cc: Xiang W , anup@brainfault.org, jrtc27@jrtc27.com Subject: [PATCH v3 10/12] lib: sbi: sbi_console.c code re-layout Date: Tue, 6 Jun 2023 21:29:12 +0800 Message-Id: <20230606132912.1240682-1-wxjstz@126.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CM-TRANSID: _____wA38xquNH9kiN0gAw--.49930S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7WF17XrykCw1fAFWrKrW5trb_yoW8GF4xpF Z3uFy3tw4FgFs3W3saqF45Gw1rAw1rKwnFqry3u3ySq3Z5A3s3t3W5Wa15tFW5Z395AFyr Aa4vy3W8Wa9rXw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0ziaiigUUUUU= X-Originating-IP: [58.247.180.116] X-CM-SenderInfo: pz0m23b26rjloofrz/1tbi1xOGOl53bWG-RQAAsn X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230606_063031_093827_07FCDE1F X-CRM114-Status: UNSURE ( 7.43 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Move the type definitions and macros in sbi_console.c to the begin of the file. Signed-off-by: Xiang W --- lib/sbi/sbi_console.c | 22 +++++++++++ 1 file changed, 11 insertions(+), 11 deletions(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [wxjstz[at]126.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Move the type definitions and macros in sbi_console.c to the begin of the file. Signed-off-by: Xiang W --- lib/sbi/sbi_console.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/sbi/sbi_console.c b/lib/sbi/sbi_console.c index 824ff6e..af93f51 100644 --- a/lib/sbi/sbi_console.c +++ b/lib/sbi/sbi_console.c @@ -14,8 +14,19 @@ #include #include +#define PAD_RIGHT 1 +#define PAD_ZERO 2 +#define PAD_ALTERNATE 4 +#define PAD_SIGN 8 +#define PRINT_BUF_LEN 64 #define CONSOLE_TBUF_MAX 256 +#define va_start(v, l) __builtin_va_start((v), l) +#define va_end __builtin_va_end +#define va_arg __builtin_va_arg + +typedef __builtin_va_list va_list; + static const struct sbi_console_device *console_dev = NULL; static char console_tbuf[CONSOLE_TBUF_MAX]; static u32 console_tbuf_len; @@ -117,17 +128,6 @@ unsigned long sbi_ngets(char *str, unsigned long len) return i; } -#define PAD_RIGHT 1 -#define PAD_ZERO 2 -#define PAD_ALTERNATE 4 -#define PAD_SIGN 8 -#define PRINT_BUF_LEN 64 - -#define va_start(v, l) __builtin_va_start((v), l) -#define va_end __builtin_va_end -#define va_arg __builtin_va_arg -typedef __builtin_va_list va_list; - static void printc(char **out, u32 *out_len, char ch) { if (!out) {