From patchwork Mon Jun 6 14:21:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?S09OUkFEIEZyw6lkw6lyaWM=?= X-Patchwork-Id: 9158323 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 E206C60573 for ; Mon, 6 Jun 2016 14:29:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D30B82040D for ; Mon, 6 Jun 2016 14:29:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C78DB26E5D; Mon, 6 Jun 2016 14:29:47 +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=-5.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, FSL_HELO_HOME, 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 40E402040D for ; Mon, 6 Jun 2016 14:29:47 +0000 (UTC) Received: from localhost ([::1]:42791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9vXF-0001Y4-P0 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 06 Jun 2016 10:29:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9vPs-0003xn-MY for qemu-devel@nongnu.org; Mon, 06 Jun 2016 10:22:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9vPl-0002CF-7R for qemu-devel@nongnu.org; Mon, 06 Jun 2016 10:22:07 -0400 Received: from greensocs.com ([193.104.36.180]:47087) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9vPk-0002Bn-TL for qemu-devel@nongnu.org; Mon, 06 Jun 2016 10:22:01 -0400 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id 8B28C13E00AD; Mon, 6 Jun 2016 16:21:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1465222919; bh=12Y+GtNkvr2ld41kE3PFRVQQvlSad9eNt4RVE8RoCtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WMp7988Bamrch98KjwpV0vm3WxXvYh+l4NvQkfRBzQkjKkVi3HOvYa3X79PkwM2VI dqLOhvwx6yK8ithwjwICApUtW9sPB5zjxz7PvzeC/bKy+bSAIQNGbEZbS1qaIht46e HjFVa6Ouizli3g7D3+rxJLWq/G2Hvl5WAiD/Lwtg= X-Virus-Scanned: amavisd-new at greensocs.com Authentication-Results: gs-01.greensocs.com (amavisd-new); dkim=pass (1024-bit key) header.d=greensocs.com Received: from greensocs.com ([127.0.0.1]) by localhost (gs-01.greensocs.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8-1Z83yIec-S; Mon, 6 Jun 2016 16:21:58 +0200 (CEST) Received: from corsair.home (AToulouse-659-1-125-198.w90-60.abo.wanadoo.fr [90.60.180.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: fred.konrad@greensocs.com) by greensocs.com (Postfix) with ESMTPSA id DB67F13E00AC; Mon, 6 Jun 2016 16:21:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1465222918; bh=12Y+GtNkvr2ld41kE3PFRVQQvlSad9eNt4RVE8RoCtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eXCdD3p3J/Ihhdugr2w+w/vDljZbLR/XixW37j4PHmaOA1ihJjeCYHUX6+AXglVRF mvxXcqQL8zviKK+hIPW0lhV32btp69vbQXVivdJUpoZvaZfZvx67qDMhIXhh46hfx5 /ZzuNXt63kpRuME2c5ZHBN/deYenU0XoxwrniGKo= From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org Date: Mon, 6 Jun 2016 16:21:41 +0200 Message-Id: <1465222907-19168-4-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1465222907-19168-1-git-send-email-fred.konrad@greensocs.com> References: <1465222907-19168-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 193.104.36.180 Subject: [Qemu-devel] [PATCH V8 3/9] i2c: Factor our send() and recv() common logic 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: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, hyunk@xilinx.com, Peter Crosthwaite , mark.burton@greensocs.com, alistair.francis@xilinx.com, crosthwaitepeter@gmail.com, guillaume.delbergue@greensocs.com, fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Peter Crosthwaite Most of the control flow logic between send and recv (error checking etc) is the same. Factor this out into a common send_recv() API. This is then usable by clients, where the control logic for send and receive differs only by a boolean. E.g. if (send) i2c_send(...): else i2c_recv(...); becomes: i2c_send_recv(... , send); Signed-off-by: Peter Crosthwaite Changes from FK: * Rebased on master. * Rebased on my i2c broadcast patch. Signed-off-by: KONRAD Frederic Reviewed-by: Alistair Francis --- hw/i2c/core.c | 48 ++++++++++++++++++++++++++++++++---------------- include/hw/i2c/i2c.h | 1 + 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/hw/i2c/core.c b/hw/i2c/core.c index a3921d9..a49138f 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -148,34 +148,50 @@ void i2c_end_transfer(I2CBus *bus) bus->broadcast = false; } -int i2c_send(I2CBus *bus, uint8_t data) +int i2c_send_recv(I2CBus *bus, uint8_t *data, bool send) { I2CSlaveClass *sc; I2CNode *node; int ret = -1; - QLIST_FOREACH(node, &bus->current_devs, next) { - sc = I2C_SLAVE_GET_CLASS(node->elt); - if (sc->send) { - ret |= sc->send(node->elt, data); + if (send) { + QLIST_FOREACH(node, &bus->current_devs, next) { + sc = I2C_SLAVE_GET_CLASS(node->elt); + if (sc->send) { + ret |= sc->send(node->elt, *data); + } + } + return ret; + } else { + if ((QLIST_EMPTY(&bus->current_devs)) || (bus->broadcast)) { + return -1; } + + sc = I2C_SLAVE_GET_CLASS(QLIST_FIRST(&bus->current_devs)->elt); + if (sc->recv) { + ret = sc->recv(QLIST_FIRST(&bus->current_devs)->elt); + if (ret < 0) { + return ret; + } else { + *data = ret; + return 0; + } + } + return -1; } - return ret; } -int i2c_recv(I2CBus *bus) +int i2c_send(I2CBus *bus, uint8_t data) { - I2CSlaveClass *sc; + return i2c_send_recv(bus, &data, true); +} - if ((QLIST_EMPTY(&bus->current_devs)) || (bus->broadcast)) { - return -1; - } +int i2c_recv(I2CBus *bus) +{ + uint8_t data; + int ret = i2c_send_recv(bus, &data, false); - sc = I2C_SLAVE_GET_CLASS(QLIST_FIRST(&bus->current_devs)->elt); - if (sc->recv) { - return sc->recv(QLIST_FIRST(&bus->current_devs)->elt); - } - return -1; + return ret < 0 ? ret : data; } void i2c_nack(I2CBus *bus) diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 4986ebc..c4085aa 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -56,6 +56,7 @@ int i2c_bus_busy(I2CBus *bus); int i2c_start_transfer(I2CBus *bus, uint8_t address, int recv); void i2c_end_transfer(I2CBus *bus); void i2c_nack(I2CBus *bus); +int i2c_send_recv(I2CBus *bus, uint8_t *data, bool send); int i2c_send(I2CBus *bus, uint8_t data); int i2c_recv(I2CBus *bus);