From nobody Mon May 20 06:18:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623879784; cv=none; d=zohomail.com; s=zohoarc; b=XP0psEvb2ja+B2wC2QHiAf76Iwp+sps8rxmKWDcmQFc8Ze4jTondcCrYsM+KSR3G4o2Gm+HLvWZbMkxMvOC3F6W5tVG+rG9AtNbNxVoOUuRXK3C6txmEws4KgSKM8IsMj9wZeYuc+5EzRRVK2c9bu6S0cBTMzBVsxonYl1cuHhg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879784; 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=JSUuwqoImU4CT1yV1Lnj7A8vY7LLMtnWEG+bWxY0LUnteVdXXgKWb26EUXE5+Ux3k5NkTbGIrisGgxqOT3XycAG6CmyuOTcDB9CRCp9eks0gxZ4Q/1KKLA3rO+18g7NQyCraEFpLVfhJvqbwRIMyitILr1d6v8ByRhp6BMvaOOI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1623879784569845.8278501968526; Wed, 16 Jun 2021 14:43:04 -0700 (PDT) Received: by mail-wm1-f53.google.com with SMTP id h22-20020a05600c3516b02901a826f84095so2441715wmq.5 for ; Wed, 16 Jun 2021 14:43:04 -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 g17sm4428892wrh.72.2021.06.16.14.43.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:43:02 -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=a6HLvyeOUy+kdQJDm54TvJdrTKORiDn1Vgjl/okbW+FMU0F4ryh79m4t9uM02NYW9D Hw0Ib8djFZ36BUMaEZPK6PR0T++uVa2l01ogpeuNqPrLIrizgVnZh/Vw8CF2OipK6xtk xeFgd0oxFQTnVCLcDx4aNdv0lIx2D9bjK14pRZKmucOltdA7Sp5mqma+QVGxbgG++Vfe 7EXYk0KeQYLZYIStcGY3hloSd7qHoCBoFfQqXf3hG7u6YBzyrXGz6BzQH1za2PnUtfXE ojMNL3/h3wjnKcCm0DBmdEPllRHaeJO9j5rHsByvlt5w2FHcedZCqf12ymhQxfNAogDM zfHw== 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=TfZYQa0AdBqFD2F//x9yUJEsdpxpZoPVSYOYsiOD6z8H1iFd33lIROZr9Ti4Bm/l2D cpBIU1t0YOnMGIJ1QbpoWiWleuuGr7/DjwhRXp8c9WFmYEVEc5RnZ9uqjXlE2tuhXVcI Ct6mE7Phg3KK6vSiyfLAOPe1RQFeDN2kBsRjGBaQdK8BNf5o50UT1qxoDRsRwYoVXrJT ZEzgLweqvQYoEP9DnUELpOvuD7qhDrPeWN2zLA84Xml9gAapYbdD/q+T4774vLdcBGiO /1HoR0cYk4peyAKsRCSxU9pn4QWpmOPRBHyp1M4bOeQL8Q3atOss53cJ7JC1gRBhJ4oJ x6zw== X-Gm-Message-State: AOAM5314euk4/RQSsgYnVNmk+wXUcTCYyyimQdiJKDEVHSecxufBe92z qAYZ4eZUWzm2JXBA9C6M7JQ= X-Google-Smtp-Source: ABdhPJxDm1dB+Ts5oJwgx63IQ/f09wKmyQ8DWgjVVYEAgV31pVUY4vyLW7cqfztS27Hx0XK8De4WVw== X-Received: by 2002:a05:600c:4a29:: with SMTP id c41mr1118056wmp.17.1623879782815; Wed, 16 Jun 2021 14:43:02 -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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 01/15] hw/input/lm832x: Move lm832x_key_event() declaration to "lm832x.h" Date: Wed, 16 Jun 2021 23:42:40 +0200 Message-Id: <20210616214254.2647796-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 Mon May 20 06:18:23 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 ARC-Seal: i=1; a=rsa-sha256; t=1623879789; cv=none; d=zohomail.com; s=zohoarc; b=EsOm9p0rQKD8Y9Im2wM0aTguSMW2LED4pUzDEpXYB2b7qQdkR/mQvQaSnDlbfR6c7eQD0TfM2L+eiqrNMPOoM2Tjgzyuj+Gf7SpDA+MxKS371ptUvH1yy0uUeLqtA+wQZ2d31YnikxjNAqznc+9C82l8lLTPRUFUaB29Yxn/Ar8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879789; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=g7tkCcGMeSxkeYuEayXQwDf2U36P/eV7M7g2ybGL9KI=; b=PbKkDMbDjtAxrhIINFRE4Atnb6Kbz+mydJa/Rm7pliVGiX7KxRZJlit0Qv3F7N7UHHErtdvNDNxvHYjmHLAYNABhxAdLy8tlJuUYq8VshF+M8BvDgQGtM0bUQJ1pOSYXY/uFDFPOs+RQQnkf1ofrSjUDezGKpOVIvOaDom2UCpo= 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 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1623879789937121.17872657110206; Wed, 16 Jun 2021 14:43:09 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id d11so1887007wrm.0 for ; Wed, 16 Jun 2021 14:43:09 -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 n42sm5915203wms.29.2021.06.16.14.43.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:43:07 -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=MXyh0QJxX4897RGnRCyxdlv7qycF6ckt+c71prZb0zkZuaBofoDZwufM4OcMbzmvc/ +qxJMxNHy4/Y446EGjCXTc7GnXMGA2t4TvyXgFZ856k1CsguNf6mhGCdG6YHBP+luI+t ZinCUZk85pxZ0FCM4Rmgx38ISZUBYxeuqAlDUSU3SdMdPZ7KuceT4Z2Ow+Btxw+jxICt /6Cd7cT1JDx61xqMIpuE+Ez5y2XGp7NZn1/2jm+Zg8UBlxIpn35H4xN/TjKpfSGgA3Ut HHskDbJ1lYjc/c4oEwmNbVN2Ns2tLjk41Uep/UAxAvsBfhob9JmmOm7HqXFvgnvSAXkD DaVQ== 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=tBsDlK40om+eqAyijUhydRattY1cYXmbLDyf7qzU0wrQ99bjX79WAL0LIQuqqetF8A GahdTKs7a3NQajrdl5r0L0tbUu52iYfSMtZvXfEWvGMjZYpMUM4StB1OpArcqhOc4YVh i6DRvjUcm5b+OF96FoFhnvoVNDE0+kA0Wke/IUonBjk+UXsl9kjVNF7J8jscD7MXaBzO /wI08DB21bDVVcXWgobYb6P9coKo5/LXNLOK9mWsluLdBOUgMUgzeCCb5KykbHjZ7YdF WcLLbEAJFKhmEG9QqUmSCWcWzST5+bKRy62OMH6TAIeWr3QzOfqSMfTQ6DwJIxOOwTAw U9PA== X-Gm-Message-State: AOAM531mjtazIE6jt72hACRX8d/9jDNQlLdNPy1F3Y7mh0P+eBO3t2LV 0YrlpBafysmpNyS7EaY9CXY= X-Google-Smtp-Source: ABdhPJynUDqQJyXLKSbnVFL98/uei8Rv/tGLQkbPls0tPGBMgig48jVQemFb286ZWmXTMHYyK9MBKw== X-Received: by 2002:a5d:59a3:: with SMTP id p3mr1475921wrr.284.1623879788243; Wed, 16 Jun 2021 14:43:08 -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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 02/15] hw/input/lm832x: Define TYPE_LM8323 in public header Date: Wed, 16 Jun 2021 23:42:41 +0200 Message-Id: <20210616214254.2647796-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 Mon May 20 06:18:23 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=1623879795; cv=none; d=zohomail.com; s=zohoarc; b=akEbE1bVI6Dp1YuGdWRBJgduzqF9UGfcbmrKMvi71pdw5+61Mo7P8PxkoZjerIBlQ+GK4of5TYqc2d8keJRDbEdE1tnpl0Y+xfzkcfGWCtEegkbK+tUgjAtyNrS3mXIvf6ag/7ZofSHOYcqt1UnwLJ4smtH2n1E9VVPL6M2dQv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879795; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KW5lTjsputo7N25OpKrD+E7Eo0jAOCluFxXj3IjGob4=; b=h066MjUKrmVaJG/7ANXwT5ZhTZ6YBv+dg+qIWu7psjqSjyYKm+UHjszHdi260rtO6DLXed0wG59l7nROtXg3zForgzJBNPf/f7icQpzs0LYyWqoMGE4J/5xWrB97JCGZF+xXFHI3ipd4E9U1hjTUnM6V+Zz0AWGnWkMnyoOVGiI= 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 1623879795054765.4780989818432; Wed, 16 Jun 2021 14:43:15 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id f2so4229295wri.11 for ; Wed, 16 Jun 2021 14:43:14 -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 l16sm6257864wmj.47.2021.06.16.14.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:43:12 -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=KW5lTjsputo7N25OpKrD+E7Eo0jAOCluFxXj3IjGob4=; b=tMy4VHt4cCksI+edMUqDzMEwYxEhb9sNwPo6gTSjNBcXCCFuAFHDTD8zWcxZ0ByPPS U4tyU6SnDoT8+reloz2RWfUF+HZWwy4cAQ3flszzzpoJMURWEj5xHRcck2e60wJckVF3 OdHD4aUa3hDsGUwr9Y0CDJWte67UJUzKve2nqoHNKqxQj7pATwo1COD6hxuhXX6EUK6m R476B+f5fAcG76Ckie6Xde5bxk4DpNwnes0TppWsZ/2C2Db7gZ04kH+lkOkEKzt1/Mp+ chgG/dbfl2RKnaJv5Yjafz7H5tUNZKISzCsWMy/98jkHNnSjhnjECeAoXyAhvIawP+5s iNvQ== 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=KW5lTjsputo7N25OpKrD+E7Eo0jAOCluFxXj3IjGob4=; b=m6V1hR62shsU8xOu1rWB2/r88eUSnIbnMdruFekMIoCQaK/bOF1xB+5GSNm4IpyKb0 yg7DCh73UYf8E9wzopCcUvvm8SHogWEd5gjuUchUCSHVNcg4FRPDc+miX7ltpHuFA6Ma 7T/SvSrob93DjAWqDYftPSsBbQP5AyzUg/v1dNhR1BSkzgiLJA433fgZSenz0HWZaqVi 5/xdjhJh2EexTHrqXPbUjN5HcdTfNR4gWIn1SBd+iqFJFRqFZ1X3UzQ6C4HeTvyIWFe7 DVF5C+JJ9AAKhSldX4hGa/M9TU2yGzl1SlILWRFh80VgQdeXp3I4xiHf0MZ4c0xvHVUP GhAQ== X-Gm-Message-State: AOAM531wlcBIrEJmhSlevZQVH3LHXPrqW8NKl4o0JxPDhbi0nFhPq8Rf UT7n6O8BjkWQ5nNC9jwe8rM= X-Google-Smtp-Source: ABdhPJxk6iAa2/gl5WSyjWxP/h+RLiIYg2I/CkwdOJAz9BukIvRnALISjLvKixQo2zl5muPRD3D2ng== X-Received: by 2002:adf:deca:: with SMTP id i10mr1469987wrn.344.1623879793348; Wed, 16 Jun 2021 14:43:13 -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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 03/15] hw/display/sm501: Simplify sm501_i2c_write() logic Date: Wed, 16 Jun 2021 23:42:42 +0200 Message-Id: <20210616214254.2647796-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: BALATON Zoltan --- 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 Mon May 20 06:18:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623879800; cv=none; d=zohomail.com; s=zohoarc; b=chm4huvvE32o2uzM4NuD3+Z83sVorfLyy7DPEN2kNbuhxOejo7k8iq7+O0vapIU/s1YTxKC0KUHEO8PP9B2vdpE5jtpjzspbKHDnKP06EMh9xCqUD1jJymT4CBhkGwFBQrO3rzwxa7rduICE67ngFWx1AaJUvAWG/dxjJjmNieo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879800; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0yFcNPzCMbJU7ln7mvR4pO20Y4U4Q8SH66r8xtnNF00=; b=n1AJOikscXtzwKck97J/0rk4AcLtZiBldbvezwbgGFbgbkuABO13vh05yvikNpAUaSsbdcNueuuUXQAH8hhBwt++B9G9AdL06eyzM/x3unbAksHqzmX9GICPAFuaC/GRVKcUkrhld4qnFDGWvAsxcegXqlhM8XfsWQaA9JyDiy8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 16238798004761009.4081010255063; Wed, 16 Jun 2021 14:43:20 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso3883861wmc.1 for ; Wed, 16 Jun 2021 14:43: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 g83sm2774930wma.10.2021.06.16.14.43.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:43: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=0yFcNPzCMbJU7ln7mvR4pO20Y4U4Q8SH66r8xtnNF00=; b=FGNPUiL5FbXYqRdvJbWw08nHuEVPkkLQWO3dIKPg4eIrnDIrZ/t2Az9Lb/13ZRhHWW pFI9jrhy/0BG0WNjGFJikNjFZP7eIYbKtlksuzn1Ri6tH20odsEW54BGEPlf3WypPaPy bhH0/8RHQTik1hAOXACc1EV49uqrLzRHhSLUE+jhRUNEPWMgMQaB6RSujRXJZZyCQcv0 gumOjJ6j1z5dfhb/qmJ/KOi0xEKjsVeNIdGZ0w3VeoNtecGzY3LPKQS217DKtDM/hX5u DrVThsjEoLvgKi/KIIwLpXtYVLJlmApk3/O5ng/SceYaJ8jIS9w6hWDgXfgGMJT8IyQe /SdA== 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=UsfHdzhPYvI3VuoGp2zLs9zdxAhdn+FK8CWrZprNv/lSLnUfLJSkxKepGZFasQc6Eo LRXZD9rWJiDRsx7JbtwgVsZo2fpU5/Y9892Og/Ux2AQ/MsMdYbpY0T3PaSeC6PzcPIHp u4dhTwJYTeKIYvDyRjPfW2vnQZJ3EaCjRaQn8jMYnw4cSWgv+saEimu2bQVl9231q+Qt vle0JMfNujI12ZpnUoB8qTAtd6ZnVJQ1uk09etrfh3yxySoDwJrMqzAIrDCwjVNcNqAq sTyJbHLLu2EudyoCLW0c4rrDcQs93jwtdcKW2RKB1mBgpfFvYesG2NrNL/VXOu5DxvFk zwGQ== X-Gm-Message-State: AOAM532NQgg2ilLQ31nIsFtMyo2FX7oic+RVoJHDxEgdwZLpwBkT1h4e NC0a4t4oWnP6RFdh/KbW46v2FBvfuiQo/g== X-Google-Smtp-Source: ABdhPJxhBMZ3plpWqUCV/ntCJzIaSp8TTk8ea76Lwo8chj0L2B16yWhoMRGrRQ67Sxyjncmff+qbYg== X-Received: by 2002:a05:600c:4f0c:: with SMTP id l12mr1105780wmq.93.1623879798779; Wed, 16 Jun 2021 14:43: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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 04/15] hw/display/sm501: Replace i2c_send_recv() by i2c_recv() & i2c_send() Date: Wed, 16 Jun 2021 23:42:43 +0200 Message-Id: <20210616214254.2647796-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 --- 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 Mon May 20 06:18:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623879806; cv=none; d=zohomail.com; s=zohoarc; b=LsiigFvKr6nxoEnnBFHcJwuKw65t+NkeVkagpibNaCt9o/TCkf6iZSVAFE/uzuMLydbOduIS2jEy4Yqp/nHM9/TSQmrMD3NkMwe81i7rg6WAtMWs378D/Jyf/IPm1NNFA35itROBYU3CmaNEvLTmFqxjHhY75kFWbmvafoWVZ8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879806; 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=m6RLVVnp40jeLlxuLPkGA+4RnICpkh8m1/s1Ae9YoMp77NNoSh76HKYAjgLt2Z+3i9F5Hm64F1mAOVmD+YG6U42KtqBGMmR8jbF59LCbKNecI5ErXrLq6yNug1/Ca0s8PVqOcm0+E10LwwCgJcNdylJDA+oM5uXYT0OLdHSe61M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1623879806248535.3866260725761; Wed, 16 Jun 2021 14:43:26 -0700 (PDT) Received: by mail-wm1-f42.google.com with SMTP id m3so2056016wms.4 for ; Wed, 16 Jun 2021 14:43:25 -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 p11sm3284037wrx.85.2021.06.16.14.43.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:43:23 -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=kGzSERqh+8wBxiJCuZax69b35h3ezUK0XWigjo4qNm3l/5MYGNdOHFhNYAq+qNwNJk 5YcH4FdjrTrP0w4CA5xdInQP3jwZS+ZlMcd5FvN3uAiNwv5G4VNgAFaxLZrmYLfSXfAn +JjYTuUyo8SvVxI8jhKsT/XnfwTEdcBqBlcFCDlt37BdTJipV7fG4NTOCBcGBfSNj9o6 It+Pz2Jhqguz0hggdTIj7M8TFWA9Oig+nFZ6h/qtR09D49wbEJaqxwr2FdOBZfTlkCzX oMsNghWh08w+8GDexu5kYihYcPFckGtX/q8QxfOVWRKyvw/VM27h4BY+kSPoyki6K87r XP4w== 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=YY10GQ+7UaXm8TticATNEgUrQMFVkW8LKtz9Ec5f3JnKFWjiw9AsDS3LcVnguX6Das dRKxAszMfM1CBSRxYs6WVZirDcWiuwcxjSD6a5028SyGI14r9NRLo/Coa/kJcg3aPTqt nsex+wlHZYSIfVIsEeb4qShXqfv1vsv8U+rrr4fWDm9kTWOOpESyUZwANkO19DEZrgo+ 6LS6K4R9gStzO9/DFfwAP2Ox0VYPq02OLrlmDJr//BY1YscvxQmaeixxrdaWjyVTX/uV G483AslAiT0WuQeLn7YHHtlzv4T4GdM8T6B5ohYnUOSdNQIcgvCGxwACWZcHF9zW6IYt /EtA== X-Gm-Message-State: AOAM533oe8N2T+XNeu5HEHtVZPLVNBOGlSBLE9VFjHOKYp3zJaq8XUXT lzjDPhC83SX0OR7G7NsG+iTF2MQvyvGHUA== X-Google-Smtp-Source: ABdhPJyKCwyfFF7V0tlQyJx7sNkEw2Tvt9Ymyf0BG/IOIggzM/3tTVdeosh3rA30n7fJii+IiyYwrg== X-Received: by 2002:a7b:c10b:: with SMTP id w11mr1117395wmi.186.1623879804348; Wed, 16 Jun 2021 14:43:24 -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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 05/15] hw/i2c/ppc4xx_i2c: Add reference to datasheet Date: Wed, 16 Jun 2021 23:42:44 +0200 Message-Id: <20210616214254.2647796-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 Mon May 20 06:18:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623879811; cv=none; d=zohomail.com; s=zohoarc; b=hwG0TiwoXwqUAvW4JDnXZV73gbsUcytXTyyYyJ1gn/bz+KqSM2Aat/Oh/7S7F/OyJA90F25OTXSRbTwdOH1yucBly1rUB8PVKBa6LOKJPI92FCYHcVXk54JprIxSgcpT6KICizawKm0q9cEoD9muX8aL0ECTXdZnbPvDB/zHfvE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879811; 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=iSQlZrYcOGpoKuihsK6dpSLltHC+0/2X88gq9QttDFtmsB2Ugraa4R/e5vJMHpudrmolGYRqn0juPyUGfQcgurhyUi82X9JWqNNp544L4iQ5YXOT5SGz5gIHz8wKikWYXE8tGtQv1i7+zMdJlXF3HCMdbXatV6gzxYfnOVctdfA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1623879811823953.4171990835871; Wed, 16 Jun 2021 14:43:31 -0700 (PDT) Received: by mail-wm1-f42.google.com with SMTP id o39-20020a05600c5127b02901d23584fd9bso2188439wms.0 for ; Wed, 16 Jun 2021 14:43:31 -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 m65sm2796646wmm.19.2021.06.16.14.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:43:29 -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=gSI59bBqHbKcJKwzyvgmBKRH5hvXTSABasX41TFH0De/0Ui4pY4hIG+zBJDeqUbSnC AU9C0rAUllPQMS1RoWs8fBMLcNvLJZ0TpfB6Py1dX3YMzI6Z1P6vYxfOhdqbOwqQtMI0 1jb9RSyzBw+QTY3cbEjP1dWgJm1qFfjjQ33uMbnPvrjFqt8yUmlyDXDx9r6kFglH27AO 67bXjcDjEIcWlX2B3qfEvr+5RAhNehJ06q2u5sCD78bjhGHs5uIp8+5ZhCRz3bBOr15n 8WwoonqxtHQJDib8Lez0oT7RO75UtBh+xQppFshNYBZg/tClz9hWJsJj6o7YGia7pbae jFGQ== 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=UucTMcYbIPTRtoCCqTAgH1LlxUNdUTU4PTf5oOUddJk3P4SyTz+45ZjIFrN1Q52Zwr 09fTBrxel+SyQxyODgJ99tYRIfu5rdy4OqXhHUN4HFRpBzA8+ybUknfAvBIZuJf2fXtz lPOWfVf8rZCcxyZUefE958jDOX1i+PWO90o/+j1PWVjtV6f7s0JBzefZhHgmC0KLCGbY /2vdCH3Db5EPJ+vaBAvDhQjoVeX+XxPhPqKE1uBu/v1VK61NomlzY8lA9eb6aya2qdz7 Thou9GHJmqTPTX2mucxux7R++YCdi30MvycTFOYaFnl65U4lwQL3/JwlBiplC99ededg KaRQ== X-Gm-Message-State: AOAM532qZE0E38+ytJmMfk+IH12EeN1sV+OoPrUSg9Y/cBW24CiK76YJ Ki/ZO3mGBggcF6Gr0ULZck8= X-Google-Smtp-Source: ABdhPJzyOnHL/3rjKttzyhAZVqXsPCbeOclDkPiCFEC4/znyX8cGpgc3MpnVNXBnjimOhHz5PakZ0w== X-Received: by 2002:a05:600c:1ca6:: with SMTP id k38mr1147060wms.49.1623879810085; Wed, 16 Jun 2021 14:43:30 -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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 06/15] hw/i2c/ppc4xx_i2c: Replace i2c_send_recv() by i2c_recv() & i2c_send() Date: Wed, 16 Jun 2021 23:42:45 +0200 Message-Id: <20210616214254.2647796-7-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 --- 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 Mon May 20 06:18:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623879817; cv=none; d=zohomail.com; s=zohoarc; b=ZRWYJc8YSOAefS6AVAuHgv7Awo2Zz8kXm7T4rzrRXafF/ZwET9OcgGt9vVD5EvblbuyZ3Nwo2XzzBLeOMgm32AohAxOIGO/rXrMlqcA2wxgljp8WM1teUhKxqD97Bkipa+gx324J9YZbdQDi0UYZrUt6MCfjUR2TeK8+fsd5LXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879817; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ePgJDFFOw4rGg/va2x01kE3ubJf7MZ1h52aSuruLrco=; b=UKMLE0sF6/lALuGWs41j9KcO5bN1Sy+OSxnmlChaV2i4j4HTJDKHQdegvo7peiZegDCx0U7efAQJhz1VXBXTkq/lx4ie3nTriW0LWn5ZQUJ2Z+cVCorpf18McBHebdHPbDoUdFsXWx2Dcui4HR9RarozPLSCJqeNSjdhKQ3HtHA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1623879817116328.39204573233167; Wed, 16 Jun 2021 14:43:37 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id i94so4252485wri.4 for ; Wed, 16 Jun 2021 14:43:36 -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 j18sm3328687wrw.30.2021.06.16.14.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:43:34 -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=rW/98W/lMx2v0/s6Cc7n0Sb2bQ3LUk7jsw87TOCYYu5qA4qyo2R+sTfkynbRx/BXfF uodxXLpCCF9Zuzp7PO7vIzTsgYNVO81rdkyt4yROYm3cJhZ9f4/4huMKAHZ7rerAKzX5 N02snHPhvN6M+lFIvP7DMePV6GV8jwXcJQMvkb/2Wm5RTYtONVQIl1VUOYckK12SJHGB pMIKnuV5uhdjB6ty2s5JA6VBOT4XWIxbuLH4w/Yi5zYpsQM3DveDofq9X8OIkFun/ouS s6rb8CWIsRlMcwF5np1/609I+EMiSVJQOF8w7I5Auzf8ryVEYYGzPgOVcOZkiUoSUzA7 nXmg== 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=VbAFiA6xwoxExvtWGYaMCs95XEj86xppcGs/jUxydC/neo7RUNuydUqkwZKF28lVcy WsGcxKKrprwB4/M8cRpez0Jav8OuHSUcn+3luPVxlvBZTXtT+MEfFAIgAeUef8KDEA8F VKRPsb3CbfX6jYPnrdV5UAdcgsYRs0DTLrIWDiLo97n4CLIX/wCai9RkMEWtLXVN5qUe pXSNaQWBISIh+3fEldkKVpHxXzpBKhB+/ObmwDtJOKanQ9ffJhkTaU0puxLLnP/RQl41 E4dJlD0mtMB5wX88pMRqeBeoRP70e8zAoR6JgYn6AbEOAvoh6ZLCu6PL/nNjln6bwkGw Y01A== X-Gm-Message-State: AOAM533oc3BKsXO7nrJOYC/4DG61E4fxNlhwVo7zyDqU6OusM2rtpCsj O6GKcH+Ex511K3CO+8s6DXY= X-Google-Smtp-Source: ABdhPJwgGPAVzsgUylUz4UgJOqI99+YbmA31IKk21sxdfAgmdTbXP7ktYNsBjFHQh62R2q9ASYVT8Q== X-Received: by 2002:a5d:4ac5:: with SMTP id y5mr1492329wrs.18.1623879815458; Wed, 16 Jun 2021 14:43:35 -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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 07/15] hw/misc/auxbus: Fix MOT/classic I2C mode Date: Wed, 16 Jun 2021 23:42:46 +0200 Message-Id: <20210616214254.2647796-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 Mon May 20 06:18:23 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=1623879822; cv=none; d=zohomail.com; s=zohoarc; b=UgzPTN5DNfWWvONrdMza1+9Cu/zobIIS240WNsmKYZnMmsKklhMtJatWpBkbs6KFrrL8XpavhNhBKuWBWhQCaiONKmTLfAagdiH3uPrBuQ2KxnMDiOKWgSWnTJgN6cVgsI+ayW/A+Gspx8qg+6V1z9fZC2e6aqRRGSinEq6vfW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879822; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mF7eiAdIfTv9rlxceo15bFIxRiqB6zGPW3KZaJR5WqY=; b=D6V7Eltgj4K2rUA6rqDZu68RwtGpv+cmKABbtREqY1ec4spMOEMCV6gs1p3sz2E33R1/yrL4jy7olp8czM19wkgpaqO0Z19MdAqJ6ZN6miKIPQAkX++N6l05nlF+Bbf3yfo0Cc7lDQbSDUB74zY9ctDJ/YHlzKuHpsIMiNEbHMk= 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 1623879822437464.70973927012267; Wed, 16 Jun 2021 14:43:42 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id c5so4239273wrq.9 for ; Wed, 16 Jun 2021 14:43:41 -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 r6sm3327992wrt.21.2021.06.16.14.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:43: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=mF7eiAdIfTv9rlxceo15bFIxRiqB6zGPW3KZaJR5WqY=; b=QMUPRVQkv8w+TrL5LUs46LyomAhgxeYc6Iv4T9V/4h98/UT7+h6vnIgZtw+3mYMsDH SHzNobKCtLbSvMkdgLDJrgb5HBnSM+rUgKh2ZCGC81OLcBWZKz0LzaLHBeO+OMwzvgm1 XD0jXJLv2B8pzG6sE5tkkmPKqR0nvHycbgUdVfvfiDmJhttdj9VrImNrjbdnYrlAU1KZ E68/OE+wM+dFM16SkiBh46AsRcVU+JVBYxcyM1H0GIC8ckNpqDbjTvr4EC+xreTJxIaf VhBko9pMmelljYx1m9m6cB4bCHhvVG/BhwhtNcU9Wd8+CGr7csID9MVWqKNDTiLac1Ta Tq/w== 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=CJZrvApdKO/wMdi0etdfdersmuHI++5fUItzseT53F03MQBH81ReIJ5EjI+Gejryvd 9pMcsQbG4CoXMQs/PYOYXQMhz3hFrYMh4oaBW0mbsG7EnHo7+CdOB5fjEpfJNAhf2fCe rZIDI4iMNygxE3Q1kguVMr9/JwzvN43AW6c4Uc6uCw8TPRV4OdSHXnGLi7u2lTnuDQRZ 2O95imMeImJpsPUa0X5sfhOs553Ncu3fuOoY/EQGU7HJoM8tkubTeAfu0d0YFoIKZdu/ GbG6EsfK63V6BUoXpwRWHhuTeiaPt8iFaW6RkyPyWYTZZC3RxMIYz824ID/+SaJEXt7R 72tA== X-Gm-Message-State: AOAM533AU5uRxYOZllVZqS6ZII0c0+lSivky3kELr9FWAYAdIpO04FkY 3IKoaRDSLYuiISi1XoKhDTw= X-Google-Smtp-Source: ABdhPJx8MRgUu908mGTfweuziY3ft6u2iJgrTYsp1q5007xKsFYSEQhHOAl/ba99Xzy5MKO2/i9dUQ== X-Received: by 2002:adf:d1cd:: with SMTP id b13mr1364249wrd.317.1623879820737; Wed, 16 Jun 2021 14:43:40 -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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 08/15] hw/misc/auxbus: Explode READ_I2C / WRITE_I2C_MOT cases Date: Wed, 16 Jun 2021 23:42:47 +0200 Message-Id: <20210616214254.2647796-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 Mon May 20 06:18:23 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; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1623879827; cv=none; d=zohomail.com; s=zohoarc; b=njrkCY106slwSPgMF7YE9gcBtyvB4y3zVis99zMFz9Pzu2WS3aYDEDuwlYhU5sYXe4O7jeiEucqQ0UUnt375yCo5pBGtbX6Bjltjhp4eXdwQgt4VuLj5twiMmWF2EL47hBNtmlcB0/Tw0lAgXUpiwVP78TCUiYecRu+g9drIMJ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879827; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TAZ5Nd2Zr4AEdYczPbEyYCejydYTPBGPwGnfyFJKBD8=; b=HkYhS9PQB20ThP4lRCpoAG1/5VZECE/QGj2sNxwF6gpM4TuXzKEsb7Ni/LhfFCbdF8awGXDHUq96Z3e8g7brd/f+giW6PvN9Rj1FE+UzcaNEJ23Tqb4GaCQVytR7ILCV36F+FuZs3o/twupaviqEuDX+f7QdDqoToe9oaeK/KT4= 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; dmarc=fail header.from= (p=none dis=none) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 1623879827686546.0043382195892; Wed, 16 Jun 2021 14:43:47 -0700 (PDT) Received: by mail-wm1-f41.google.com with SMTP id m3so2056343wms.4 for ; Wed, 16 Jun 2021 14:43: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 r6sm3328178wrt.21.2021.06.16.14.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:43: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=TAZ5Nd2Zr4AEdYczPbEyYCejydYTPBGPwGnfyFJKBD8=; b=UUTClQyfSKiErduQigqFMPUjBXPLR66bqtojXp3+yysOjLTHBaVF/QPmUI5ZPe8XRP /cbFelwOFeMIgo1FGUQKEIQXGP+XIXG6kRUIn/deP5Tei5fm9By4o4smUTl2awbqAd5d tx68XAJ3Vm/T7pDzbUPC8Eh0antKjtqdzPkO8TDu4Y5IB2wcPnX6G6fKux/Ztsy2ctoR T/UF8qudpKUwBBqrCRH+nik4grqwDV2rEHbjTFl0vKJwIgL5LYppTzrBx5YA9WnJv4B5 cLuN1rYxpczJfDXrcSERrkG16RupC570IFRXZkvM42PjpzgjuisxVmh0poRfy6H9cIhj pjmg== 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=XoMbxAU8ObqbBiK28yp+2tkpnqOFeWK1oRKE15C8izo7q4jlhdzZH6CASP5oZUOPxW NI+8xoYdGhhKy1Xf0+v0LNV4xSqKlJGlMjpcXrzdTGUG/sfOU0/PYt3I+jKCqFbuxpqY bIAzj3AKBnO8sT4n98qpsvcR2QGVASqp9ZpjFnhvFhCN5Qp6TLZV9nyXIM+M8mruw4JK TNDf8znanhWfPzKZ5FheZ5mdB6upQrNvPwAxOvMp3vhD7TB/QavGSPalXNkqjXUH6YBv VwxWCCWG4N7yIPBE2v4dS51JQnZcoaj++Fm6daSKx23Fu5XVaLvtVzWUuW2061ABJOVr ULnw== X-Gm-Message-State: AOAM532ivyGnYT0idVeMnBBwJGVJcpoL0J0exz0EIEqmwF6SOFNQyhQz Wc5glH91mV5mrr6Z22+gqjM= X-Google-Smtp-Source: ABdhPJx81R37uPFyDFSp0xtO5T1qd8QWSNDdX5nU7bG+rgnJITZQRMyPlt7DxF12szruU/54jQ8/DQ== X-Received: by 2002:a1c:f717:: with SMTP id v23mr1130870wmh.32.1623879825923; Wed, 16 Jun 2021 14:43:45 -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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 09/15] hw/misc/auxbus: Replace 'is_write' boolean by its value Date: Wed, 16 Jun 2021 23:42:48 +0200 Message-Id: <20210616214254.2647796-10-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 Mon May 20 06:18:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623879832; cv=none; d=zohomail.com; s=zohoarc; b=JEzVAFLRDVQgFslHiePZCD0g5fT0QyaWrs9GE1ATqUv3RWrmTPIf/b0v+Hlh2UeljK6yUyFfwHK2KnIieJihQGB8QsmHYMh7eVZqcX20qktNmfvdM0iTZjeIun4WsfAqaSf1EHjxFz+9uvqF33+xZuKTLBGL4Vs2JADqwNVTxuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879832; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lMrFIFZX4VBJPQraxvDxEyJhOku4B5f9uSq095+uB5I=; b=PYu2eFeRR4pb02Y1CcF+HT9Nw1w2y3fVZYpvo/O8E7ToHdp1XMkUOl3FGTyyCTnmhvhNbox453THf3LND5CUVx/gxP/6WSVWUTc5jU2VVugVO+3RFb8xKvx9G4AwmDwi/g2hJd4ZJMO5CAJFWB1roIdj1G/k6r4tBXzHldGSwuE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1623879832741182.19805979710634; Wed, 16 Jun 2021 14:43:52 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id f2so4230717wri.11 for ; Wed, 16 Jun 2021 14:43: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 f5sm3882154wrf.22.2021.06.16.14.43.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:43: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=lMrFIFZX4VBJPQraxvDxEyJhOku4B5f9uSq095+uB5I=; b=ROhKU7Wv2GyicVLuhMGoTxFgsEj2O4goVxWO7/ymmFTnyWm6R9IfEF2+GfVWa8Ni97 JTuwnqrkiZWg36fIYxXq2dd37lKX1QIrodDhOz2QSKAdNxCUm7CY8W2ocZu4z4EYCma5 BBIagxNwBNpgWigIuzE7TcjalGQOJgBc2tcbq7LaVROwUVBKxarY3v75RDCMJAnxtqIk PKxlGTKDJd7pYbEBTItjJjKCGGev/YvcG+qSzavGXGrz4AdE8DrivP8+1jTE7VCxnAft avRtnWiOPR5Kok6y2mMYhWOghx1wjpN08lpVEuT6UmwUmCQtOSPrOm8ecR3ZohIzm4f2 SHeg== 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=YmsgPjOCtoWHqjoI3j0DkjDW3LLXYm6tUXS/viP3pq2izJNfOYePJAUPj6OrCYaD9R KinCD8EHjZ0TjzWbb18pM1M1a7iLSV3WiRaWakizfM6RhTH5lNhMvLlYAFI4uOBxW4It asI7EDv9o1Kol6d7uiS4cfNg0wiWPNjFKui6rrYyI/XGNfuaQfzGac7VDiU3mDlC21M5 xPEojTqYDTuVDjVh34DmE5CUPijzbpCTpdybyn0helvOGR/oFQ3tsFP2/iftOQ3J8+iq T4xB3H8Yq/lzaRZWhWmkslB6fQ0biodf6PmwLkWlvmoELzmQK55+E4aOn31+Q2FVgjvX 45ww== X-Gm-Message-State: AOAM530YHfl6ydea3aVpgDBbOMoLq40RLLZWCklBJ8PPa8wJZPL0mgi2 qz2+VMhtnYOTaekZ51q1jiuN/PPf4/MXYQ== X-Google-Smtp-Source: ABdhPJx1sca0UXmy/lGQ9mieLhWuE+h/r4JlJOMlOMsurTYpapJiZGbCP6y+wLOoCg7bdOQxW0ZuoA== X-Received: by 2002:a5d:64c2:: with SMTP id f2mr1418652wri.291.1623879831081; Wed, 16 Jun 2021 14:43:51 -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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 10/15] hw/misc/auxbus: Replace i2c_send_recv() by i2c_recv() & i2c_send() Date: Wed, 16 Jun 2021 23:42:49 +0200 Message-Id: <20210616214254.2647796-11-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 Mon May 20 06:18:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623879838; cv=none; d=zohomail.com; s=zohoarc; b=BV3Vq2P+7D347bsW4c3ezHd3/z5RAEnoMqRKtglR5Hbl/FYr/i4+Yvxq57KoWKDCtE4d20XOhsD25RHdbMAaLUp2zjDqR5HetqT36vV7tku40J03uU6HfdPzOUdVNyrXaZ0jVau/kwgrJ7MSwFpiITjpxonGjQIAb8dTrtnJKpI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879838; 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=nqV+0O9NeuAnj399dja5XrYlmAIHet0ou8wc2rF/BuatFYBX5CWPOgAPn4jS/v747qQ6WRoVJEcuMRLcCyiNO7knOJzKei3gmNuI0v82063H3AM/4si5VcPdJKI8ZKRD45pdSGCVJ5KIeHndZ3q0qzDIgFrMw5uEjj5loT1E+W0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1623879838339606.9558406177715; Wed, 16 Jun 2021 14:43:58 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id a11so4233523wrt.13 for ; Wed, 16 Jun 2021 14:43:57 -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 f12sm3947441wru.81.2021.06.16.14.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:43:56 -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=b1kEKiK4zGbDqxWxgK1H0qAR4HxX9/cswfC4wJTbHEyLL62akF47X2U/cCX/ic5RFG s4ooq6qdq28WM0hqoN0iVjfyNAb3SPuj5zPEESzHuH1dIL7Dw0uk03o9qT7/i4jREwNG SSCQJ1H7j1HVqrnY1sywr5NlkJMbL3Yu+YX2C41eOv21xNPDDHZKgJidKdTRy4UKXDSQ qoMEmibVGloS0wQz29w6c/KnnAN0Pwolp5SIKUa5ZM3JJpy0COZaY24jmTv44JV8psRl Eo9k6qaLmCdI0oxRIp5n9z9E8Kh2YcBIH65nDsDIKaphOxxAZlPX/K7bYEOYUdgsaK1e NhSw== 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=pNF6tzJUGysLL6ZCwQ2oTt/HHC9WwUl1ZYj++9+blB4cbij21HG5atG6nYdiuyjqy4 jse8M0OFofhLpZRwTWmFjZZKNv8WUuOeNO6F+45202YNthe8HkDk+Uudz5nhdzxtEd9S m4fiK9fijHm7ZdV/bdZnox2DLhBeP+sYM1+UYwFC2XjHncZmMrz3o3ZW/spX5mtNGtMk glnD4S7w5AvieAaawddLhk5gWVlxrUU4s9CI/0g8gFEJJEImOhNJ5mhA+abKK0yxRY0p 0XiZG9+R6ys1gjr/gLb87ePEOnbLLZEqpIQo5kVLs7GRKHnR0jL2kX7zpfTRAytvyj2q YD4w== X-Gm-Message-State: AOAM530gkwz5FjQCIlxAdKWhi5SOMM3jfZUYYTMV3sSIr8uWujgr3tgA INLCb5DJSTl69/kLVfn6reY= X-Google-Smtp-Source: ABdhPJxo1CtcK6hh0B6GMM1gy3iCaIw/QjFj5zp+lWaS+xNSNFMrgKuwKcp8kv02gGi4d7zqk4apjQ== X-Received: by 2002:a5d:5986:: with SMTP id n6mr1460631wri.60.1623879836653; Wed, 16 Jun 2021 14:43:56 -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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 11/15] hw/i2c: Remove confusing i2c_send_recv() Date: Wed, 16 Jun 2021 23:42:50 +0200 Message-Id: <20210616214254.2647796-12-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 Mon May 20 06:18:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623879844; cv=none; d=zohomail.com; s=zohoarc; b=iZYqwjbQZyTwhPzK7QAAXkdt+2FFLBcUP2uaaXEhaji9sj9kCrMyiQNilOh215HhHWR1K0QFDMUwImji1IIqxHeXCrd7CleOEzm6sm6MztYZ5ji6OupilHKR1GUIaZA5qKGB7xgg6ntRbePaycfVL9zZKAD7h6GSVpDqYBCOSqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879844; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eoP4CL94JaZlg7eqmYc7iZiTJ8FoF/Caiy1Z28ZBDWs=; b=LChGAVp/XRzPhJ+O5cVspYa7x/I9Bhkrlowp7Z52z4oZ8+hbXjXnxnvqbuQeN+rP3aWAtY/dOK33sNfQp+OjAEunnAs6KCoCGWcFnLYRhX5gG62h5xMORbAacuZuY1WRtAtg5S7p5L6cU30yGvBib2rIHnaxqWAbpO54CGq75xM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1623879844100312.1131929561658; Wed, 16 Jun 2021 14:44:04 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id z8so4231006wrp.12 for ; Wed, 16 Jun 2021 14:44:03 -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 z6sm503498wrl.15.2021.06.16.14.44.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:44:01 -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=qV7V8ajq5SO9Dkmn7fJaakBUZiAJ7MexVY4MKZtdyXMF53pDkpRGEFZ9moMRN4GXXT L7GUmh/CnoP5N18MipnoYVe3MYotZMhcfDzoeWmgWDLHHiy5h3Q/muwK3LoJIXkUoIBX 2BSRyDDlzGQKmcoj7HCemZYsKnEuYsjscw1XA7nRDIU6dv00cuk0TDofVEb74bYOkGGO cqVpDK8I4/5RjkQCxNDXGNPFoRJBkeaw36mYVNMLsSGISyRBYMRt0DW7DWQoKqPiDazn dbOaUzG5nF+y8AL025uYmo+toNdI6bYWofAMxb/pnyjn3dxLECO1Kq49iQ0R6OTBlt3f 6kyg== 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=Rjstn9mmbq/LeZIo9e3gGeLxjncWfcmxf60QktUq7Nr7F4wrUGvCoX5K2gsf3GPHUY NGALJ/qvv+RSLeXmqUTctWFcB/IWZI2rhCy/DFjKGxXhCSVdhUgKJ2fxEyTSNbvkgDCx addD/wWpwjyJ+Ke6kT9l2T9WxyuNFE0NS9PBp3Ek3Bh26HLlIB0K+Qy7m5mYgP5LHeqx 3q2JJAJmQqZ16gc/aHfNfJU/javkJGkJnNMoKWn6Y5y8CswPZAFUAvdkdaSkUS4vctC9 PeFofC69U8pMEuco2/69Tfgx3mA+Wcmu50xGr7ot2yyXOzsUMZglyrL4U8HwoQxpslau dvtA== X-Gm-Message-State: AOAM531mYn/G3SZVQ0hFBwA8S5o/G3X1Nxgg8f+FgKdT+1vRF8UL0epb GWyvMqRxi5kYrbrJmYB8/SNgu5Wlgr5Mjg== X-Google-Smtp-Source: ABdhPJxlqd1oARoHp1skaocwW7kWZzUBf6Jc4VP6k2JZ3tNSxR0pb2AGQBk7ItHUk/Yhn1pavLtq+A== X-Received: by 2002:adf:fa08:: with SMTP id m8mr1360256wrr.319.1623879842361; Wed, 16 Jun 2021 14:44:02 -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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 12/15] hw/i2c: Rename i2c_set_slave_address() -> i2c_slave_set_address() Date: Wed, 16 Jun 2021 23:42:51 +0200 Message-Id: <20210616214254.2647796-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 Mon May 20 06:18:23 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=1623879849; cv=none; d=zohomail.com; s=zohoarc; b=Bvoe2+pC5k2jtZF86YUq7zUEJD+BAFFe4kSurPPVFuyAcSSgWRMXS6i38SNWQ7l9zzOTX62a4yOdzWbkORNZiAYv2lXxoayI3Xld1bV+wT5tLnksgI4RKPCD6Dd4FdpKA95VSDsRX4LoSCf4zVkhYT9GX6QQsSmGPhFe7BGgyzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879849; 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=PTkrmabow2Tefzq50TElmiE8+z5Pr2yEXEq4FSbmhXxqVewtBJfj7N2f+4l5VMOndqM/hpiHj5gRiCuk2ZfnCYokO3fy+HCL1v3oQaJg8PP8hpGZk10FGu1aVwuhPQcX6FsiwSwJb743Dmd+5pxhDOBwESLE91VjylPJLK5TNcA= 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 1623879849227582.7684322070468; Wed, 16 Jun 2021 14:44:09 -0700 (PDT) Received: by mail-wm1-f50.google.com with SMTP id t4-20020a1c77040000b029019d22d84ebdso4980585wmi.3 for ; Wed, 16 Jun 2021 14:44:08 -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 v8sm3705536wrc.29.2021.06.16.14.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:44:06 -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=LeH+0XzZjrI9Ahy3mFlNXUOSl0AOt8muIB9GjpLaz1jcZ1Lx5MGiVZ6TTGYYY3KoEz q7Ck6+HTjCkse8FD7Z+qXvX74jhenGGtSUjwobtoJ4xUmNK5shKGrrkTI6/rPmwqxggb mufat7s44juoLdwYeN1BrgbKWTEvFevPkYVeoR7fbxuzQxOOaLAbdMomh6L5gE6SIFSx SzB9CpplN9O0j5rXwdMR70sA6YEaEupCTFKV+5NoP1n5wm4A+6G7i8vufsD/ds/ed4/N VZQ3DF0viYuRKlCJLi+jW5PLLG5Gbzc+IVYtUYg+dr++nfA7ZMseDDr7FUWeeUOW61Ug Dqqw== 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=ImK46MPEffahVh3akfTSp5QcM7Ofgl1r5BaWS4LwFq6/JXcKPQKswvlKcpNcFuW9hU mymAFAjW1x8DvSSL3n8fhIJq7Y4Y+ZB/1MGwjB1CJy1L4SLPdg5SLPb6BAgfZwR5tyBd BZVGiLQf0YqaYwoxinj2M3T3Fj/GCSELc8W+ECuE4hJUiVglZgz0aK0USQqAIvlu2PrJ 78wY+rD0fbT1oUNFBDldqsyFysjVzpzWn4R/sAcGH+JpXBqz8U4OlnHEXYnvujCOoLFc cAqw+GddoWV7iLPuw3HcfoczD3pD/Q29TpAUOQ5uIqdrZIN3x11dioVOp5YBwLlFa5IT w9DQ== X-Gm-Message-State: AOAM533Eb19AuhcMPYzLnsXZCux4dG3UGq+u5g9vl1jXCACav8zGnZqo XwDS2iO0ACp/cQ6EJUkNGis= X-Google-Smtp-Source: ABdhPJz9zDUUgR6Ca6FC9g8DjIGwLbBpUFfDEa2MXDzNqPpbSK4oi+pqMwpByDMV4GdEvUNc/LCw2Q== X-Received: by 2002:a1c:b306:: with SMTP id c6mr1097964wmf.37.1623879847485; Wed, 16 Jun 2021 14:44:07 -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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 13/15] hw/i2c: Make i2c_start_transfer() direction argument a boolean Date: Wed, 16 Jun 2021 23:42:52 +0200 Message-Id: <20210616214254.2647796-14-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 Mon May 20 06:18:23 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=1623879854; cv=none; d=zohomail.com; s=zohoarc; b=Rvm8LUq+idcHuSBnFT9k1+A75lubXOc0jaoiE05fG/5nAk4z1HAEpK7zwaajmeQprA/WJnNbRumkYa+pUXYFoCYxO8CRRg3Y6BXNYiyM5nw0n8pBJuJXnOxJgD1aX63pEZomAumXQt22wHlawjjWs0BkUX80uKxcikjqaN262KI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879854; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XbaEDOU2JipKG2I/F5MOGMQYq6FK1z0qkr9m5RlbReA=; b=BqmYKzpWk/pICIExedzidoY4l45bhZmDs8zUGZrtD16ekdcwxSYVln2itfqZPw9Qf9MxNkjv+rRHmpz19IJ+SbHbUOpwnAd1RvrqNXjVsYFRIDoSdwL5QhTuig+103sCwYzakAY8cGIcePd0azN0HRqW90KQDNV3OjP2qCWUvqs= 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 1623879854202779.4382078610398; Wed, 16 Jun 2021 14:44:14 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id f2so4231592wri.11 for ; Wed, 16 Jun 2021 14:44:13 -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 p23sm6031712wmi.26.2021.06.16.14.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:44:12 -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=XbaEDOU2JipKG2I/F5MOGMQYq6FK1z0qkr9m5RlbReA=; b=sp4CA67eCjSUDOKltx6UDvI/exh4Fvp7/raabcNUEn0RSQnS9v0ufUDOqw7G7CiGzk VhY/R+1T4/cc2wzrcgT+uLhgfItF10ZsRp2h/3L6awAL4GfIPA4B7YdC0cWyIqWQbLGr yhfxWV4yH7C/MRYooLmTqQa2a55wz1szFM+MqsBnbBPfaGEDmcs7/38Q9PUrOKJ3BjpF QSH/L7/9jEK8YTNFGW0/AoLZtiW6dskKzRWA2IWzXdXr/x1rehh6lAvYmc9Nj7GhpjT0 XUX1OTO3lnXCZ0Ubsas35VUyNKX+ixvcO3b5oDxt+BbCdoMffuxXD7QyQcNzHu8VDF7P rnKA== 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=XbaEDOU2JipKG2I/F5MOGMQYq6FK1z0qkr9m5RlbReA=; b=IDXKkTmj4p2PthiN7PGCxjMtdzlQuJVoVZNDrLf1OO0Jr9NDb/bvVKmSU92q2AGpdO PN0HUZa9qw1+LBiaAMxXjMinqsJ6MHKPVJncTMOQn1uf5GWg+hEIzzkpxXNWjSnt+Ac/ YwpKv7dUR/Hlk50Lgc0PcO1OewNg4y2fI9OhetPGaanE3yKrZPa4q6/FrPjUwty5sL6Z Rz2V6p0hJ9u9mSniN+kA0ylx7/RcxpH/hrF3w4IrYfB8Ss+/TJE9Oo82TmL9AzhJNW6e irQaTZvulYC/q/FseeONSKEsmXvqlQDmsNRT9j4VcAZkXlXkERdgoKfh046EU9/1MSne Taww== X-Gm-Message-State: AOAM530d95iHhqxgn3asZz/cI5ZMQykO3Q2ysOfDIQOXfaYI+zmDWkCT 7Y+XpxkiJRqG0f586FlHE3I= X-Google-Smtp-Source: ABdhPJx7aZ+RUHW44lXCYZI43uIJqWJpttgakGk45aRYGpvhJ6Fgcp2DCYmjO+rEgaGtlg5Hug/L9g== X-Received: by 2002:a5d:64c3:: with SMTP id f3mr1410886wri.263.1623879852529; Wed, 16 Jun 2021 14:44:12 -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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 14/15] hw/i2c: Extract i2c_do_start_transfer() from i2c_start_transfer() Date: Wed, 16 Jun 2021 23:42:53 +0200 Message-Id: <20210616214254.2647796-15-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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. 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..69df4c0df6b 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -115,12 +115,15 @@ bool i2c_scan_bus(I2CBus *bus, uint8_t address, bool = broadcast, * without releasing the bus. If that fails, the bus is still * in a transaction. */ -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; bool bus_scanned =3D false; =20 + assert(event =3D=3D I2C_START_RECV || event =3D=3D I2C_START_SEND); + if (address =3D=3D I2C_BROADCAST) { /* * This is a broadcast, the current_devs will be all the devices o= f the @@ -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 Mon May 20 06:18:23 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=1623879859; cv=none; d=zohomail.com; s=zohoarc; b=LZJLYA2l7QN1lrzNi2Ecn+ZpzpDJfIcR4VEY2hUShKTUm2ByELLaK/MZ9Bnu4+KAaTsnYGD9yVgAxauI0csnDlRAWVU5N15N3+55EcHoxQDV10RXbyeBr2OfRyCwkuvJ0AzS4w0FIz40Iu6xlQVASHsSTL7xzd+kmyH5ljNsiSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623879859; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KhbMgEo2E42ngPoncw0s0RgptDO8KbfdQczk79/g87U=; b=RiwHwpA3M2iKhxhTVZirEFLf4xQHsxHWvx0p/jbYhK8DOWnlnw9VtUBXFNa+RotS+8RTo9UOVPTHznPWniHJLexOYFlYfHihs5CrTGzPf5KQTXq7jZwpLqn7R9d+fF8qhBSVmrHAwiCaktv+ZI4Q+7z0IBMeIrdCtkI1N/PgGew= 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 1623879859753739.6535730607295; Wed, 16 Jun 2021 14:44:19 -0700 (PDT) Received: by mail-wm1-f50.google.com with SMTP id f16-20020a05600c1550b02901b00c1be4abso4989307wmg.2 for ; Wed, 16 Jun 2021 14:44: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 62sm3468418wrm.1.2021.06.16.14.44.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 14:44:17 -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=KhbMgEo2E42ngPoncw0s0RgptDO8KbfdQczk79/g87U=; b=C4EWhVtYX/YfbYWY3L7KeCeib/55K8VlIy20ZOMslUblvUdwdsO/xulzYugN3I1gFe nDRwYIYOD/QboCNfEtV8K9fKOuNgE9+ydYZcdFpnYFc+CdvIRzVTWfg7Bp4HiJLZZeHU IrVM3EjXhsLbmlzkxAH895ed8wr0CshASuHWe7I+gI7ey3qHOpZ8b8A5LxiciN9dl+So Qi6yPPk0Pe7rDjGwZLx11eQzbJueWDDefDOqABuHbgJN5NCcrIKFDYOi+MM2lbivAyF/ nFGtyUXPJnzuiHU+NV/aB8iP5nUFoGDtwEe4S7JEhR6mvh8Uc+/wjThEED7FPvfTIgSw TNdw== 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=KhbMgEo2E42ngPoncw0s0RgptDO8KbfdQczk79/g87U=; b=K52IkFuG7ig/gVt8vnYzORxjc6wcq0WSdsN7GocXhNbhXtbAax2SAkDIVxnOD/HYdY RPXFVHjqLevXmSlbWvAQbURlXyZJ+vQzFO7zqUvn27Hd3CG2dUmL0t5oGXgx4wCv47GF 4NlQDufOKQ1CZXzzsxezL8nqqVIT8tC91MZ9ajvxpyGNDKF4TRHBblroHmhegPxWAivv TzXrEyT1daPbVChgELgDUp2eLDi09t1JEsCQqaPc6rUi7p1Qq9wSS62YwQEo6MuqaQAo fRvgPE17+GeQnnNK7XOb9amvC9XAOAVOUbaOQ2QdlCNVk37M9CP0Ync/D3qUzZRDDxLa olDA== X-Gm-Message-State: AOAM531YqX1N4pVXcf3bl9EQLhuis/6NGuvEAPrd+4Kj7UP+DAxr3Wl1 /sftyVHVDHK0ln5CVQXCgsM= X-Google-Smtp-Source: ABdhPJzMUuua2uxMlDKB+O6nm+Ib/IYgt9ywLGls5MtyGt7NPWTjvnJiis9+T98zJbMDohl+zn3uwg== X-Received: by 2002:a1c:35c2:: with SMTP id c185mr1136561wma.126.1623879858010; Wed, 16 Jun 2021 14:44: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 , qemu-ppc@nongnu.org, BALATON Zoltan , qemu-arm@nongnu.org, KONRAD Frederic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v4 15/15] hw/i2c: Introduce i2c_start_recv() and i2c_start_send() Date: Wed, 16 Jun 2021 23:42:54 +0200 Message-Id: <20210616214254.2647796-16-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616214254.2647796-1-f4bug@amsat.org> References: <20210616214254.2647796-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 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 69df4c0df6b..7156f55ded7 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