From patchwork Mon Oct 23 20:10:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10023009 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 265EE603D7 for ; Mon, 23 Oct 2017 20:13:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 192C728932 for ; Mon, 23 Oct 2017 20:13:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C41A2893C; Mon, 23 Oct 2017 20:13:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CB74828932 for ; Mon, 23 Oct 2017 20:13:03 +0000 (UTC) Received: from localhost ([::1]:40373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6j5q-0000S4-Sb for patchwork-qemu-devel@patchwork.kernel.org; Mon, 23 Oct 2017 16:13:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6j4E-00007o-8R for qemu-devel@nongnu.org; Mon, 23 Oct 2017 16:11:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e6j4D-0002Sg-AP for qemu-devel@nongnu.org; Mon, 23 Oct 2017 16:11:22 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:55426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e6j4A-0002QB-DD; Mon, 23 Oct 2017 16:11:18 -0400 Received: by mail-pg0-x241.google.com with SMTP id 15so7944625pgc.12; Mon, 23 Oct 2017 13:11:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h17Pqnilkz0hCyGOWOyihM9V6YRuS6kqpc24yee7Hck=; b=Hy+qMeExqIWBYDjjQFR39WdDF/EQvvWCuDNPOBSh3wLyJ0m5BFVMn6bqalruOUH4nN RtTsUR8hHc9s/MHlg1KRXLfKA7uppqipmtFe92ffChRL3clEPaYuWVPrS4/9Jaq3TjzT 8UehlTLQ+SX0xOTUo/an+QXOUf4XJZTrCmeH5jwgazN3KeBPxS3DGX6Jh+lszRVwTBMj 04Pj6MmJDI9l3gVzOH9TIYJrgE0I7VGcBKztaKZxO4BRbrjvJ8FDU+18NBlNDSFLvY5u UpNm9c3opHmvdDzntykvyxv1Cwn4PRpNt+OBNrkYRImHodLIVqGZt3sCAfFZrHdTPU2R IU1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h17Pqnilkz0hCyGOWOyihM9V6YRuS6kqpc24yee7Hck=; b=DTPiG8dTSuESnwL2VJmc19Xh0mfzO2XrltBrQLQtdbFOA1HogcReE/EaicjV0a8g4x BaqjWeyBvjFQuQ0Ov3vw+K9Y+tjImflbzoS7kvdN1pBpXdWApzmwmx3AStNPcyzu03uQ PouGUzUkDTMQ79buLV9x9xZc1dMaf985CrGnomwBa02PBF72XruU50UxvokFhHA4bgmP +pTalMwLcHUY2YNIgWmmaxMCEtY/Lz4oq2tCnBDD40/zAKuJItUUY7y3FpedjIR2+fnP 5CraJV3+Pm9wEyJ1CwH3i4Hx46/KEdfXbCubEmTMCb7ELAs4CZFWtPf/0UzbC6/fg1+o 9TzQ== X-Gm-Message-State: AMCzsaXgV7gnJoXdN9m8yf5wv4KNfRhNi9buGIRG4pf2qA6bGfcNYCkZ jK/b9gbjm8q66krHoyWOKGGYgVsp X-Google-Smtp-Source: ABhQp+Tkn0ogAH+BDKJQBbz6Ev2DNhuoGP3CiYAjUETGVdwzC1XTLi/+vr4m0ATvBfD45Y9puGKTrQ== X-Received: by 10.84.134.164 with SMTP id 33mr11303621plh.323.1508789477347; Mon, 23 Oct 2017 13:11:17 -0700 (PDT) Received: from squirtle.westlake.spaceflightindustries.com ([173.226.206.194]) by smtp.gmail.com with ESMTPSA id j1sm15181623pfj.108.2017.10.23.13.11.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Oct 2017 13:11:16 -0700 (PDT) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Mon, 23 Oct 2017 13:10:30 -0700 Message-Id: <20171023201055.21973-3-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171023201055.21973-1-andrew.smirnov@gmail.com> References: <20171023201055.21973-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH v2 02/27] imx_fec: Refactor imx_eth_enable_rx() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Andrey Smirnov , Jason Wang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, yurovsky@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Refactor imx_eth_enable_rx() to have more meaningfull variable name than 'tmp' and to reduce number of logical negations done. Cc: Peter Maydell Cc: Jason Wang Cc: Philippe Mathieu-Daudé Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Cc: yurovsky@gmail.com Reviewed-by: Peter Maydell Signed-off-by: Andrey Smirnov --- hw/net/imx_fec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 88b4b049d7..8b2e4b8ffe 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -536,19 +536,19 @@ static void imx_eth_do_tx(IMXFECState *s) static void imx_eth_enable_rx(IMXFECState *s) { IMXFECBufDesc bd; - bool tmp; + bool rx_ring_full; imx_fec_read_bd(&bd, s->rx_descriptor); - tmp = ((bd.flags & ENET_BD_E) != 0); + rx_ring_full = !(bd.flags & ENET_BD_E); - if (!tmp) { + if (rx_ring_full) { FEC_PRINTF("RX buffer full\n"); } else if (!s->regs[ENET_RDAR]) { qemu_flush_queued_packets(qemu_get_queue(s->nic)); } - s->regs[ENET_RDAR] = tmp ? ENET_RDAR_RDAR : 0; + s->regs[ENET_RDAR] = rx_ring_full ? 0 : ENET_RDAR_RDAR; } static void imx_eth_reset(DeviceState *d)