From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1623930823; cv=none; d=zohomail.com; s=zohoarc; b=YSr/V+kG7VUMbLqTql61kO4ZIeCuYDaA3kXkbwzoX+gq8oVarrjfzfQqCWCxYGTh8Clg3MZZqMlNhuDR5JWYyD+STnmzq52ke5ZAC/zxUmYQajmZ6496jCrA/Bk1BwnPo1Kw9jsg/YT2Jx7IxW1UnESFX1yWFv3QD2A6V2hL4sk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930823; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZVPBTnPyrwKkWmxUGbbjqq6/7nF/87IireIxXO+4BKk=; b=FUua8EKCr5DIPGsKtbFk2yU2DSAgNBm/Xkl37NAxpimbdPNqq0AHpOI7yL/1DgNnVWh1DwIa3K1eOLJVPA4i7JenWepPV6fgIWjpR3Ph+C5DFP0xAmDx5+7BkN0KXkT/2eaDosb3UgalQFSU6aP1OKshBcqa+ZKrkKr+odpAGUY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1623930823085592.1761287619146; Thu, 17 Jun 2021 04:53:43 -0700 (PDT) Received: by mail-wm1-f50.google.com with SMTP id t4-20020a1c77040000b029019d22d84ebdso6181875wmi.3 for ; Thu, 17 Jun 2021 04:53:42 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id g23sm8399630wmk.3.2021.06.17.04.53.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZVPBTnPyrwKkWmxUGbbjqq6/7nF/87IireIxXO+4BKk=; b=LjKqJr/Gn5U2aG2W28+I61UPkbkCxsSmxsOiA4ZmJd2xigzbRTp+cjiB2k9yAkMng/ wwLaeFioIlkKA2iq9JWBQYBraHPpSErKhnol3cISq3511jgeyOwHcyl/t9kAR5vl6FzY 2O3MmDTYHu5DoyW2IIvrJTWOqQAyqikbUtOPCIi8m1mXe6y4Uizwl2vaI2UK/WJPNARS Es3DQQO+YIfYYwa33XmrtoVZ2pOa3ECRILwo+cp/ODBIEMGvWyRIE66zTuii5PtJTBKE DT7iygSekm7rxrM1EpCdTU9TC8gJEhtTH0LJ2umbWW6JslEn4/aWVLKjrn030f9whrPM GXqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZVPBTnPyrwKkWmxUGbbjqq6/7nF/87IireIxXO+4BKk=; b=pv980zJ4vzRzP7uVsNIvJ38fA5uofBDZisIa55QTd/jEPwXAw/9SbKFug+Gfle2yRc YLTrwP+W/VR18OoWufC2oozfJJXeQN2ZLGT0sAM2qVQEl95TocL3sTx6lw8IbBtwVdgL 0y/tbnkY+VPTH9yh5CpQWi84KMt4L+ITU0BIq3plZJ874uGONKvTVi98xlPW2LM+LX0F ZZUIbqmdwumEwCrHxc4OVLbEBanqfsJI04X/SX8iYaVZqKwFSfMzWlsBsz2NQGQyKKKx 7YuUzgZ1bF3q89fDBUh+4HwYaLtfup47CB3J3e7epWLIhTBsA07Rs2CavsaXZDWgAQqg Mjjw== X-Gm-Message-State: AOAM531X8RM+UL76ZXVMbc9ESwhYC9jShnJNdMHyMX1yxMNW4KnfNUy4 Wm1X7cz4kZkbLTRkz1uyl1w= X-Google-Smtp-Source: ABdhPJwuPDAlf026IfCYpQKja/6oGbeY7MkU8rKOl/GRLB73dTT1z91F1TkatkBsJxaFsTaRRmqM2Q== X-Received: by 2002:a1c:2142:: with SMTP id h63mr4686584wmh.84.1623930821248; Thu, 17 Jun 2021 04:53:41 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v5 01/15] hw/input/lm832x: Move lm832x_key_event() declaration to "lm832x.h" Date: Thu, 17 Jun 2021 13:53:20 +0200 Message-Id: <20210617115334.2761573-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) lm832x_key_event() is specific go LM832x devices, not to the I2C bus API. Move it out of "i2c.h" to a new header. Reviewed-by: Richard Henderson Acked-by: Corey Minyard Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/i2c/i2c.h | 3 --- include/hw/input/lm832x.h | 26 ++++++++++++++++++++++++++ hw/arm/nseries.c | 1 + hw/input/lm832x.c | 1 + MAINTAINERS | 1 + 5 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 include/hw/input/lm832x.h diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index ff4129ea704..850815e707c 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -142,9 +142,6 @@ I2CSlave *i2c_slave_create_simple(I2CBus *bus, const ch= ar *name, uint8_t addr); */ bool i2c_slave_realize_and_unref(I2CSlave *dev, I2CBus *bus, Error **errp); =20 -/* lm832x.c */ -void lm832x_key_event(DeviceState *dev, int key, int state); - extern const VMStateDescription vmstate_i2c_slave; =20 #define VMSTATE_I2C_SLAVE(_field, _state) { \ diff --git a/include/hw/input/lm832x.h b/include/hw/input/lm832x.h new file mode 100644 index 00000000000..f47e579ff90 --- /dev/null +++ b/include/hw/input/lm832x.h @@ -0,0 +1,26 @@ +/* + * National Semiconductor LM8322/8323 GPIO keyboard & PWM chips. + * + * Copyright (C) 2008 Nokia Corporation + * Written by Andrzej Zaborowski + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 or + * (at your option) version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, see . + */ + +#ifndef HW_INPUT_LM832X +#define HW_INPUT_LM832X + +void lm832x_key_event(DeviceState *dev, int key, int state); + +#endif diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 0aefa5d0f3e..7b82b8682e8 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -34,6 +34,7 @@ #include "hw/boards.h" #include "hw/i2c/i2c.h" #include "hw/display/blizzard.h" +#include "hw/input/lm832x.h" #include "hw/input/tsc2xxx.h" #include "hw/misc/cbus.h" #include "hw/misc/tmp105.h" diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c index 4cb1e9de01f..d2b92b457e3 100644 --- a/hw/input/lm832x.c +++ b/hw/input/lm832x.c @@ -19,6 +19,7 @@ */ =20 #include "qemu/osdep.h" +#include "hw/input/lm832x.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" #include "migration/vmstate.h" diff --git a/MAINTAINERS b/MAINTAINERS index 636bf2f5365..c56bc112ccf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -792,6 +792,7 @@ F: hw/input/tsc2005.c F: hw/misc/cbus.c F: hw/rtc/twl92230.c F: include/hw/display/blizzard.h +F: include/hw/input/lm832x.h F: include/hw/input/tsc2xxx.h F: include/hw/misc/cbus.h F: tests/acceptance/machine_arm_n8x0.py --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623930827; cv=none; d=zohomail.com; s=zohoarc; b=JT4TowU4/JviSAc4YZKu12ikEvwTq+GJzEdKPz/CIdyXq382KohjshJl4jeiY5dgRYgmsHUYzg7BvVCUOvhgxLBijIaABaAFax06wSFdZJD/guxj5OF1f2mVYSvjp9ZXP2K7Lm783cYEsXCKhE2NK4DoIRpTgQexRHC92MpSyI0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930827; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=g7tkCcGMeSxkeYuEayXQwDf2U36P/eV7M7g2ybGL9KI=; b=SSqq5m0x4Pz3yMz+Wa4V2oICDYXhQwYfN7RsficFFmUo5zxEvSYyK7gcRQy94J7Jg0CWyk8dR5/YTg7rUR+O+STG1SxiNPHtGbAvW15b7TK6iO+Pi3bh5RTfxLayy9JY/Jx+/mkG4Jo3dG5ip5HfJOVNXzArLn380Cvbw+thJls= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 16239308277431011.8580761901947; Thu, 17 Jun 2021 04:53:47 -0700 (PDT) Received: by mail-wm1-f48.google.com with SMTP id n23so3259697wms.2 for ; Thu, 17 Jun 2021 04:53:47 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id p187sm4339944wmp.28.2021.06.17.04.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:53:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g7tkCcGMeSxkeYuEayXQwDf2U36P/eV7M7g2ybGL9KI=; b=PHe/VNuEZjHarNlEl0zV5SK1U2ew9APLI9N1IMT49Y/TM0G2Cgk5ilRvuv6j+wwkRW Hjx2k2SJ2jvxLoHqL+mYI1swMZi1FKLnBGNTuFNsOAwQdvFZZ5nOIRhODj6Y79+uhLCz xBb/EHXEFVAiTP1bzjJDMEGq1VQ7Rra3F09Sxs2jhHCBbCs8wZc8EVdw3Z9MbhN6gsl9 dkvDv9G1GhJMB/9SRkhKSQfYu1+fwfOagXP5ul9XnrPbPL20DoIDBxdjwmG4kPx5e08G scrkwDFIbhrJJxl5aNgaQmiUkrp4GJGKNur1kej7xtURm4M2D+XiMEAKk21/kx+k4LXz M8Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=g7tkCcGMeSxkeYuEayXQwDf2U36P/eV7M7g2ybGL9KI=; b=L22Zcsem17QHbTnADqNeJV4ktrgEtyAS62GICwngnKwA9tnU48yXtpc6cq23d+QPVV 6rKf+pVb4nqlH1sVU1USBKz1W1LMm+9EAuuyKtKbCfqQfCkyZiOnC3Q+ZTcNyXmeJ1lR uIoXakBTEkd33XY2ulUU0dMN0yK7w1vAM4K5dv0dVemSv9VCrHtQ4LsjpS9gdwnh+2/6 6hhXdvrC17gogCJkf1QbQcp8BH+4GMZ9JhJ4TFLhFT6t9n1VNJLDWGMEXqohoxTLsqyI lZATqjEJ1OR1tL0xEWyKu91eiMRZGfghxL1ek3vophe875VgZl3LYqS5mjVQppL+GZI7 mG5A== X-Gm-Message-State: AOAM5334C0TPenmJVRJfiLvCxV2U9Jii+hKN1BKAIrQNU+ZDRrvOdYtL /ZB/jK2nNUiUOhzJSbuwGZQ= X-Google-Smtp-Source: ABdhPJxX8o5tssdyMdEwzOEvB9miVkmjnGy5NDAfe/RoVnCdXeiwbwQcPh8dt1gqYCGWz3CU6FLC9g== X-Received: by 2002:a1c:e246:: with SMTP id z67mr3294845wmg.119.1623930826042; Thu, 17 Jun 2021 04:53:46 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v5 02/15] hw/input/lm832x: Define TYPE_LM8323 in public header Date: Thu, 17 Jun 2021 13:53:21 +0200 Message-Id: <20210617115334.2761573-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Define TYPE_LM8323 in the public "hw/input/lm832x.h" header and use it in hw/arm/nseries.c. Reviewed-by: Richard Henderson Acked-by: Corey Minyard Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/input/lm832x.h | 2 ++ hw/arm/nseries.c | 2 +- hw/input/lm832x.c | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/input/lm832x.h b/include/hw/input/lm832x.h index f47e579ff90..2a58ccf8916 100644 --- a/include/hw/input/lm832x.h +++ b/include/hw/input/lm832x.h @@ -21,6 +21,8 @@ #ifndef HW_INPUT_LM832X #define HW_INPUT_LM832X =20 +#define TYPE_LM8323 "lm8323" + void lm832x_key_event(DeviceState *dev, int key, int state); =20 #endif diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 7b82b8682e8..3a51264e3cf 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -417,7 +417,7 @@ static void n810_kbd_setup(struct n800_s *s) /* Attach the LM8322 keyboard to the I2C bus, * should happen in n8x0_i2c_setup and s->kbd be initialised here. */ s->kbd =3D DEVICE(i2c_slave_create_simple(omap_i2c_bus(s->mpu->i2c[0]), - "lm8323", N810_LM8323_ADDR)); + TYPE_LM8323, N810_LM8323_ADDR)= ); qdev_connect_gpio_out(s->kbd, 0, kbd_irq); } =20 diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c index d2b92b457e3..19a646d9bb4 100644 --- a/hw/input/lm832x.c +++ b/hw/input/lm832x.c @@ -28,7 +28,6 @@ #include "ui/console.h" #include "qom/object.h" =20 -#define TYPE_LM8323 "lm8323" OBJECT_DECLARE_SIMPLE_TYPE(LM823KbdState, LM8323) =20 struct LM823KbdState { --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623930832; cv=none; d=zohomail.com; s=zohoarc; b=g2F0UgZbu7j0dSnBZX2fefSWakhOzAxJ4jP7YX/iK7ZWnZZdfrmu9EnKBBu3DjFdFM9xXxGfXPA7jmzIrNQXpvkzozGYjQc16DXdScDWaZlFCOAmgO10QQ1aqHSyia7C309SzEot9gUI+EotOM12LGToEBKpY8j/784lZCsEAFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930832; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PLm+CAmE6exi2+6ozO8dDlwl9EePwAhLr88hp6FkarA=; b=ECOtYW+2F2sR+q+OJ8hcr8FfVaqVLKnXXG14rtVt5OvKa2kIptnYdFCW7LlU3yKxekbu+kPBJYF8+7yHFv7oHtN/uNWHqw5EERTQzFY1LoKHFaUyQZzEdff2xR7kMfzhNhEnkJKfDrplIM6/7m1IwHcS5Dq6OBuxk42CCv4KEng= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 16239308325451007.2046591852957; Thu, 17 Jun 2021 04:53:52 -0700 (PDT) Received: by mail-wm1-f41.google.com with SMTP id h11-20020a05600c350bb02901b59c28e8b4so6217445wmq.1 for ; Thu, 17 Jun 2021 04:53:52 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id w23sm8327291wmi.0.2021.06.17.04.53.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PLm+CAmE6exi2+6ozO8dDlwl9EePwAhLr88hp6FkarA=; b=l+gBpnNlmzIsLpjXsAuhDyV3cq1HN+KfsoUrZDhR12BdxXEM0XGEtXBjDh3T2wxPt/ 8SqbkLCpuwqUaIzrgI/3cXCHFuYm2B1cMcdqQ+UtRGmLFpkzoxkBGqqKAhsnc3hmr7sM c+eF6uVxpXhwCrvevcXAv4DRiGcokr5bzHNP+Lk2pRsV3jXzB8j7ArrdX2SqVgJ+GvnJ DH/pmwmgihkjtpYxp+ablnd1Bv3LOTbmX7tGFw5PyOW78GdNlJPhaDu9ERMV7gNjPgdF modpvAvHQqjYi1ube8PAE8gVt5mqEpsBlKK1akA9gofyyGxVa3+YOqqF3BeEzjp+pVuX Y2Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PLm+CAmE6exi2+6ozO8dDlwl9EePwAhLr88hp6FkarA=; b=QfP8UanrmOOTPOF60kyvFXhO8Hr6+/tgZngcEZB4vD5XY7BwzgJAmszpPA247jrPpc bj5WYrlTHkpXjsISnxhKb+dNygQEZL+V7ADzr5RsMh4ZVaBRKxtEclohb1JFb7ga3GFV APrcMzIRytLvWriZL14qWuixg3T82jsmc55gv5UT+zUl0VgGgBkJOJolmcRM38IsWF8+ SUaE7GsefIIuXQ364X61Pl/D8q34jSIfmbDzNpG3ZNwDFRvyHbXWEhbPZRN9rnNeTv9Q w89ta23UWp8BxFZKD5u5eHsKxgBUeAlGOQ+4A/WDOTQL97zAZzwPeX8prc/7M7UY31nL 1bcw== X-Gm-Message-State: AOAM532MAGawuwZOKRAFvzA+9F4YV5YC1kZcBHu0jB/Fj212z3rviib+ AIJuS+junPwgMZFmfqRjfmM= X-Google-Smtp-Source: ABdhPJzXqa9Qfx2Bx1vEZJUy5ivkHoF4M4CDVTC9Z2dLTUqcQpfF2woEM6t6zxZlcCLY9ABe0Ss8Rw== X-Received: by 2002:a05:600c:2d45:: with SMTP id a5mr806266wmg.161.1623930830756; Thu, 17 Jun 2021 04:53:50 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , BALATON Zoltan Subject: [PATCH v5 03/15] hw/display/sm501: Simplify sm501_i2c_write() logic Date: Thu, 17 Jun 2021 13:53:22 +0200 Message-Id: <20210617115334.2761573-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Reviewed-by: Richard Henderson Acked-by: Corey Minyard Reviewed-by: BALATON Zoltan Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/sm501.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 8789722ef27..f276276f7f1 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -1036,8 +1036,9 @@ static void sm501_i2c_write(void *opaque, hwaddr addr= , uint64_t value, int res =3D i2c_start_transfer(s->i2c_bus, s->i2c_addr >> 1, s->i2c_addr & 1); - s->i2c_status |=3D (res ? SM501_I2C_STATUS_ERROR : 0); - if (!res) { + if (res) { + s->i2c_status |=3D SM501_I2C_STATUS_ERROR; + } else { int i; for (i =3D 0; i <=3D s->i2c_byte_count; i++) { res =3D i2c_send_recv(s->i2c_bus, &s->i2c_data[i], --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623930837; cv=none; d=zohomail.com; s=zohoarc; b=aJfDzBX5PJ6rg8gA8t+Jhx3DeAc+L/8+mVCHFUp8oh0k+F+Y14iyRZwAgkKx/v40ICGaQ2ujGNyzJJ+RCgkU9iwTOh1ufImcfLZ0AbqmGRA4BX8voMk5elSl9VxGvCvetlHmnQ/idQJEkwoMS4tYmhbeh2JfHUPlqsEgAfNBLSo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930837; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0yFcNPzCMbJU7ln7mvR4pO20Y4U4Q8SH66r8xtnNF00=; b=LDQr0HOh1Dx1CzHyZigj4t4sy4TUtPG8a54KkNlScgsSSavMJ6NLx7QyAAUcPFTusQAKufYyQIxtppCnWb6jKmV1aG1Y1yft4y0NWnikDkvd9Tm78QNn0N0MROka1TscG4mNjC7l5K3PPC5Ts//pETeOQoqtOOdUaYQuunFuNNY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1623930837002466.4131175122012; Thu, 17 Jun 2021 04:53:57 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id k42so1365619wms.0 for ; Thu, 17 Jun 2021 04:53:56 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id t9sm4646788wmq.14.2021.06.17.04.53.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:53:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0yFcNPzCMbJU7ln7mvR4pO20Y4U4Q8SH66r8xtnNF00=; b=OTbM4gF9kYBNFJEShrnJTZDm64kaTsMoodOYgY4nwWVH7YgfDSELHcCWWOjh51oO9j cTcpKAP46KqxI0/P2OgDHCb4ibi2VBCXAOiIP63ZVgnJENdTSL1k/DVFDTCKOWdHHgYh O2UUbiNz4teaqjhEZLqqMbWVTnlKNm8iNDo9g7MpAxL6SgfHCSqW/8KFQ4p0UNzVoem6 0/MgU0gICpGLWK/SR4OJh4Ahn5s14xPinjyFv/SCsCx7u/D7JPg+CVAIXR2EZ6UnYZGU LWV7jjhEGAFCfGv46DP8MfFCSmpsVMu/zCmRNTGx2coG4UHtNsLC/SBCK8TvlpfxnWfq 54Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0yFcNPzCMbJU7ln7mvR4pO20Y4U4Q8SH66r8xtnNF00=; b=RcMvl5NSk73U7b7nnXP4dGfq2ENSmK92aTN+CZoTgwcAIqahL2slnFIfEuM4LkLHWq hlJNsSL3MymzKfgj1cFPJK6+J0dIKvfSAk4gt5nXhBTVBSpasMiCRE45QtTGLNLRqXcm yZws+G6XmMkSgj/Po1bVmXPEJnTg2v/fg2MchRRU+0XsJxX9PD6Rvc0sQfPunkwu/81V Vq6UUh/loHLg+/AtPU4qa2joe4jW+XafEgrGU2Tbxtszf8rxJ5g6CfAgHZ6mKC9c0HoV ZGB+haSZ4cnkwt6jzrGECZ8AJYbB2asNVfz24fm68TaLw1vYui7jgt2OT6ehwfpe0O7p u5+A== X-Gm-Message-State: AOAM532sjMJPr+UBc5CBlVuP6VUDy7OHlAvHk7PZnURiA1oDFvTdNKWx KxkEybSRPWjogUBzK72uRKI= X-Google-Smtp-Source: ABdhPJxPGzt/pgjWg+3ZlKo53AlbVd3EhL/8zVBjFE4oKFRHCNk2Y0iUj5YSeuDCefgGNJUmki0U5g== X-Received: by 2002:a1c:4954:: with SMTP id w81mr4636156wma.182.1623930835312; Thu, 17 Jun 2021 04:53:55 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v5 04/15] hw/display/sm501: Replace i2c_send_recv() by i2c_recv() & i2c_send() Date: Thu, 17 Jun 2021 13:53:23 +0200 Message-Id: <20210617115334.2761573-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Instead of using the confuse i2c_send_recv(), rewrite to directly call i2c_recv() & i2c_send(), resulting in code easier to review. Reviewed-by: Richard Henderson Acked-by: Corey Minyard Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: BALATON Zoltan --- hw/display/sm501.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index f276276f7f1..569661a0746 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -1033,17 +1033,18 @@ static void sm501_i2c_write(void *opaque, hwaddr ad= dr, uint64_t value, case SM501_I2C_CONTROL: if (value & SM501_I2C_CONTROL_ENABLE) { if (value & SM501_I2C_CONTROL_START) { + bool is_recv =3D s->i2c_addr & 1; int res =3D i2c_start_transfer(s->i2c_bus, s->i2c_addr >> 1, - s->i2c_addr & 1); + is_recv); if (res) { s->i2c_status |=3D SM501_I2C_STATUS_ERROR; } else { int i; for (i =3D 0; i <=3D s->i2c_byte_count; i++) { - res =3D i2c_send_recv(s->i2c_bus, &s->i2c_data[i], - !(s->i2c_addr & 1)); - if (res) { + if (is_recv) { + s->i2c_data[i] =3D i2c_recv(s->i2c_bus); + } else if (i2c_send(s->i2c_bus, s->i2c_data[i]) < = 0) { s->i2c_status |=3D SM501_I2C_STATUS_ERROR; return; } --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623930841; cv=none; d=zohomail.com; s=zohoarc; b=NagwiQI7sF7Y9uOl2kj9n1b+aytNIrDyNTRNeZaNO3yJo/mu/GmtI2hL27Rdu/ROGOfnPgNplYGJ098XEfu6rrz8DH2gn2tp9ACqe7+psTHuMZkSEQon8I2uNjh1yvtn6DIKz+zJoJVBe/6Vk8d0Krurlajua7izraLCHC2qRbI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930841; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+jgVQlH2ZLclahkepwe/jy0S2FD3dNErrT3z+1Ksb0M=; b=UUhQkgtDxhCHByqq1H0PuUjrQOGulIV7IYh4snXTBuOfTlSLvZny6vrmR/m7zNAzovbNPTIW2uiXYNn+xmpjQLLgUbhPKhdNWflm4k3rACj7b5tk7VMeRiZBo17gk8FLb4XEyHQ3xGZrDUIsNEP5RzTk/SwBTQrsG8217NyWqVg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1623930841702951.7530696300774; Thu, 17 Jun 2021 04:54:01 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id z8so6428373wrp.12 for ; Thu, 17 Jun 2021 04:54:01 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id t9sm4646977wmq.14.2021.06.17.04.53.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:53:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+jgVQlH2ZLclahkepwe/jy0S2FD3dNErrT3z+1Ksb0M=; b=Iwd60xuZjpJGwG+LwZyaNmfItJOD/FJ2+T93IOBnxXDHNhzaNSphuSSBCgdcDORg5b QfI1i/JKSH63W20qI/eV56RRdknMuOkefb9AuzNU9ENEK99zb1RvAPGeMCT0Y/iPBpQX 1FHtH7c3TrJ49O9kSLQ7kXWjjHHVEi0gMYsLaR48gdpWvVEBNfQpzQOdh+nAo8eiyX9d k0yQuXnYqLgiJFixd+vEqmKzeutJLf5HyIuhwjvffpEEhtSvc76SeIPvvq5VWdiIt3s2 r9S+gM79r713P4MnyJMehzXB0RvS9TMkmtzBSQtz7dOjChZTQ2QAoUTKIeOECASZgxEo 5viw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+jgVQlH2ZLclahkepwe/jy0S2FD3dNErrT3z+1Ksb0M=; b=ugiKhhd6H4w3xMhWlZDoLR9X1G9gtZx9HJyxJDRx3Xe5JdGT89Q9NA5h3tDKHssEb0 asQsw6oX7Kw+Xhhl9+TFP38ww18KOfaYX8KXkJVm7xJ1RU5BvzyobCu/Mce8jILY8Eg8 Hr5AJjFa2o+Tr9TSC1cuT1fTaug1W3e9ZsYLb4YdKT4utHu93WGbSrzz0u4LyeawQSVr LCrAPHnGK+4+DKYqFAYsO3bwtqkQHJxEtyBYntc6iJcAoiNSYa3ahLJwrqWPMxnrJgsJ jU2odIC4xsK7y1vXDmKc5dAtt2KipDaySqRTSE+wzUnu2qoCCe1OWw7Jo2JaQuy0OOqr EBBw== X-Gm-Message-State: AOAM533S0ovuB4GtDtH3dskIANT5t4TH+JgrzAsal2sHFI15GX4C6HtP 54B8RDDNXJDmY2lZVaNbYVY= X-Google-Smtp-Source: ABdhPJxlMaX6LbeJQo3w9yS2feZHWLGxEY3MUsI+tIk2OM/1mSFaqoERiQEGTP8gYN6DvYvQ+fcwlw== X-Received: by 2002:a5d:51c3:: with SMTP id n3mr5171928wrv.322.1623930840006; Thu, 17 Jun 2021 04:54:00 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v5 05/15] hw/i2c/ppc4xx_i2c: Add reference to datasheet Date: Thu, 17 Jun 2021 13:53:24 +0200 Message-Id: <20210617115334.2761573-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) It took me a while to find this model datasheet, since it is an OCR scan. Add a reference to save other developers time. Reviewed-by: Richard Henderson Acked-by: Corey Minyard Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i2c/ppc4xx_i2c.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c index c0a8e045670..f4c5bc12d36 100644 --- a/hw/i2c/ppc4xx_i2c.c +++ b/hw/i2c/ppc4xx_i2c.c @@ -1,6 +1,8 @@ /* * PPC4xx I2C controller emulation * + * Documentation: PPC405GP User's Manual, Chapter 22. IIC Bus Interface + * * Copyright (c) 2007 Jocelyn Mayer * Copyright (c) 2012 Fran=C3=A7ois Revol * Copyright (c) 2016-2018 BALATON Zoltan --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1623930846; cv=none; d=zohomail.com; s=zohoarc; b=m9A1L2ZTuBte51uNwz3ZFiD1ZVqNw/7H5j1dnlhka/ZL4bJHANPU4vQhUBF0H3Wt2bafXUog0u/OTtwpgkZ5YfzltY8Vcca5owr2y0QgUp5ERZqW+dyPSFB7QTBqadjkJaljLcT4PZBV9k6E+MbVv60OYYKXLLFga8eIgrZRvxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930846; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WmyHaJHcvUKLEVm6aSpmTart9qZchQ/2Um+oWz7mMdA=; b=HOf+yU71Q95aLvFHAD2ptO9qldQRNrIu7n7ca84tMBJiTja8S0DHXHoUN6La3BDtEkqNImfWB+KdzEJZEH1jt07kD/1vqLWWgzZQvEF+kKLhvtyFH6nV2TcUxfrFGCLIj9IvbSj59qEhOXgtDQ4B2/zoHqHPlaSMZPhqnlmlEfY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1623930846425636.2190877047074; Thu, 17 Jun 2021 04:54:06 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id v9so6462285wrx.6 for ; Thu, 17 Jun 2021 04:54:05 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id a24sm4183461wmj.30.2021.06.17.04.54.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:54:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WmyHaJHcvUKLEVm6aSpmTart9qZchQ/2Um+oWz7mMdA=; b=X9jMfQFSYaokIrJZgLTlIh90r++RmcxwxZ9RzZwSiOFjtN3CHjZqt/amS5e3CZaXPQ 6f117Et2G/F1m1yoGa240WMr/6u+VLdxuEe0JC01KMueSKYfMwV4iUYtSWbjL1u8xtmz n6ohTuFv9bDnbEewUQjZhs7823y44hj5SWML9N0DY/mTfluO/KpXdnHo5smOAHAit434 sQ48EN9bigAF/P01ilMsTsANZcPTNtzld/MW1zLw3/YSrdW2yF5DBpW+drayPbnPQne4 mYeLuDqQyMf15dSaD8acsnDfYTtlICtIlkaAeQdEbpwPmqUU8HiOAlwHTCNAtwky2fyl 22EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=WmyHaJHcvUKLEVm6aSpmTart9qZchQ/2Um+oWz7mMdA=; b=NJ9cUVlDxKYtxu/FZLEB/HsMXkTmCKv8kbQ4uML1I2yeetsmRpyCXdSQei2MK/6H2H i9E8DrArbalqTP4kT3qH2aiQIykU2p41VGKjkwMvG2bTiMg8zPCKOh/XfkWF/5rXR4uc wF4hg3dbYYkuJzavAYSDr8AZlMJr6/zfgx67puxa/9RoxBIObcDeGp8B/uC0n2Qe6Nfg 0fcZXLpNaxKmPSW4m0G8Q+LWhEYFU8LALIG4bl5heMiBsvE4cfZYKA5zz40kcN10QdAt nadkY1drFpWWA1LJrCeR55YeTgWKdBd2CMq/L/3dDyguFS+TyZ9FHWvapx8Fr7eH9o9I J2/w== X-Gm-Message-State: AOAM533U3wCXCCrTJ0ZmIMQ/fbUngXroIDys7S2CxgtKVrDUWxCiNpyk 7q39CAXwGYEZQuulTqxSJb4= X-Google-Smtp-Source: ABdhPJw0RrTLORTJPfvp+O+0sFRcg5OSgR/BCQ7u2LfBXQH+C9Im4wFEiIReX7F7PFPd471SjQLp2w== X-Received: by 2002:a05:6000:18a8:: with SMTP id b8mr5088922wri.208.1623930844525; Thu, 17 Jun 2021 04:54:04 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v5 06/15] hw/i2c/ppc4xx_i2c: Replace i2c_send_recv() by i2c_recv() & i2c_send() Date: Thu, 17 Jun 2021 13:53:25 +0200 Message-Id: <20210617115334.2761573-7-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Instead of using the confuse i2c_send_recv(), rewrite to directly call i2c_recv() & i2c_send(), resulting in code easier to review. Reviewed-by: Richard Henderson Acked-by: Corey Minyard Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: BALATON Zoltan --- hw/i2c/ppc4xx_i2c.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c index f4c5bc12d36..75d50f15158 100644 --- a/hw/i2c/ppc4xx_i2c.c +++ b/hw/i2c/ppc4xx_i2c.c @@ -240,11 +240,14 @@ static void ppc4xx_i2c_writeb(void *opaque, hwaddr ad= dr, uint64_t value, i2c->sts &=3D ~IIC_STS_ERR; } } - if (!(i2c->sts & IIC_STS_ERR) && - i2c_send_recv(i2c->bus, &i2c->mdata[i], !recv)) { - i2c->sts |=3D IIC_STS_ERR; - i2c->extsts |=3D IIC_EXTSTS_XFRA; - break; + if (!(i2c->sts & IIC_STS_ERR)) { + if (recv) { + i2c->mdata[i] =3D i2c_recv(i2c->bus); + } else if (i2c_send(i2c->bus, i2c->mdata[i]) < 0) { + i2c->sts |=3D IIC_STS_ERR; + i2c->extsts |=3D IIC_EXTSTS_XFRA; + break; + } } if (value & IIC_CNTL_RPST || !(value & IIC_CNTL_CHT)) { i2c_end_transfer(i2c->bus); --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623930851; cv=none; d=zohomail.com; s=zohoarc; b=MHUJ4IfZE7YhMPBgeMG6ODowlIr2P+nRv6IvgoBIU7mo8s4pB7KN/gVOkp3G/3WXzqmlBE7JQbMP6ZkfUPnjLixUSk8lXOspSgDVzqO06qAWpzxhkM9M9E3CcqVSQ1U53I3lxNTC1MkANGiaJevM0ngLKFnyf35Ng+ysgaf+DPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930851; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ePgJDFFOw4rGg/va2x01kE3ubJf7MZ1h52aSuruLrco=; b=W+/NXSA41GH/sXIMx2fzTyKpsaCM8q1PXw/qiBTOUc8O+VKsaTYvr/qSDsC/uOQ95bSkXS1NwhdlFT3TU/zDXtl10Eab3MBwKZkXhDYxivdTk5QBdOiq456SWYRqpBYLWW9CQpVaKIfNRvJIoWaApMTP1dLIooK/qVXPkbRKFMc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1623930851154738.6464954372099; Thu, 17 Jun 2021 04:54:11 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id a11so6439450wrt.13 for ; Thu, 17 Jun 2021 04:54:10 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id t16sm5340426wmi.2.2021.06.17.04.54.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:54:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ePgJDFFOw4rGg/va2x01kE3ubJf7MZ1h52aSuruLrco=; b=HnNmlRALfMLH2OE+ckY37Pm42oO7kVbaezU//2KLKTCN1Sv4SBCZ8MLb2qXOylccdX 3axcG7n9mHxmzJJi6rvWaz0Cf/ZSygugBKywmAPdZNQzEF6MbZqW1paXCceiaVyQbhEs yk5pHXgAdZtpXOXw2O1cgQ5PtGM2mZoEv0Kk923tf2777S7uySiGgaFoDa+/k5XPcml8 BjHbThrXV6LYdx6OzBb7LkrdqOMVgCzVULxHkI20WlPQHiQBpJrDPXaHrCGbpQxv0dpZ B1vVsMAhrc04GD4KoBqECRGMIU64zVnSaV7YIkQIcMnB7a/REGpEY0HYeYtoxxs6nEzu NJTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ePgJDFFOw4rGg/va2x01kE3ubJf7MZ1h52aSuruLrco=; b=kuRp+3uFTW7ui/2pN1lu8PkVcr5Bua7tjw9c35XfhSAfTnfaDF/WoOOs59+q8PMz4f Q9ditHfkYFRd5kGvT28uIm0QHxCzsB7wUliRfq0h5A2FJfZUnOfAIbUcrKe9ZoW5pYhD xP/TKZfn+ZFRzqOnJZmoHiOYrvwPFaCcBlUWJAyZz1m4AQHLi2f6yl8qBe2HJIFm5swb a6dnoQ7jf51YAodvet71akWo01lToup6GnYeu7xF/+06h4GXDcMu2zbtcJw8jZ6d3DJE TbXYDLahKViu6/kAzHYZ8cOagyA2y+MqASI8vGww99huNmP7/RdM7Xrhe6NtK7Lk2isN y8+g== X-Gm-Message-State: AOAM530V6ZWuuUSj+mH2SvnkAscMnfE4XheufiLhuWm2/lIxq2TaZjAk fEkrL63wSo/Wm6GOAKhjeEa92wmIQ2szTA== X-Google-Smtp-Source: ABdhPJzo3GW4MCp+ya2yUhB9nqqkgHhkW4zzJmMBoU+eZC81lsQJ4Z7tNOPrzcpZRWwq7Jvjs6Y+Bw== X-Received: by 2002:a5d:5903:: with SMTP id v3mr5164227wrd.285.1623930849399; Thu, 17 Jun 2021 04:54:09 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , BALATON Zoltan , Richard Henderson Subject: [PATCH v5 07/15] hw/misc/auxbus: Fix MOT/classic I2C mode Date: Thu, 17 Jun 2021 13:53:26 +0200 Message-Id: <20210617115334.2761573-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Since its introduction in commit 6fc7f77fd2 i2c_start_transfer() uses incorrectly the direction of the transfer (the last argument is called 'is_recv'). Fix by inverting the argument, we now have is_recv =3D !is_write. Fixes: 6fc7f77fd2 ("introduce aux-bus") Reported-by: BALATON Zoltan Reviewed-by: Richard Henderson Acked-by: Corey Minyard Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/auxbus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c index 6c099ae2a2d..148b070ce4a 100644 --- a/hw/misc/auxbus.c +++ b/hw/misc/auxbus.c @@ -139,7 +139,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, i2c_end_transfer(i2c_bus); } =20 - if (i2c_start_transfer(i2c_bus, address, is_write)) { + if (i2c_start_transfer(i2c_bus, address, !is_write)) { ret =3D AUX_I2C_NACK; break; } @@ -170,7 +170,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, /* * No transactions started.. */ - if (i2c_start_transfer(i2c_bus, address, is_write)) { + if (i2c_start_transfer(i2c_bus, address, !is_write)) { break; } } else if ((address !=3D bus->last_i2c_address) || @@ -179,7 +179,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, * Transaction started but we need to restart.. */ i2c_end_transfer(i2c_bus); - if (i2c_start_transfer(i2c_bus, address, is_write)) { + if (i2c_start_transfer(i2c_bus, address, !is_write)) { break; } } --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623930855; cv=none; d=zohomail.com; s=zohoarc; b=FEUCVxf0W/fFPsxlVsbeXaP62endXDBL0lOjFsJAoXnFrhgyZAou00n7ijWVpDyi5+mT97RcrgrXDvrk2TaKfybozBjvhULlmdB2boByjcoKjqe/Q77OWJbqMFUEVogW52Q70HJlqgminBSV+NpMzAwpwyAIOKpiI5bWPHukY4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930855; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mF7eiAdIfTv9rlxceo15bFIxRiqB6zGPW3KZaJR5WqY=; b=Ii69dIvH3rSxaZNcCoHY+YjGt0SNLDWvnJsj5utjuuytocoMM5GmHD9SZfxhZ0IgyqNPLfJZtfHAjgFbRGQAY5dW90vPNU4DPy2LQINkLX4aQ5Ux8NefxLmuvrjRDjxPo+j/lZO37f52mBJCOtCn8JvieTt1KASqWBL+SX2AvVA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1623930855707655.4328350184384; Thu, 17 Jun 2021 04:54:15 -0700 (PDT) Received: by mail-wr1-f48.google.com with SMTP id d11so4085857wrm.0 for ; Thu, 17 Jun 2021 04:54:15 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id q3sm5353360wrz.71.2021.06.17.04.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:54:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mF7eiAdIfTv9rlxceo15bFIxRiqB6zGPW3KZaJR5WqY=; b=JPiiubiExRrQKBsdszp7UUvTYYhP0JJkS8zd/Voextvc83gla6v7bKo/p9EuBXcTHK kK6LtQeWATZc8kBPBsAoV6UpFkPVlfDe0MH7/+C6LwAcvJwny6UdrKjniGQEADe2Ebf6 w3pSKIQ0wIAxctL2tj30eKV5yPO7gl5RpeQjNqRYOd8cO2yQeKlDpgxHgdoQLkQRfp5c Q2gp2C6hXQXfRHpBxN3tFgqzfUJ5JXtxJTudZYt5OibUyQc+rTrFaxfahfwumD3NAhCP E2O2UH+O/77PYxgOFxbUAB4nvWZmdHA4Uk+fW93aHDP62WvLDnkfbynccnZy3PRxIOov LEHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mF7eiAdIfTv9rlxceo15bFIxRiqB6zGPW3KZaJR5WqY=; b=Z/qctaNqdSxkokaZjFGeuXP2sSYLp/lTTFOmCZgcLuOZMOJ/SP5P1LMqYllvd5+D57 tBo/abbyKTBoGog2+0ltzmtD7+3NBstyJ28t9EfFdsrgSAINOYJfeQqVBsB7PFFtHaIP 6gzB05kRlLnGMnzod/pCv8nGM0aAkVPuc9nVoMUvDxxPpaczaZr81Scu6H1jKnykCtBd Fhviu7WEGVlPMKBtKYZLCznS3RbK8KPjhihpMqo/wCCAg0yg0LEU3916cChBe8dLUpzO ucvF2CQcJDkDtdfnYh4k9pGPv+NJWqUaCfrreIg/rehxQ7ROjvgg/6LBNeWvwpa8gPqx 9spA== X-Gm-Message-State: AOAM533vj6DdlA4c41RNw/ZE75QbK2A2UgJikaX83a6dUjYJ+PP01ww2 Y5ewpw7tylg4cYmiXtX/dm0= X-Google-Smtp-Source: ABdhPJy7L9o0KzEjyXX1qK62ulMKIaKv2GZAJCvx2gqqCFd3u/qYax0aNC2uDu0Z8yii393mGwUAdg== X-Received: by 2002:adf:a1c1:: with SMTP id v1mr5230119wrv.234.1623930854005; Thu, 17 Jun 2021 04:54:14 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v5 08/15] hw/misc/auxbus: Explode READ_I2C / WRITE_I2C_MOT cases Date: Thu, 17 Jun 2021 13:53:27 +0200 Message-Id: <20210617115334.2761573-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To allow further simplifications in the following commits, start copying WRITE_I2C code to the READ_I2C, and READ_I2C_MOT to WRITE_I2C_MOT. No logical change. Reviewed-by: Richard Henderson Acked-by: Corey Minyard Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/auxbus.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c index 148b070ce4a..9cc9cf3be32 100644 --- a/hw/misc/auxbus.c +++ b/hw/misc/auxbus.c @@ -133,6 +133,26 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint= 32_t address, * Classic I2C transactions.. */ case READ_I2C: + is_write =3D cmd =3D=3D READ_I2C ? false : true; + if (i2c_bus_busy(i2c_bus)) { + i2c_end_transfer(i2c_bus); + } + + if (i2c_start_transfer(i2c_bus, address, !is_write)) { + ret =3D AUX_I2C_NACK; + break; + } + + ret =3D AUX_I2C_ACK; + while (len > 0) { + if (i2c_send_recv(i2c_bus, data++, is_write) < 0) { + ret =3D AUX_I2C_NACK; + break; + } + len--; + } + i2c_end_transfer(i2c_bus); + break; case WRITE_I2C: is_write =3D cmd =3D=3D READ_I2C ? false : true; if (i2c_bus_busy(i2c_bus)) { @@ -163,6 +183,39 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint= 32_t address, * - We changed the address. */ case WRITE_I2C_MOT: + is_write =3D cmd =3D=3D READ_I2C_MOT ? false : true; + ret =3D AUX_I2C_NACK; + if (!i2c_bus_busy(i2c_bus)) { + /* + * No transactions started.. + */ + if (i2c_start_transfer(i2c_bus, address, !is_write)) { + break; + } + } else if ((address !=3D bus->last_i2c_address) || + (bus->last_transaction !=3D cmd)) { + /* + * Transaction started but we need to restart.. + */ + i2c_end_transfer(i2c_bus); + if (i2c_start_transfer(i2c_bus, address, !is_write)) { + break; + } + } + + bus->last_transaction =3D cmd; + bus->last_i2c_address =3D address; + while (len > 0) { + if (i2c_send_recv(i2c_bus, data++, is_write) < 0) { + i2c_end_transfer(i2c_bus); + break; + } + len--; + } + if (len =3D=3D 0) { + ret =3D AUX_I2C_ACK; + } + break; case READ_I2C_MOT: is_write =3D cmd =3D=3D READ_I2C_MOT ? false : true; ret =3D AUX_I2C_NACK; --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1623930860; cv=none; d=zohomail.com; s=zohoarc; b=QIkyi58XVrIte2eVBzzApGWtBa0J3a4Jts5cFYsOutVSC3fAHg2nCeCYYtsbfW5olqn6/2okz5xPtZGmDDgI22V+It1PT6soyMX2cPuwHzbw3Sj2q3UCt0Si1umsw3N5tJoEIK48duB025dSzyIDzI2idXwhpzFwG0S5dOG2V6c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930860; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TAZ5Nd2Zr4AEdYczPbEyYCejydYTPBGPwGnfyFJKBD8=; b=hnf+Q27eLubYCgy+2xMEdHZBeMHZ72OmsAYbCp5VCOIwu7bpszLLgedCoh9drFq1X1zNdA9jSpbTP5oduTbPKKP/sPO/NkRU+a/RgCw5xGYPJp12k+7pxPy06NOBv4XD7hCE+QMwO84juJZFburf/G1uQz+BaI65JK7gI7Zn1OQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1623930860425786.6152794067228; Thu, 17 Jun 2021 04:54:20 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id n7so6473289wri.3 for ; Thu, 17 Jun 2021 04:54:19 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id t19sm1450841wmh.20.2021.06.17.04.54.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:54:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TAZ5Nd2Zr4AEdYczPbEyYCejydYTPBGPwGnfyFJKBD8=; b=CwTjhLWsQZYAVq13+e3HDpBuLgpQwdDkTcKDY3pMYtxj/PYPV4rLubz30QEJ7zFdgH 4epbLJTm9YI3zqnYkAs11TTdL0x9dghf0/KHHVAxc45BVxxWazsna1w5AYkAGQm09GCB wbEiTo47rULP8x1Hdh14dXRBcO8n8MbpPoCaSLBwcYF7uy667E2MVj0ZCT1y/qU2IQal nrzsWHHpgLgJiZn6DJ4iN99zpMiWtzCdv/GW3vutocDXeUpFJwSWR7RintG+1Kdz/ghz LVlu9iNxsoMBVksaI0XIBMqwGdFj5DrvgkgxCKGTXR6TPiwtfm0HQNVOOjY2e+uvotQN YYLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TAZ5Nd2Zr4AEdYczPbEyYCejydYTPBGPwGnfyFJKBD8=; b=XKhh00RPvsPR3ODqzX7zfFhTSi2MmOKxMOZVeVPvcjM7YvWrkEZMfgpwERnXqBD/zQ XPS/exLwKbixsn288kD0oCLyfafTjlpfC4HphdVkugmXJgcFMkvXK+rzMjj6L5ViVSzZ siCOvRQir65JQl6EFotHhDgWfew3c/ETLA4Lf+eBss8j9q2BRU1WDUi2tOlC0jJJIaqb IDWv/zsZyoQ3B221tNh3iAYLCfipqFHy/N26gjgElRO//8M9Idl4/rQ31K1naiSHt+jp mGCaCsNifytNSJc1vGnTPTlRgJ3EBANMu+CmnAaEG5JOmVNUGUBb3c2RqKgElBOe8jap DvuA== X-Gm-Message-State: AOAM5330jkZdOFAm1WHMrtB662F0Yx0/lKrKB849S9gn+uK2NBgDlKsy L53so46JWyTWlcH0kKmpaO7125cSYr4zqA== X-Google-Smtp-Source: ABdhPJxH1I0glMxCfk3dHYTGBCn/ILGSaLP2IV0PLb7Hh7tBLUtkTKcKQqTzKT3+uBcqoNdQ8EzlzQ== X-Received: by 2002:adf:bd88:: with SMTP id l8mr5204015wrh.90.1623930858568; Thu, 17 Jun 2021 04:54:18 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v5 09/15] hw/misc/auxbus: Replace 'is_write' boolean by its value Date: Thu, 17 Jun 2021 13:53:28 +0200 Message-Id: <20210617115334.2761573-10-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Remove the 'is_write' boolean by directly using its value in place. Reviewed-by: Richard Henderson Acked-by: Corey Minyard Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/auxbus.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c index 9cc9cf3be32..d96219aef88 100644 --- a/hw/misc/auxbus.c +++ b/hw/misc/auxbus.c @@ -106,7 +106,6 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, AUXReply ret =3D AUX_NACK; I2CBus *i2c_bus =3D aux_get_i2c_bus(bus); size_t i; - bool is_write =3D false; =20 DPRINTF("request at address 0x%" PRIX32 ", command %u, len %u\n", addr= ess, cmd, len); @@ -117,11 +116,10 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uin= t32_t address, */ case WRITE_AUX: case READ_AUX: - is_write =3D cmd =3D=3D READ_AUX ? false : true; for (i =3D 0; i < len; i++) { if (!address_space_rw(&bus->aux_addr_space, address++, MEMTXATTRS_UNSPECIFIED, data++, 1, - is_write)) { + cmd =3D=3D WRITE_AUX)) { ret =3D AUX_I2C_ACK; } else { ret =3D AUX_NACK; @@ -133,19 +131,18 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uin= t32_t address, * Classic I2C transactions.. */ case READ_I2C: - is_write =3D cmd =3D=3D READ_I2C ? false : true; if (i2c_bus_busy(i2c_bus)) { i2c_end_transfer(i2c_bus); } =20 - if (i2c_start_transfer(i2c_bus, address, !is_write)) { + if (i2c_start_transfer(i2c_bus, address, true)) { ret =3D AUX_I2C_NACK; break; } =20 ret =3D AUX_I2C_ACK; while (len > 0) { - if (i2c_send_recv(i2c_bus, data++, is_write) < 0) { + if (i2c_send_recv(i2c_bus, data++, false) < 0) { ret =3D AUX_I2C_NACK; break; } @@ -154,19 +151,18 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uin= t32_t address, i2c_end_transfer(i2c_bus); break; case WRITE_I2C: - is_write =3D cmd =3D=3D READ_I2C ? false : true; if (i2c_bus_busy(i2c_bus)) { i2c_end_transfer(i2c_bus); } =20 - if (i2c_start_transfer(i2c_bus, address, !is_write)) { + if (i2c_start_transfer(i2c_bus, address, false)) { ret =3D AUX_I2C_NACK; break; } =20 ret =3D AUX_I2C_ACK; while (len > 0) { - if (i2c_send_recv(i2c_bus, data++, is_write) < 0) { + if (i2c_send_recv(i2c_bus, data++, true) < 0) { ret =3D AUX_I2C_NACK; break; } @@ -183,13 +179,12 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uin= t32_t address, * - We changed the address. */ case WRITE_I2C_MOT: - is_write =3D cmd =3D=3D READ_I2C_MOT ? false : true; ret =3D AUX_I2C_NACK; if (!i2c_bus_busy(i2c_bus)) { /* * No transactions started.. */ - if (i2c_start_transfer(i2c_bus, address, !is_write)) { + if (i2c_start_transfer(i2c_bus, address, false)) { break; } } else if ((address !=3D bus->last_i2c_address) || @@ -198,7 +193,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, * Transaction started but we need to restart.. */ i2c_end_transfer(i2c_bus); - if (i2c_start_transfer(i2c_bus, address, !is_write)) { + if (i2c_start_transfer(i2c_bus, address, false)) { break; } } @@ -206,7 +201,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, bus->last_transaction =3D cmd; bus->last_i2c_address =3D address; while (len > 0) { - if (i2c_send_recv(i2c_bus, data++, is_write) < 0) { + if (i2c_send_recv(i2c_bus, data++, true) < 0) { i2c_end_transfer(i2c_bus); break; } @@ -217,13 +212,12 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uin= t32_t address, } break; case READ_I2C_MOT: - is_write =3D cmd =3D=3D READ_I2C_MOT ? false : true; ret =3D AUX_I2C_NACK; if (!i2c_bus_busy(i2c_bus)) { /* * No transactions started.. */ - if (i2c_start_transfer(i2c_bus, address, !is_write)) { + if (i2c_start_transfer(i2c_bus, address, true)) { break; } } else if ((address !=3D bus->last_i2c_address) || @@ -232,7 +226,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, * Transaction started but we need to restart.. */ i2c_end_transfer(i2c_bus); - if (i2c_start_transfer(i2c_bus, address, !is_write)) { + if (i2c_start_transfer(i2c_bus, address, true)) { break; } } @@ -240,7 +234,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, bus->last_transaction =3D cmd; bus->last_i2c_address =3D address; while (len > 0) { - if (i2c_send_recv(i2c_bus, data++, is_write) < 0) { + if (i2c_send_recv(i2c_bus, data++, false) < 0) { i2c_end_transfer(i2c_bus); break; } --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623930864; cv=none; d=zohomail.com; s=zohoarc; b=ZICXldsdapgVOT4xSBPn+hDmi09A0hxJhINsJcWLOjjjZxARGNkyrx/rWG35+2h7IGUXmUjeSXkEWArtbJMB4LoztAIFnDV23vhQzPjbYBddX2Y79IQLfcZKpejYIy+rTgTwSKftCCqtV7YmCQgjxDkkLa3INkDjPNjd4wPsnqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930864; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lMrFIFZX4VBJPQraxvDxEyJhOku4B5f9uSq095+uB5I=; b=TyTrW31deL+I/cyiYf6Qh/EGucEjwj1jaSWZ5eDPqadfOaJ+VmFPdUCQD3KRk5jKf5t86atZrW82Ehf6hvzANuwG5rEZznVG1kG31sSrEPI3LknhgEFRgFdpJuo07fjEWyxn7zM7bYf6xYHLY6KLi7+A7mTxAjGs8sAA6+pSC34= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1623930864944530.338197942062; Thu, 17 Jun 2021 04:54:24 -0700 (PDT) Received: by mail-wm1-f52.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso4760787wmc.1 for ; Thu, 17 Jun 2021 04:54:24 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id f5sm6126634wrf.22.2021.06.17.04.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:54:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lMrFIFZX4VBJPQraxvDxEyJhOku4B5f9uSq095+uB5I=; b=qDhkZeLjhAHgduWQ7jztCxzxHL24Z+ru7vAtjKudTNlRv52tbfcGv7KpE6tTzsKe0l 0n53pU6lwGIJyTrIJZKK2rK5QRLytDN2ZK2cXtEPtv+5wPWCC9RT6Hdopvt5bV1LSpn3 SN988XpJEPnCrnUkk+x4y64gVp9gCq3rZUZ4nOshWl7IJ+eNuRjqYnF6SqB4OarkUjx8 l+Hc8QxZs6MWDy6c3k5ezT5N53ctGnyXwEqrRZjRDUFeNKvxmMcWvvhAT62clTcMVnvp J492lVWJOFvnkOovE3WX3i3E3AnWBCR1WSkCw/96jfTQUr7TAAKD9rUClCH9At81k56U 6r9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lMrFIFZX4VBJPQraxvDxEyJhOku4B5f9uSq095+uB5I=; b=PAaUqOY9ymI116nIMUppohQpcDjDgkV0MTtuUU23NFiD7yLq9+s4RN1P2oh2EJmY/V 9M/4hcwdY0XtO77DcDU3e2ZhfSGb8EM8o3SAOowGj3vy2blknZWGoj+8snlgwsWAMQ/g gRvyKvyjSZNOkTSj5l87VCJJo0nTMJHQqnGXhkVsRncCjgKjUXcVbvSMpO745W38ds+a OChc8+xvyoEzppSdkslNhABHJyhFhYjx32VKo7EQ04x7uWpaGfnlmyt5FpX/KSpg7wnN 3A/MooudRhoU1cEppO0XEgwUUIEu820oK+JUshG0jxA8eB3IE9LsVRlnKxd5hbDuMEbq kxFQ== X-Gm-Message-State: AOAM533Rabok69vhLgU5qnf2h94uN4nJL862FkwC1zctQ3CNAyuAQw0x gsegCR4Q83lrIlnmvt7On6c= X-Google-Smtp-Source: ABdhPJzkiMMvmGOa4BIUg/B0FMPUlbQoJs617pqwZgs3ZPMcDAUWnlahc/CMFF+7SbzWq2RQRuONkg== X-Received: by 2002:a05:600c:190f:: with SMTP id j15mr4742749wmq.4.1623930863189; Thu, 17 Jun 2021 04:54:23 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v5 10/15] hw/misc/auxbus: Replace i2c_send_recv() by i2c_recv() & i2c_send() Date: Thu, 17 Jun 2021 13:53:29 +0200 Message-Id: <20210617115334.2761573-11-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Instead of using the confuse i2c_send_recv(), replace i2c_send_recv(send =3D true) by i2c_send() and i2c_send_recv(send =3D false) by i2c_recv(). During the replacement we also change a while() statement by for(). The resulting code is easier to review. Reviewed-by: Richard Henderson Acked-by: Corey Minyard Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/auxbus.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c index d96219aef88..44aa9730bc9 100644 --- a/hw/misc/auxbus.c +++ b/hw/misc/auxbus.c @@ -141,12 +141,8 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint= 32_t address, } =20 ret =3D AUX_I2C_ACK; - while (len > 0) { - if (i2c_send_recv(i2c_bus, data++, false) < 0) { - ret =3D AUX_I2C_NACK; - break; - } - len--; + for (i =3D 0; i < len; i++) { + data[i] =3D i2c_recv(i2c_bus); } i2c_end_transfer(i2c_bus); break; @@ -161,12 +157,11 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uin= t32_t address, } =20 ret =3D AUX_I2C_ACK; - while (len > 0) { - if (i2c_send_recv(i2c_bus, data++, true) < 0) { + for (i =3D 0; i < len; i++) { + if (i2c_send(i2c_bus, data[i]) < 0) { ret =3D AUX_I2C_NACK; break; } - len--; } i2c_end_transfer(i2c_bus); break; @@ -200,15 +195,13 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uin= t32_t address, =20 bus->last_transaction =3D cmd; bus->last_i2c_address =3D address; - while (len > 0) { - if (i2c_send_recv(i2c_bus, data++, true) < 0) { + ret =3D AUX_I2C_ACK; + for (i =3D 0; i < len; i++) { + if (i2c_send(i2c_bus, data[i]) < 0) { i2c_end_transfer(i2c_bus); + ret =3D AUX_I2C_NACK; break; } - len--; - } - if (len =3D=3D 0) { - ret =3D AUX_I2C_ACK; } break; case READ_I2C_MOT: @@ -233,16 +226,10 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uin= t32_t address, =20 bus->last_transaction =3D cmd; bus->last_i2c_address =3D address; - while (len > 0) { - if (i2c_send_recv(i2c_bus, data++, false) < 0) { - i2c_end_transfer(i2c_bus); - break; - } - len--; - } - if (len =3D=3D 0) { - ret =3D AUX_I2C_ACK; + for (i =3D 0; i < len; i++) { + data[i] =3D i2c_recv(i2c_bus); } + ret =3D AUX_I2C_ACK; break; default: qemu_log_mask(LOG_UNIMP, "AUX cmd=3D%u not implemented\n", cmd); --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623930869; cv=none; d=zohomail.com; s=zohoarc; b=Lud6ohXByCvLPaEfntcj197rl3WoAlByL5p0cAQA3StRgZkxJ0cIqxNs/AdI2datSXcgEd/WbWA3Fyv9bpXc/mIvvbwB6iKenWeB5WAGaJOR4uOYrwF8Mg27t1SQ8TXkC2RidGCEBRo26HGWbbwhuMsnX6NKal+G882EJe/vDUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930869; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xaw3RJNkpGriYz8vt+BCpgugibw18q+MPp6XakrxTs4=; b=Nuz0K9BaJTDIU9rdnF5Iy65L8Xbig4k8sBrXYA956F2Y2OuItR7VBhPgM0LUwB8RKO4H683l5Eer/+9I/8tFGTWe1Y/4UYrQjh7CvedZozg7crSqBqKHoVZA5Nndjwo1L/APMQv7z6JBe0egOWBirOEQOIJr7QSPholygrJ3zqk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1623930869482768.3530960736318; Thu, 17 Jun 2021 04:54:29 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id c5so6438802wrq.9 for ; Thu, 17 Jun 2021 04:54:28 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id k16sm4406285wmr.42.2021.06.17.04.54.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xaw3RJNkpGriYz8vt+BCpgugibw18q+MPp6XakrxTs4=; b=MIV75LH5f3NzD9QkwVgh2t2wUpIGQ9SnLzse2hAGKUb7Scd/uk9pJ4PP97zet6JrG5 IU6ApWm7fZae/jHaiLTfCf4ke8LpiHr4YI3VM3yYgkZ/Vj7OI2t5W5mbP0591J2g2efm ibBfnYuDPG9qxSPNd3ni++t1fjOQ/kYZeSFa7aCJt9qpeFD7tZCtamoXJyX4lKgpsZr/ LOc3FxIYZogzs6zBOYCCfNXoH3PfQkL0NtKY7HOMoDwoanbnFB6lYpSHDVPLkNLPhpSG XYZmLFs2av/00x5cZIHkiBLPlOgJdExl8NZfyLTCbKvjqMhD1jouJDg5P9lHVK/uKZmZ tixg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Xaw3RJNkpGriYz8vt+BCpgugibw18q+MPp6XakrxTs4=; b=keXP/vSaSMiMAAQ1x4a7aMJ78tdDJILu2HAbTsKItFz06CN1LLk2GTEJdVZFxKlrfm XCJC43zcHDnoqSrmJRCvfd6E6kceE7hPZOon+pziEpN/HkU19GEj9dRdXITTj0LAD8L2 f4b5yAJ7N6i4uYERYv3ZyUcuq1sxlMs6UDtDyuZbjqcBK2r3S+fbP4iDArB8MCqJBv2s qAfQRi95DHwuWOavWF9XZoB6Dil12j+HX5HgazABRAYkgfrH37GiCmqhS7Tjcl5qrpwa IVx0l55NyPTxcfetNmJatZDPSNecP/rx6ONZXLusJjJYp6RCljvfrkhzzegIPJG280WX jXaw== X-Gm-Message-State: AOAM5314IRcyrACO+yCLLvZSq/fUMtyLknvfUAAoEajYZD6zMbZYkcDp ji1nuw8/w2Vt9Hyq9kariZE= X-Google-Smtp-Source: ABdhPJw+wqDEWyK7GRV70ApBcSBu5RPp1cJsduLZNqq0b6wrsAcHfa1FEzh/4YWT2vp5EfV6X9QH0A== X-Received: by 2002:adf:bb54:: with SMTP id x20mr3997548wrg.19.1623930867781; Thu, 17 Jun 2021 04:54:27 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v5 11/15] hw/i2c: Remove confusing i2c_send_recv() Date: Thu, 17 Jun 2021 13:53:30 +0200 Message-Id: <20210617115334.2761573-12-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We replaced all the i2c_send_recv() calls by the clearer i2c_recv() and i2c_send(), so we can remove this confusing API. Reviewed-by: Richard Henderson Acked-by: Corey Minyard Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/i2c/i2c.h | 1 - hw/i2c/core.c | 50 +++++++++++++++++++------------------------- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 850815e707c..99635b837a5 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -84,7 +84,6 @@ 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); uint8_t i2c_recv(I2CBus *bus); bool i2c_scan_bus(I2CBus *bus, uint8_t address, bool broadcast, diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 3a7bae311df..27a66df7f34 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -188,50 +188,42 @@ void i2c_end_transfer(I2CBus *bus) bus->broadcast =3D false; } =20 -int i2c_send_recv(I2CBus *bus, uint8_t *data, bool send) +int i2c_send(I2CBus *bus, uint8_t data) { I2CSlaveClass *sc; I2CSlave *s; I2CNode *node; int ret =3D 0; =20 - if (send) { - QLIST_FOREACH(node, &bus->current_devs, next) { - s =3D node->elt; - sc =3D I2C_SLAVE_GET_CLASS(s); - if (sc->send) { - trace_i2c_send(s->address, *data); - ret =3D ret || sc->send(s, *data); - } else { - ret =3D -1; - } + QLIST_FOREACH(node, &bus->current_devs, next) { + s =3D node->elt; + sc =3D I2C_SLAVE_GET_CLASS(s); + if (sc->send) { + trace_i2c_send(s->address, data); + ret =3D ret || sc->send(s, data); + } else { + ret =3D -1; } - return ret ? -1 : 0; - } else { - ret =3D 0xff; - if (!QLIST_EMPTY(&bus->current_devs) && !bus->broadcast) { - sc =3D I2C_SLAVE_GET_CLASS(QLIST_FIRST(&bus->current_devs)->el= t); - if (sc->recv) { - s =3D QLIST_FIRST(&bus->current_devs)->elt; - ret =3D sc->recv(s); - trace_i2c_recv(s->address, ret); - } - } - *data =3D ret; - return 0; } -} =20 -int i2c_send(I2CBus *bus, uint8_t data) -{ - return i2c_send_recv(bus, &data, true); + return ret ? -1 : 0; } =20 uint8_t i2c_recv(I2CBus *bus) { uint8_t data =3D 0xff; + I2CSlaveClass *sc; + I2CSlave *s; + + if (!QLIST_EMPTY(&bus->current_devs) && !bus->broadcast) { + sc =3D I2C_SLAVE_GET_CLASS(QLIST_FIRST(&bus->current_devs)->elt); + if (sc->recv) { + s =3D QLIST_FIRST(&bus->current_devs)->elt; + data =3D sc->recv(s); + trace_i2c_recv(s->address, data); + } + } =20 - i2c_send_recv(bus, &data, false); return data; } =20 --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623930874; cv=none; d=zohomail.com; s=zohoarc; b=bxl60GHXH5sYAt1XAyqb0iQpXbHx3mgam6nnu934biuK5W58paAJo5ff2ckk4fw6zKQqI8oJXDDyDB7f+ez5o+BXzedMi0YROi9v7cM5BwD2UiPc7XDM3+clcS+6zx9n9tFUpmdqqJs7VDt8y6NRwTWAMKJypXBxv5dmg/xzOq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930874; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eoP4CL94JaZlg7eqmYc7iZiTJ8FoF/Caiy1Z28ZBDWs=; b=g7Gjg0AnxyZ3w5SinImWAiBGOxx2+RR9KHkdb5kHimGpCFuVzHAJoRk16lEK2wl5KH6kMvaEPctZpb4orEIPnePff6HbhT9RlPO8smgCbXiRnk39LRuyY9fqk0YT85T6jiGsPdTOcCKMHbnDafnOExoV7RnyJ5tNs/z+vxj8UTs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1623930874274680.8416791557069; Thu, 17 Jun 2021 04:54:34 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id d11so4086922wrm.0 for ; Thu, 17 Jun 2021 04:54:33 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id k67sm2500562wma.14.2021.06.17.04.54.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:54:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eoP4CL94JaZlg7eqmYc7iZiTJ8FoF/Caiy1Z28ZBDWs=; b=G858hUL8y+gTNB0JQ+0W+kMiCs2mS7ppF05b4PCshZcyPxCoSMyDPl4KvfjVycpMql jM5O9Y2RmsF44b/GvgTOb4uR2frtFvKinnAx4aatiri4swBQfI1fmXe/c13krpttmRBT lVC1IpemzEjr4I47nmpTlDJVaZBT1LdvByGy01vzwHWZ9VInJtS2qpJsOcCg6I2rk9aN cSC/W6niuXxSP24DxaQOK8w2BkoVadI4+Jgq/CJHnYICXTxbYMjCUdyZ5HRrBDO8GAef wTbtudiu7vT+p0llH1+3dMKDuKsEDGlIqH55HrBFNky1yp2VhCrUhSaviclm0Yn8PCiP DoYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eoP4CL94JaZlg7eqmYc7iZiTJ8FoF/Caiy1Z28ZBDWs=; b=nvF0buILT3RKEQ2hoprmGhKGf01Yd55wpZCclA8AziP8eTyecHU9VZ07sM/ZgSdqAG LpqnKGyBM1x3OFFTCggoICQQCzW7aIdCAk5ZG+SyBY++VmUFblcI5s8IUjEGLv+40YVx 38VBHUyO1VFq3muCFNyc7Rk+kwbl5FyAZOp0+W94eyLayYvvU6aQNAl6xD52FyulTZOa oCrajcTlHnZXN+A5yVsRknW5GvLYFuvP5+Eb5yNh+On5sWtfXy8xosHGbuA/uvqpKrjf 2ubhIK+Y6f1A2OdrPRXhrnL99C6fHmfIjbWYjrEDwMrRHWxMuiS48xSGouqWo/nedeQl 6tvQ== X-Gm-Message-State: AOAM532k2ebNnkPq7Fr5ZVLho1D68LH0uV3K90LjMw8hA81Hg1t9vDdI ROveNplhF1A97cz42TPFh9A= X-Google-Smtp-Source: ABdhPJyvmMl4ZymDWUVIAC8xDMf3w9HvnjUuvFr1alvSkvyE+znMf1NKp6HrkTxPmMTyhzLc+D1tfg== X-Received: by 2002:a5d:4d09:: with SMTP id z9mr5270010wrt.5.1623930872435; Thu, 17 Jun 2021 04:54:32 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v5 12/15] hw/i2c: Rename i2c_set_slave_address() -> i2c_slave_set_address() Date: Thu, 17 Jun 2021 13:53:31 +0200 Message-Id: <20210617115334.2761573-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Other functions from I2C slave API are named "i2c_slave_XXX()". Follow that pattern with set_address(). Add docstring along. No logical change. Patch created mechanically using: $ sed -i s/i2c_set_slave_address/i2c_slave_set_address/ \ $(git grep -l i2c_set_slave_address) Reviewed-by: Richard Henderson Acked-by: Corey Minyard Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/i2c/i2c.h | 8 +++++++- hw/arm/pxa2xx.c | 2 +- hw/arm/spitz.c | 4 ++-- hw/display/ati.c | 2 +- hw/display/sm501.c | 2 +- hw/display/xlnx_dp.c | 2 +- hw/i2c/core.c | 2 +- hw/i2c/imx_i2c.c | 2 +- 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 99635b837a5..2adf521b271 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -79,7 +79,6 @@ struct I2CBus { }; =20 I2CBus *i2c_init_bus(DeviceState *parent, const char *name); -void i2c_set_slave_address(I2CSlave *dev, uint8_t address); int i2c_bus_busy(I2CBus *bus); int i2c_start_transfer(I2CBus *bus, uint8_t address, int recv); void i2c_end_transfer(I2CBus *bus); @@ -141,6 +140,13 @@ I2CSlave *i2c_slave_create_simple(I2CBus *bus, const c= har *name, uint8_t addr); */ bool i2c_slave_realize_and_unref(I2CSlave *dev, I2CBus *bus, Error **errp); =20 +/** + * Set the I2C bus address of a slave device + * @dev: I2C slave device + * @address: I2C address of the slave when put on a bus + */ +void i2c_slave_set_address(I2CSlave *dev, uint8_t address); + extern const VMStateDescription vmstate_i2c_slave; =20 #define VMSTATE_I2C_SLAVE(_field, _state) { \ diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index fdc4955e95b..15a247efae2 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -1437,7 +1437,7 @@ static void pxa2xx_i2c_write(void *opaque, hwaddr add= r, break; =20 case ISAR: - i2c_set_slave_address(I2C_SLAVE(s->slave), value & 0x7f); + i2c_slave_set_address(I2C_SLAVE(s->slave), value & 0x7f); break; =20 case IDBR: diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index b45a929cbd9..c0f0f8193f4 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -769,9 +769,9 @@ static void spitz_wm8750_addr(void *opaque, int line, i= nt level) { I2CSlave *wm =3D (I2CSlave *) opaque; if (level) - i2c_set_slave_address(wm, SPITZ_WM_ADDRH); + i2c_slave_set_address(wm, SPITZ_WM_ADDRH); else - i2c_set_slave_address(wm, SPITZ_WM_ADDRL); + i2c_slave_set_address(wm, SPITZ_WM_ADDRL); } =20 static void spitz_i2c_setup(PXA2xxState *cpu) diff --git a/hw/display/ati.c b/hw/display/ati.c index 4c3ad8f47b0..31f22754dce 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -968,7 +968,7 @@ static void ati_vga_realize(PCIDevice *dev, Error **err= p) I2CBus *i2cbus =3D i2c_init_bus(DEVICE(s), "ati-vga.ddc"); bitbang_i2c_init(&s->bbi2c, i2cbus); I2CSlave *i2cddc =3D I2C_SLAVE(qdev_new(TYPE_I2CDDC)); - i2c_set_slave_address(i2cddc, 0x50); + i2c_slave_set_address(i2cddc, 0x50); qdev_realize_and_unref(DEVICE(i2cddc), BUS(i2cbus), &error_abort); =20 /* mmio register space */ diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 569661a0746..663c37e7f28 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -1828,7 +1828,7 @@ static void sm501_init(SM501State *s, DeviceState *de= v, s->i2c_bus =3D i2c_init_bus(dev, "sm501.i2c"); /* ddc */ I2CDDCState *ddc =3D I2CDDC(qdev_new(TYPE_I2CDDC)); - i2c_set_slave_address(I2C_SLAVE(ddc), 0x50); + i2c_slave_set_address(I2C_SLAVE(ddc), 0x50); qdev_realize_and_unref(DEVICE(ddc), BUS(s->i2c_bus), &error_abort); =20 /* mmio */ diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index 4fd6aeb18b5..2bb7a5441ad 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -1253,7 +1253,7 @@ static void xlnx_dp_init(Object *obj) object_property_add_child(OBJECT(s), "dpcd", OBJECT(s->dpcd)); =20 s->edid =3D I2CDDC(qdev_new("i2c-ddc")); - i2c_set_slave_address(I2C_SLAVE(s->edid), 0x50); + i2c_slave_set_address(I2C_SLAVE(s->edid), 0x50); object_property_add_child(OBJECT(s), "edid", OBJECT(s->edid)); =20 fifo8_create(&s->rx_fifo, 16); diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 27a66df7f34..6af24c9e797 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -66,7 +66,7 @@ I2CBus *i2c_init_bus(DeviceState *parent, const char *nam= e) return bus; } =20 -void i2c_set_slave_address(I2CSlave *dev, uint8_t address) +void i2c_slave_set_address(I2CSlave *dev, uint8_t address) { dev->address =3D address; } diff --git a/hw/i2c/imx_i2c.c b/hw/i2c/imx_i2c.c index 2e02e1c4faa..9792583fea7 100644 --- a/hw/i2c/imx_i2c.c +++ b/hw/i2c/imx_i2c.c @@ -171,7 +171,7 @@ static void imx_i2c_write(void *opaque, hwaddr offset, switch (offset) { case IADR_ADDR: s->iadr =3D value & IADR_MASK; - /* i2c_set_slave_address(s->bus, (uint8_t)s->iadr); */ + /* i2c_slave_set_address(s->bus, (uint8_t)s->iadr); */ break; case IFDR_ADDR: s->ifdr =3D value & IFDR_MASK; --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623930878; cv=none; d=zohomail.com; s=zohoarc; b=GNFI9XTRc7i+Ni8+sUB/vGjc9ALbmiuEZ/7J3HSAdCBdguEIYeglUzGWkWV8F/rtkkWV6AjtN7qujPfVtNSzZJ5OROUIpWh7SE4TyQCQzZQJ1tRygC/G5thaJ19um8UX1whGSf8PbxN33h7Tn7zW2YX325ZMsMudSZ+JY2Y4S8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930878; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DtENdvfDn6VhzVLT/89Jq/1ZlyaMFR9nNkP3jZQYETo=; b=m9m1puUEnVdu8og19SjLgDQlXiDmil6UpXWgXYprYI0tctNuQMB5nzoZkA6JsuVXU0rp5uAmvT16gBFYPr/CcHnjo67zm6eUU6sUoh+LoBAeiPJIv6k3NCP549okpcByo/UtGy4tkK1bbgH2jM03NSPNoIyq8P2yKXxhQZyDEeE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1623930878649681.501990194731; Thu, 17 Jun 2021 04:54:38 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id v9so6464142wrx.6 for ; Thu, 17 Jun 2021 04:54:38 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id w13sm4302321wmi.48.2021.06.17.04.54.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:54:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DtENdvfDn6VhzVLT/89Jq/1ZlyaMFR9nNkP3jZQYETo=; b=sD3Nh+DpYARiEPwFRlpCqNmf1bec5ZvkJmyDTmr6ww98byox06r6/rT+qlfn46NIlS Ri2jSVFSiSUv2Bj6vyYcxufbUOH46pejVU9tKKWohTxT5gk2xbDYBrWMiUkxB6W9Ifdv 2fig2fH8e9NKvH4sIM8uDMJBcQZoZi6D9mnnSCke21yKkmwbsGygX1mDTdyJcX+wwiM1 Kb1/Yi8RP7xkFMOwlrQog+zc3oDgpjCDpeLGAFXWXniTxfR5QdQPzn7UdQeP/AmXOIms SWCgbaAj0/1aOJHrDcbXSzcO2Pk0RzWax59sdUvkqi7Grrh2dQ+hmDY4KX8X6b6EIY5Z bpAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DtENdvfDn6VhzVLT/89Jq/1ZlyaMFR9nNkP3jZQYETo=; b=EhvD4kt41dppV/qEtTV4bFuOVO4/iduNmwiLCyCZMjed6f9K+3NDqHwW+bPY3jSBT4 RUpb6IN8PBxwr0XiRP45+893aM1oDSN7pXk7usy92VAUtqUAgOh4yfblP1dDKXcZteJ4 EyghkF265mCKWojw8QxZJtVdZgK93MvTPh//MWKgbHHcLfxX/1HFhj7uknGlXASzhbbd 079o8/1Kmg816uTAkXXWCb6JNe01/cIZ2pYGGTrW2VTKR3+1Kcddn63H1SXOY193GTLX O9ZY111hhSHUR1nPoeQeENZQuu+ayUrBRILrClPwXCu/4I53QiNooL7GrHqw+JiBxXeN IkzQ== X-Gm-Message-State: AOAM532jzAyo8mT0/a5AlReZ13FWWKJ7w0ixuq2TE+FmCpePe7pNYbVo pHiP8PnEnMYgkz7KqaR75B0= X-Google-Smtp-Source: ABdhPJygNMgafvbdZ+odBNFakAc30A8R3rW22k1rXCM/6V1msHnfzfalsIxEuDo6tA/+ZsP1zs2J7Q== X-Received: by 2002:a5d:64ee:: with SMTP id g14mr5442881wri.66.1623930876941; Thu, 17 Jun 2021 04:54:36 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , BALATON Zoltan , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 13/15] hw/i2c: Make i2c_start_transfer() direction argument a boolean Date: Thu, 17 Jun 2021 13:53:32 +0200 Message-Id: <20210617115334.2761573-14-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: BALATON Zoltan Make the argument representing the direction of the transfer a boolean type. Rename the boolean argument as 'is_recv' to match i2c_recv_send(). Document the function prototype. Signed-off-by: BALATON Zoltan Message-Id: <20200621145235.9E241745712@zero.eik.bme.hu> [PMD: Split patch, added docstring] Reviewed-by: Richard Henderson Acked-by: Corey Minyard Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/i2c/i2c.h | 12 +++++++++++- hw/i2c/core.c | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 2adf521b271..21f2dba1bf7 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -80,7 +80,17 @@ struct I2CBus { =20 I2CBus *i2c_init_bus(DeviceState *parent, const char *name); int i2c_bus_busy(I2CBus *bus); -int i2c_start_transfer(I2CBus *bus, uint8_t address, int recv); + +/** + * i2c_start_transfer: start a transfer on an I2C bus. + * + * @bus: #I2CBus to be used + * @address: address of the slave + * @is_recv: indicates the transfer direction + * + * Returns: 0 on success, -1 on error + */ +int i2c_start_transfer(I2CBus *bus, uint8_t address, bool is_recv); void i2c_end_transfer(I2CBus *bus); void i2c_nack(I2CBus *bus); int i2c_send(I2CBus *bus, uint8_t data); diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 6af24c9e797..6639ca8c2e0 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -115,7 +115,7 @@ bool i2c_scan_bus(I2CBus *bus, uint8_t address, bool br= oadcast, * without releasing the bus. If that fails, the bus is still * in a transaction. */ -int i2c_start_transfer(I2CBus *bus, uint8_t address, int recv) +int i2c_start_transfer(I2CBus *bus, uint8_t address, bool is_recv) { I2CSlaveClass *sc; I2CNode *node; @@ -157,7 +157,7 @@ int i2c_start_transfer(I2CBus *bus, uint8_t address, in= t recv) =20 if (sc->event) { trace_i2c_event("start", s->address); - rv =3D sc->event(s, recv ? I2C_START_RECV : I2C_START_SEND); + rv =3D sc->event(s, is_recv ? I2C_START_RECV : I2C_START_SEND); if (rv && !bus->broadcast) { if (bus_scanned) { /* First call, terminate the transfer. */ --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623930883; cv=none; d=zohomail.com; s=zohoarc; b=PbDSeF2spbg55fl4IB0u5FiELPb4GsqeDVL9JR6hUNvHVjWlyy2CnBf+apGQC0p+WlvbfGAwmO7gwEQ+pOwYwmsqjNOReWLzwTWKptG79I+fieKrsysKZ4ozoYI5GujKp8nZugxGFm3g9/jrcKH5wP0b/vVdsihv1LOpBRdgr4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930883; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xZIk02rN/B58vn5urmzzUKpoCipYBcMsvK06nQVHHKc=; b=eNxoYTKULVSjxzJA+3oYHFq/fKd9cXxgtP4Bx5KX+ePRPLGw53FC9IodzvV6g9nHS0qzRAUJUimKipXKaBSjqk3RY9ZKE/sz0L2WUxlp1U0toqFMfmrhXeWRgP8duOloRo0rZh3/SEBKBULcqitybpcrBYmWUQvJeqXsb239UR4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1623930883300467.6918327705009; Thu, 17 Jun 2021 04:54:43 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id d11so4087390wrm.0 for ; Thu, 17 Jun 2021 04:54:42 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id p11sm5131344wrx.85.2021.06.17.04.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:54:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xZIk02rN/B58vn5urmzzUKpoCipYBcMsvK06nQVHHKc=; b=Eod+vIGg0cefzbDAOmaG80IrmsQew7M/iFFJFdmySSzwXU1bWnVriMOQI3QCzHjzCp sumFcLDTAYycWJgr2DMzEVusqSwefYJkhl1+Lsz8337tfy8Jazr2e2Rqv4pTq/Zrx1+H kHmR8Cr+CPASulG7v1izv3dyYZUKrXqzEpUg820lpG+ONIDCY+27lsYueb31OelN9cSs 0vHJJXeSVv6twpZLDXc2CzOLLqSxCeQl3xXoOZSQ2c+YwXEiWOP/p+S1cwpczedMJEVP oPJCoi3zutESkYnN4zQvurI8lwiacEsH2aVzehVMT/tYVFIqBDF+Pu1CEDyGV/h5YNyS ZeEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xZIk02rN/B58vn5urmzzUKpoCipYBcMsvK06nQVHHKc=; b=OCltUNNtIplXLmIom/SHJrPTF959Qd9lVGy0iIsAlUGgmqzzSYF1jYOEwGyk8CDdkq UNIE6YFBm+JzsPgTcIu3mcCsc3PsgJWz8yK3tUoS53A1O+VhpxIbH1hePm/LmJYcYT3M nCJRKFndsqcmPNFy6Su7/hETOJ2hTCJDJ7nhhgb8HGfkkTPsaajZjQBj5aRbHHM3jT+L axJfgG1Qw7OWTEuzqWYay31+vrcYHENpcP9VpLOcOxAlS8mOnTcHL2wbEqSdmCF7w7b7 jOCXn8zrcHKXoVBtA1mCq7esoP6kXM14rxsOILpfl0ia9towBE5Opvzx6+WtNKIzNwU9 2f3g== X-Gm-Message-State: AOAM533ZP8xkGfsFcvbkAEl/+c8nR2WELpc8JaSoI0QMCmcnGX2ntz3u ss2Z8rvvEOi/PtWvH3Tdmek= X-Google-Smtp-Source: ABdhPJzHz030wgO5q/NyLw7VsKK26ZNlHoQRcL27P0GVkSrHAzBdFThYw3FX6sMmf7awBhiqePwbiw== X-Received: by 2002:a5d:460e:: with SMTP id t14mr5287910wrq.149.1623930881572; Thu, 17 Jun 2021 04:54:41 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v5 14/15] hw/i2c: Extract i2c_do_start_transfer() from i2c_start_transfer() Date: Thu, 17 Jun 2021 13:53:33 +0200 Message-Id: <20210617115334.2761573-15-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To allow further simplications, extract i2c_do_start_transfer() from i2c_start_transfer(). This is mostly the same function, but the former is static and takes an enum argument. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i2c/core.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 6639ca8c2e0..5483bf95a3e 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -114,8 +114,11 @@ bool i2c_scan_bus(I2CBus *bus, uint8_t address, bool b= roadcast, * protocol uses a start transfer to switch from write to read mode * without releasing the bus. If that fails, the bus is still * in a transaction. + * + * @event must be I2C_START_RECV or I2C_START_SEND. */ -int i2c_start_transfer(I2CBus *bus, uint8_t address, bool is_recv) +static int i2c_do_start_transfer(I2CBus *bus, uint8_t address, + enum i2c_event event) { I2CSlaveClass *sc; I2CNode *node; @@ -157,7 +160,7 @@ int i2c_start_transfer(I2CBus *bus, uint8_t address, bo= ol is_recv) =20 if (sc->event) { trace_i2c_event("start", s->address); - rv =3D sc->event(s, is_recv ? I2C_START_RECV : I2C_START_SEND); + rv =3D sc->event(s, event); if (rv && !bus->broadcast) { if (bus_scanned) { /* First call, terminate the transfer. */ @@ -170,6 +173,13 @@ int i2c_start_transfer(I2CBus *bus, uint8_t address, b= ool is_recv) return 0; } =20 +int i2c_start_transfer(I2CBus *bus, uint8_t address, bool is_recv) +{ + return i2c_do_start_transfer(bus, address, is_recv + ? I2C_START_RECV + : I2C_START_SEND); +} + void i2c_end_transfer(I2CBus *bus) { I2CSlaveClass *sc; --=20 2.31.1 From nobody Tue May 7 11:54:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623930888; cv=none; d=zohomail.com; s=zohoarc; b=GNN5COBnYwdp1Zbqy317lLUhrHiBeaKsEHcdckFs+FIZeCFS8Ui75+N0IgO6rI3gLVHvid1QADBUFz5BdDRYz5Q6oLUNrho6rIMdhDC9m6gLT9fkfSkg3EIRf4TrKOm4n4M1k2alRmqy+ASAGGg4mTwqxuhnjuSJm5c762M4VOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623930888; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cTmXbAZuVSJ/iAUXGS3uU1Sg/xrnfGmybw7wWkCyin8=; b=mrypP7ArrLlM4voJYslUbfkjmWp7HQXbnCBI5+K1scdIcSzM+JVrNNupxP6MktbgYdmWUZmpHMmGA2Q0I0+ruoznvuA9GA6x2Lgi+dhnjLphIEiSvZJFNjX/AbDDSdAV/9oQxmsekmhwUyIcClRUIp4CoMs/DucxciXQSWGMku0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1623930888010340.41047051253383; Thu, 17 Jun 2021 04:54:48 -0700 (PDT) Received: by mail-wm1-f50.google.com with SMTP id j18so3081114wms.3 for ; Thu, 17 Jun 2021 04:54:47 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id j1sm4415717wmi.44.2021.06.17.04.54.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:54:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cTmXbAZuVSJ/iAUXGS3uU1Sg/xrnfGmybw7wWkCyin8=; b=n5mOzI+QEg/h8yQEy2G7Yx79vFljUN7KfsGw5Tvirhh5YwQtSXCnyBCh5Au4JdnoQL 2djrqIc8ZUi5zryKsjF7RzLZfjGM8kM4iaGhiDGf4d2rz6dsTtMul/42sJPripR9xxQY XBnVZBXNGo4rP6GRz8tVO4IB+vjty1PKHHDO2d7yNZxqfL2QpqcoxGlbgPsqPoEE1ZMT 1V3btKBRJTN2DFoZrxdFGvHJGGExxJDGb9iMNYPNuGDYC+tTsH/eaME71E5A/itpir+j Vs1R+bEmej850VIfmuuvJRPo3BQ7qm49t5lx/y1Shj5TJzCZZuyoxH9Wh+AqyxbQeN0f 6LKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cTmXbAZuVSJ/iAUXGS3uU1Sg/xrnfGmybw7wWkCyin8=; b=EbZYDAVDwj8B+D+/XR9PCfBdXbObyR8PXkROMVsLPt1NtiRwzQM4QMoRTvGLYO+WQE AeIbe9CT2SjqMfCnOEYQWP6O65AJ+RaJyAi/Qd2TG75IcVM+eN6oFKpB2gW42A2vqAKx i8qcODzTgr1pPGU/RKsI3dBn1PL73oO9liadlOjyowlZUt6heIOfRFNBkrFh0ObPPoTq AKcT66ihuAANZynzq59BUn8QxRtuH91O6MERcduY2rI6ZWwaPHWKH+4vJsbVQHKfS3xy eSESd/RiTfF7ZUBprWIPzGcYcvy8ggt9Ty0hTTt4GRIEPtWIj4PHFPPkP8ilgKMpdMN4 078A== X-Gm-Message-State: AOAM530JUpLzrChIuTSlUN8AgoU5eLuplcV5jngqzHmmMn7n2WpXSk/h ikoyeOtcAX9eBMEQRswDBiA= X-Google-Smtp-Source: ABdhPJwwVeom4mbpOdacLMHniBDEf1Nw94Zd+2Qdz7LwchYqJZMcafxa8FAPgPfNmXxz0c5FweCbHQ== X-Received: by 2002:a05:600c:22cf:: with SMTP id 15mr4704358wmg.144.1623930886202; Thu, 17 Jun 2021 04:54:46 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v5 15/15] hw/i2c: Introduce i2c_start_recv() and i2c_start_send() Date: Thu, 17 Jun 2021 13:53:34 +0200 Message-Id: <20210617115334.2761573-16-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617115334.2761573-1-f4bug@amsat.org> References: <20210617115334.2761573-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To ease reviewing code using the I2C bus API, introduce the i2c_start_recv() and i2c_start_send() helpers which don't take the confusing 'is_recv' boolean argument. Use these new helpers in the SMBus / AUX bus models. Suggested-by: Richard Henderson Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/i2c/i2c.h | 24 ++++++++++++++++++++++++ hw/i2c/core.c | 10 ++++++++++ hw/i2c/pm_smbus.c | 4 ++-- hw/i2c/smbus_master.c | 22 +++++++++++----------- hw/misc/auxbus.c | 12 ++++++------ 5 files changed, 53 insertions(+), 19 deletions(-) diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 21f2dba1bf7..5ca3b708c0b 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -88,9 +88,33 @@ int i2c_bus_busy(I2CBus *bus); * @address: address of the slave * @is_recv: indicates the transfer direction * + * When @is_recv is a known boolean constant, use the + * i2c_start_recv() or i2c_start_send() helper instead. + * * Returns: 0 on success, -1 on error */ int i2c_start_transfer(I2CBus *bus, uint8_t address, bool is_recv); + +/** + * i2c_start_recv: start a 'receive' transfer on an I2C bus. + * + * @bus: #I2CBus to be used + * @address: address of the slave + * + * Returns: 0 on success, -1 on error + */ +int i2c_start_recv(I2CBus *bus, uint8_t address); + +/** + * i2c_start_send: start a 'send' transfer on an I2C bus. + * + * @bus: #I2CBus to be used + * @address: address of the slave + * + * Returns: 0 on success, -1 on error + */ +int i2c_start_send(I2CBus *bus, uint8_t address); + void i2c_end_transfer(I2CBus *bus); void i2c_nack(I2CBus *bus); int i2c_send(I2CBus *bus, uint8_t data); diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 5483bf95a3e..416372ad00c 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -180,6 +180,16 @@ int i2c_start_transfer(I2CBus *bus, uint8_t address, b= ool is_recv) : I2C_START_SEND); } =20 +int i2c_start_recv(I2CBus *bus, uint8_t address) +{ + return i2c_do_start_transfer(bus, address, I2C_START_RECV); +} + +int i2c_start_send(I2CBus *bus, uint8_t address) +{ + return i2c_do_start_transfer(bus, address, I2C_START_SEND); +} + void i2c_end_transfer(I2CBus *bus) { I2CSlaveClass *sc; diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index 06e1e5321b9..d7eae548cbc 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -128,14 +128,14 @@ static void smb_transaction(PMSMBus *s) * So at least Linux may or may not set the read bit here. * So just ignore the read bit for this command. */ - if (i2c_start_transfer(bus, addr, 0)) { + if (i2c_start_send(bus, addr)) { goto error; } ret =3D i2c_send(bus, s->smb_data1); if (ret) { goto error; } - if (i2c_start_transfer(bus, addr, 1)) { + if (i2c_start_recv(bus, addr)) { goto error; } s->in_i2c_block_read =3D true; diff --git a/hw/i2c/smbus_master.c b/hw/i2c/smbus_master.c index dc43b8637d1..6a53c34e70b 100644 --- a/hw/i2c/smbus_master.c +++ b/hw/i2c/smbus_master.c @@ -29,7 +29,7 @@ int smbus_receive_byte(I2CBus *bus, uint8_t addr) { uint8_t data; =20 - if (i2c_start_transfer(bus, addr, 1)) { + if (i2c_start_recv(bus, addr)) { return -1; } data =3D i2c_recv(bus); @@ -40,7 +40,7 @@ int smbus_receive_byte(I2CBus *bus, uint8_t addr) =20 int smbus_send_byte(I2CBus *bus, uint8_t addr, uint8_t data) { - if (i2c_start_transfer(bus, addr, 0)) { + if (i2c_start_send(bus, addr)) { return -1; } i2c_send(bus, data); @@ -51,11 +51,11 @@ int smbus_send_byte(I2CBus *bus, uint8_t addr, uint8_t = data) int smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command) { uint8_t data; - if (i2c_start_transfer(bus, addr, 0)) { + if (i2c_start_send(bus, addr)) { return -1; } i2c_send(bus, command); - if (i2c_start_transfer(bus, addr, 1)) { + if (i2c_start_recv(bus, addr)) { i2c_end_transfer(bus); return -1; } @@ -67,7 +67,7 @@ int smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t co= mmand) =20 int smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t d= ata) { - if (i2c_start_transfer(bus, addr, 0)) { + if (i2c_start_send(bus, addr)) { return -1; } i2c_send(bus, command); @@ -79,11 +79,11 @@ int smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t= command, uint8_t data) int smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command) { uint16_t data; - if (i2c_start_transfer(bus, addr, 0)) { + if (i2c_start_send(bus, addr)) { return -1; } i2c_send(bus, command); - if (i2c_start_transfer(bus, addr, 1)) { + if (i2c_start_recv(bus, addr)) { i2c_end_transfer(bus); return -1; } @@ -96,7 +96,7 @@ int smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t co= mmand) =20 int smbus_write_word(I2CBus *bus, uint8_t addr, uint8_t command, uint16_t = data) { - if (i2c_start_transfer(bus, addr, 0)) { + if (i2c_start_send(bus, addr)) { return -1; } i2c_send(bus, command); @@ -113,12 +113,12 @@ int smbus_read_block(I2CBus *bus, uint8_t addr, uint8= _t command, uint8_t *data, int i; =20 if (send_cmd) { - if (i2c_start_transfer(bus, addr, 0)) { + if (i2c_start_send(bus, addr)) { return -1; } i2c_send(bus, command); } - if (i2c_start_transfer(bus, addr, 1)) { + if (i2c_start_recv(bus, addr)) { if (send_cmd) { i2c_end_transfer(bus); } @@ -149,7 +149,7 @@ int smbus_write_block(I2CBus *bus, uint8_t addr, uint8_= t command, uint8_t *data, len =3D 32; } =20 - if (i2c_start_transfer(bus, addr, 0)) { + if (i2c_start_send(bus, addr)) { return -1; } i2c_send(bus, command); diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c index 44aa9730bc9..434ff8d910d 100644 --- a/hw/misc/auxbus.c +++ b/hw/misc/auxbus.c @@ -135,7 +135,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, i2c_end_transfer(i2c_bus); } =20 - if (i2c_start_transfer(i2c_bus, address, true)) { + if (i2c_start_recv(i2c_bus, address)) { ret =3D AUX_I2C_NACK; break; } @@ -151,7 +151,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, i2c_end_transfer(i2c_bus); } =20 - if (i2c_start_transfer(i2c_bus, address, false)) { + if (i2c_start_send(i2c_bus, address)) { ret =3D AUX_I2C_NACK; break; } @@ -179,7 +179,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, /* * No transactions started.. */ - if (i2c_start_transfer(i2c_bus, address, false)) { + if (i2c_start_send(i2c_bus, address)) { break; } } else if ((address !=3D bus->last_i2c_address) || @@ -188,7 +188,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, * Transaction started but we need to restart.. */ i2c_end_transfer(i2c_bus); - if (i2c_start_transfer(i2c_bus, address, false)) { + if (i2c_start_send(i2c_bus, address)) { break; } } @@ -210,7 +210,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, /* * No transactions started.. */ - if (i2c_start_transfer(i2c_bus, address, true)) { + if (i2c_start_recv(i2c_bus, address)) { break; } } else if ((address !=3D bus->last_i2c_address) || @@ -219,7 +219,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint3= 2_t address, * Transaction started but we need to restart.. */ i2c_end_transfer(i2c_bus); - if (i2c_start_transfer(i2c_bus, address, true)) { + if (i2c_start_recv(i2c_bus, address)) { break; } } --=20 2.31.1