From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EEF6C433F5 for ; Fri, 24 Sep 2021 21:10:53 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8EFED6140A for ; Fri, 24 Sep 2021 21:10:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8EFED6140A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 128AE8351A; Fri, 24 Sep 2021 23:10:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="gKNNsvIi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D4FCD83538; Fri, 24 Sep 2021 23:08:15 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C4BE5834F7 for ; Fri, 24 Sep 2021 23:07:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kabel@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id AD9216134F; Fri, 24 Sep 2021 21:07:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632517664; bh=NpM1IocpTjBSJYADJDB0M4cKJCdlk99Pimv+/dGBLaQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gKNNsvIierNhZ4G1n39omykC6S2ybx/F/6Feg/5gBzCAK5gyzi7RMHskzS8OOGSuZ gyCkTBi1f//oKi3+bT9JogWd0Z0/CyY4BI0o4fY+ugcOD6f1axpjsWFl64a/wOqTmz CUqnGng6MRV8eloJEvrbtFZeqvR4aqapFTDfKV5VxuDXiH2/yuDZUDPxbtxtHrtcKo Qw6Q3kmZumzLPSjvHlz/UkRxvSHSZLcVqlCOJ+9+L4DK4t1PjOcyhlMTsl8hpS6HBX n2+hMf00YlsPyZtJdCk4AwFJkYzbMpsXLaOPYuSHv5sORXoI/7Q4FT6sNGNEXOlT4b PFvvZrWJHW1JQ== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Stefan Roese Cc: u-boot@lists.denx.de, pali@kernel.org, Chris Packham , Baruch Siach , Dennis Gilmore , Mario Six , Jon Nettleton , =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH u-boot-marvell v3 12/39] tools: kwboot: Use a function to check whether received byte is a Xmodem reply Date: Fri, 24 Sep 2021 23:06:49 +0200 Message-Id: <20210924210716.29752-13-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210924210716.29752-1-kabel@kernel.org> References: <20210924210716.29752-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Marek Behún This is a non-functional change that should make the code more readable. Signed-off-by: Marek Behún --- tools/kwboot.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/kwboot.c b/tools/kwboot.c index 7f231c0823..2e5684b91c 100644 --- a/tools/kwboot.c +++ b/tools/kwboot.c @@ -375,6 +375,12 @@ kwboot_xm_makeblock(struct kwboot_block *block, const void *data, return n; } +static int +_is_xm_reply(char c) +{ + return c == ACK || c == NAK || c == CAN; +} + static int kwboot_xm_sendblock(int fd, struct kwboot_block *block) { @@ -395,10 +401,10 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block) c = NAK; } - if (c != ACK && c != NAK && c != CAN) + if (!_is_xm_reply(c)) printf("%c", c); - } while (c != ACK && c != NAK && c != CAN); + } while (!_is_xm_reply(c)); if (c != ACK) kwboot_progress(-1, '+'); -- 2.32.0