From nobody Mon Feb 9 15:29:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623860069; cv=none; d=zohomail.com; s=zohoarc; b=SQnTvi2syZAcosyQQ3UxrrFrfSL6Eg9OIoq9+XAlVm6gzHnWbW7I1OsvemUwu/vTpyWmzKu5DH7roK1fN0GrBtqPPWU/qe42z1zJWohkdniuv5gepbHdrtdJv/Pn4zej+HIDMSpPAlGrTYcEdELg6Q2Ljqefvz2MppwJbCWhfuY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860069; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OOAVeK2SUtssiX9xFTv7fMh9dyXYyrlGAXubT3GclZM=; b=aNFX6TPP4kyzD1ibSL5k/1JiA2MnT2rzEx8EGEQUbKINUUIdFVPB1ry9PacHAuDRwRyKvmO4wFEVrqAmg+6VxmaCWcvba4BjcZagi24q62z5OW7wajAEJDEgfNJ+I2txnxGo+lKipgZZ276HYDCsgXx/pq3b/kgq+WC/LQQWbEM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1623860069242903.2275386250778; Wed, 16 Jun 2021 09:14:29 -0700 (PDT) Received: by mail-wm1-f52.google.com with SMTP id o39-20020a05600c5127b02901d23584fd9bso1700289wms.0 for ; Wed, 16 Jun 2021 09:14:26 -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 z5sm2567231wrp.92.2021.06.16.09.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:14:25 -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=OOAVeK2SUtssiX9xFTv7fMh9dyXYyrlGAXubT3GclZM=; b=SWmjggn2NyLwpquDy1iEpnAmE2g5E6r0fOmHQCxK36nA1RPN3OqXidgHI9Ao+gmJo8 vYvdAdzRk2jWx6IdySEUKGu0vBUA7zlSBRha9qpd9NG2TcwZN0+pB1I+VcznvCddc11r LpmiYogpa13/+Y9espSPAJN0869eJSKSEX2eg3+SFYyinAcnwXqx223xMXEh95SXLV8d VnmvalnaDAbK1f1ygPDVUpYpIz4d1Oo71uFxhwRassA3Y3o+znu+FVZiSP21jc4LrLQ1 DGVo5ArztM6kAhmzq0n5fy5MdClvpKyXwzGpwkZrvMvIB9nolHaLda9CfYAwk/wLKfw5 5CIA== 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=OOAVeK2SUtssiX9xFTv7fMh9dyXYyrlGAXubT3GclZM=; b=pdVFenErf3hl/EtlsVocRE93rrhUsnQG+pjDJ/uOLQtJ3Ddgyr2RJgzqc2p8JGJ7Zk 9m7xwYeOpekIw/F1MSYGXZAEyNM1MQoRlkR0HYnUfYqDT+ST7CZwv+2ECDbpJ2RS4syU nxp3U4wL9X8YNeNLjBIrf9P1/DyjaOXpmyGoQtlRBzbySpmM5lBMGOvGNqszItPTkbjc EivF2DEGDJpy7e5WID4N+eFFnL2i3KnRIx00mKS2bMdtGI72vd34wc5JlWYkyFzT3BdI O0+joeXNPPyUDR/erC5BlLiCZGboGc/pFOxyUkWRufLHy0VGIrA1XjhUj3NB4jnk27Hw EnYQ== X-Gm-Message-State: AOAM531ZDUC+Bk5Eu8uVaS0+NwluacX1RNJHtxP7X0IviNpQ0TCxupnD S82L/5tkX5De+wR2PrJIDAo= X-Google-Smtp-Source: ABdhPJwXKzGkv0ExusMUkcsfSf8wrPl8eyeFqYSsq1OwAEbNoJuhmhAUV/W79gF0OdN6hx+1YIMBZg== X-Received: by 2002:a1c:59c9:: with SMTP id n192mr710160wmb.81.1623860065556; Wed, 16 Jun 2021 09:14:25 -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: qemu-arm@nongnu.org, Corey Minyard , qemu-ppc@nongnu.org, "Signed-off-by : Frederic Konrad" , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 01/13] hw/input/lm832x: Move lm832x_key_event() declaration to "lm832x.h" Date: Wed, 16 Jun 2021 18:14:06 +0200 Message-Id: <20210616161418.2514095-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616161418.2514095-1-f4bug@amsat.org> References: <20210616161418.2514095-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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Richard Henderson --- 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..8e21fb76452 --- /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_L + +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 Feb 9 15:29:51 2026 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=1623860072; cv=none; d=zohomail.com; s=zohoarc; b=IImHu9gqJcQo945oK9t7BFcyh1ug/5xw1xKVLWghzN1qK6S9jiRKZhkVa/w/j6Lyg5P4jyyknsG3ublS5hm300QCTQwuLm2AS+t1yz4sZf8MiafmaUYXKAP4ZIeM/+tcDLv+0oBMamPNuN/19IGYZJ6XYQw/lepuZkNHc2NVgLA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860072; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IvGkr+tAwO3hA7gPKRu0L0jtWmnGl7wWoZ3Svb2df8U=; b=YSTWTw9s73oZxuIWK3kHYYSmq8l31cV/tmDHagaRoWvB7nAFetWNXXTH43dTJDhdV9gYDFJC3eO7bMjb2oHKw+WoORL6PCjFB3o1zmbWR0Eh9IP7YfwcvTPYujmk3vP7NimqonOtW5hLmjNoM0JlsFu3R0OxCvMIrbvvJcXsXLc= 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 1623860072287283.8989458095559; Wed, 16 Jun 2021 09:14:32 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id h22-20020a05600c3516b02901a826f84095so2012396wmq.5 for ; Wed, 16 Jun 2021 09:14: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 f12sm3089781wru.81.2021.06.16.09.14.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:14: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=IvGkr+tAwO3hA7gPKRu0L0jtWmnGl7wWoZ3Svb2df8U=; b=ZvKCo2dAikIbcP6OHT6j7qhfU5BsQbaVIg6LppsGv/jSuRjDTp0MCmexoLQiaHitGW 0Y9+EHu28KPMeNSdyYRAlcDkgzRQgg/q9FvMAtGCgXBihFNwfRsuVNwGTqA7nyYJPY4Q ESU+kMfECHkplCG0oF26VR3eRPBTRn4tkl5fGkjQgHMI9wchqJ5h3EG1zckLGzZHQYNx jf1iH1J41wSlRPLNRP8Nw/W9lmDrW++hf2TNzMS5ru6Va/+Yvh8eJfHgWf9avarGYWth boLsOMzdSP/cGt307oq2V2webdS5fjFVESFHGxvnQwxVF6FNM8/ow+yerQhIpR5msZuC Vleg== 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=IvGkr+tAwO3hA7gPKRu0L0jtWmnGl7wWoZ3Svb2df8U=; b=GRK2BJ+82l2KQCG8DnjuMQZB0/uIsWCCqYfgmhTCUQ2lg75BQNNdvKLNICntjh3hjh xkMwJSv0mdLExIppziiPokUsQHJvWe1t55vMyjQLQGA0sf+BWaNbbmYljy/qEMZ0WqO9 cI9xaCSU+RXOg08dU6otGgrPLa0KgvrKsmf8lp/bNAu9rOEEqCf5ySuhQQ4XQSXjQ4sm EbvdGxrm+l4ZNaAOoZAeJyd7HhEaGUxyxihjMjyVF+USqf0tH4fNBn5pzd9pFL1WoXVQ 9idua2ug6xCKfl/WY6t+2nnN7dsR0mdhNlqKvbXFiYQTElgXGQ8LVL6A/HIRdZwyEd25 b1Pg== X-Gm-Message-State: AOAM530eYUwD8yjy2cM5COuaoTXRmTv18UNdUWStY/ld4FRdOQSRWKB7 1gAWh/5Zm9+CXqccSNd95ws= X-Google-Smtp-Source: ABdhPJxEc8ldTp+yjEQ/3Y2sDRh0EOvg82W9MjkIrC+iw02cniW5UK4+Jv3hOdCGSEWoAOSyGwlVRQ== X-Received: by 2002:a1c:a382:: with SMTP id m124mr749789wme.40.1623860070429; Wed, 16 Jun 2021 09:14: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: qemu-arm@nongnu.org, Corey Minyard , qemu-ppc@nongnu.org, "Signed-off-by : Frederic Konrad" , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 02/13] hw/input/lm832x: Define TYPE_LM8323 in public header Date: Wed, 16 Jun 2021 18:14:07 +0200 Message-Id: <20210616161418.2514095-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616161418.2514095-1-f4bug@amsat.org> References: <20210616161418.2514095-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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Richard Henderson --- include/hw/input/lm832x.h | 4 +++- hw/arm/nseries.c | 2 +- hw/input/lm832x.c | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/hw/input/lm832x.h b/include/hw/input/lm832x.h index 8e21fb76452..2a58ccf8916 100644 --- a/include/hw/input/lm832x.h +++ b/include/hw/input/lm832x.h @@ -19,7 +19,9 @@ */ =20 #ifndef HW_INPUT_LM832X -#define HW_INPUT_L +#define HW_INPUT_LM832X + +#define TYPE_LM8323 "lm8323" =20 void lm832x_key_event(DeviceState *dev, int key, int state); =20 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 Feb 9 15:29:51 2026 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=1623860076; cv=none; d=zohomail.com; s=zohoarc; b=SA7z0a/TtUPVEybfxYkt5Cni984bf2dgxGQ1WYVFh56htZhY2CS0BIzOSKhDbhn+2bGnwDMdkelyHHmpBnq5CL+jC+NMkHyOSZXCowu23i2JjZcqpGbJFWOz6zCW5zuFWd7tRRpRA+qHGpmHyv00WMJgEHDa55JUSEDvCkISHZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860076; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=a3rlIikyzOrYII/I4PVDBAmEgVhKf/CZtF0tScG6WL0=; b=g318PNvfCpx5UQ9l/dM4Vv3sGIJGP1Mpqe0Xsmj/+dP4qRYRt1EPdsg+3Y3NTqvgsK4fs7MQcq8DPGVe3Ko45gHWzcDhwG4XJTDSjBgLCFUlIv5YjSehzJUppz/TX8G/dMHsbT4qFtiBTg1w1wtfPh5mzyYUPBZZ0guE1yTByYg= 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 1623860076785947.8500282949921; Wed, 16 Jun 2021 09:14:36 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id d11so956532wrm.0 for ; Wed, 16 Jun 2021 09:14: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 u15sm5201091wmq.48.2021.06.16.09.14.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:14: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=a3rlIikyzOrYII/I4PVDBAmEgVhKf/CZtF0tScG6WL0=; b=HtbvU57kUem2qJOKQwQ1McwxTuzLlcNhZBPL55Jbt5VumOreVyU4LNPtaKYCRXZze2 8ynrD9OmYvsfe+c1mR4+AFtXNfCi1iQsoEgKAbTVfs+KsEvo6Cp2Ry2Quk60z6MMr69E 7uahYG01zevbWnepVxs6I/+PrqlT02GGzrO3GJHPK7t/OC+6vvj4UhEsxOBtkcRttLM0 alu4TUKbnAHMcDLcUpUWQ6SlSszFvMRn6PPgIFp/UTSenljj4MgzWMtWVYG79ovBaLnl a0W8/aFwOv84kHo4KL1f7MxXD4JV5vvIq+etEg7a6IQFmfdk/PmDGD3duJeWbMERS2rN u5NQ== 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=a3rlIikyzOrYII/I4PVDBAmEgVhKf/CZtF0tScG6WL0=; b=teZBZnNaClWOo+o/apbfpNI7zGYztd/J1BqQvXQt9gOxc8n55uFHQl/MFVlgwQ0b9C VzJxlQuIBC0gs5HajWn2DzglcHhcTzRGHqFlgqD0zhTfca1l0ejYiLc+dqeLZfJJSGaK ykrmc50o/ViepF7lAFZic9bKrNt7C/FFY43yw+gB8YaUKlvfbuvsHwd/qrY8D9mot/Wq 6NFD34gj4fMk2Gpgu06SfyDEnv7NLztx7D++M+LYZZlQhoQ2j/tXaWwTcnPNKleN/P5o mrh6VN7/N3iuH3CKUsDw8QhJq7QQce5p+EMhVyOkjUK6MMmUC8uiN4g4GFiOEpBU8hN1 c7NQ== X-Gm-Message-State: AOAM531ZsyqRHo7ZaqZHXgUyDgidrOAj1vupjplXr3GxUsqGxGMwwhX4 wHXhzrZYp2hbK8mN8uH24r8= X-Google-Smtp-Source: ABdhPJzu5a0AUyhRk0IM9wd4dU0vxxIG9d7UeUtN/KMON6mze24wApwiTEC6e0ty52QlBkhbh4p6dQ== X-Received: by 2002:adf:8bc7:: with SMTP id w7mr253537wra.198.1623860074990; Wed, 16 Jun 2021 09:14:34 -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: qemu-arm@nongnu.org, Corey Minyard , qemu-ppc@nongnu.org, "Signed-off-by : Frederic Konrad" , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 03/13] hw/display/sm501: Simplify sm501_i2c_write() logic Date: Wed, 16 Jun 2021 18:14:08 +0200 Message-Id: <20210616161418.2514095-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616161418.2514095-1-f4bug@amsat.org> References: <20210616161418.2514095-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Richard Henderson --- 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 Feb 9 15:29:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 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=1623860081; cv=none; d=zohomail.com; s=zohoarc; b=nbN3ViDQqlfJR0Ladt8dEDogcsgJs9oGJhhzGn2vWVRpcJrqweaPQberwlkayKY/ao7gy+997CyXXo6AEQ5oSxrmSRTC4hDSyChIQX0c/NukspG07YyHmqUQLV4Wtc3Ofdzyz7YZhPlCOu39RI6VaQYtgqSr8VmC9Sk/X3XEgrU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860081; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=13TAtltxyz3HRLnsPYZNhrV/l1rMyq15Cuna6JS4ElM=; b=d5dS6kh9BVcDTTXCmZyXCxew3iZDCtN1NdGjhqSPr8PPFIi4mq44YLIP/tE8uUBocG9JF6iiLhiyI57JDMX14Lc5ZqbKuHBUF1lHjiapapGAiJlusOzLxJDIX0vXvFBht4H9xWn6w3ET092eCdpKRhLogobF7OGbsYWsvAAbr8Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1623860081734687.9150920884624; Wed, 16 Jun 2021 09:14:41 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id v9so3328589wrx.6 for ; Wed, 16 Jun 2021 09:14: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 89sm2627574wrq.14.2021.06.16.09.14.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:14:39 -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=13TAtltxyz3HRLnsPYZNhrV/l1rMyq15Cuna6JS4ElM=; b=C+N4rBgUIQjK42/iEPG4IUufNCAfzXzl30XI1Dq3ehDFkcSLW5OWbkfL6nfgXltve/ 8sl5hmL3Sod+KOj6fFgHqnJ6Z12XDdqqA6tqivZenWO9oFMrI75pHcIBVSs+m/pqFnO0 /bCvsqU5073FJmregNgrbg3OPaDdGMISWXN6bjIqb9gwuftk+mQwOqWC6/6FPs07MtUc yqBj/GmGtKTU8dS6iEHUcWKaLl1agi3baf48xd6bWPtO9QJLTNf19dQw+KWn2t73yaT7 UzTylIpICCB0+SGcwzQVk5dYIM++MbuyqXqpVDIgtT1nsijR5Zc/NeABezWaTUUO0ZGD ugCQ== 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=13TAtltxyz3HRLnsPYZNhrV/l1rMyq15Cuna6JS4ElM=; b=NiKRkLyU6YpMQD9eozsJXw67Pa1gU7LGuLLeZw+jxbKEfb9bTpM+yDgckuOJ/a4Wlb Pwe3jLve2IYo2iKNy4o82CF4YGhduUwIGrYoLk1TmwA0AwIwfHqhiBvrmiKuWQ67n4Co v1D8nSUMIyWwt/rrPcY7MhhLUcRQh32gPJra+H70WeGImQ/ApOZHQAoReGxR9datUHxL ULkJLGV6deEzM3g16ofUTntkRrzbnMp8RRaueHDZnQqTmF8/JffuUh3GdR++0bD2HAdR dQCZZNUS/ltYufnI7Ty/Kw1pU4sDapZ1wWp12TXXc3GPoAzYvqNgGQ8IvYebPV/4UCCj iqAQ== X-Gm-Message-State: AOAM531kCkGauZUxEz7adBAxxzig1IoPEjRxWljWVU4/2V7XjNhJpgRK RrzsDECOFNSHpw56WVz9eQc= X-Google-Smtp-Source: ABdhPJwa0NRopmxNNvalRx5rUReJ8/RyWb4IBsiAqiqOvsE6mwG9BzWs9B5sjrgLepHKLQA1BqamXg== X-Received: by 2002:a05:6000:1a87:: with SMTP id f7mr245553wry.172.1623860079959; Wed, 16 Jun 2021 09:14:39 -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: qemu-arm@nongnu.org, Corey Minyard , qemu-ppc@nongnu.org, "Signed-off-by : Frederic Konrad" , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 04/13] hw/display/sm501: Replace i2c_send_recv() by i2c_recv() & i2c_send() Date: Wed, 16 Jun 2021 18:14:09 +0200 Message-Id: <20210616161418.2514095-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616161418.2514095-1-f4bug@amsat.org> References: <20210616161418.2514095-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 easire to review. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Richard Henderson --- 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 Feb 9 15:29:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623860086; cv=none; d=zohomail.com; s=zohoarc; b=GE3Gsr71Dlf38bDl6on0tE4Ty2IXMzoo3SjF9XSvu55IskG2absAYMBiLzWUo1Hm3CqnJa2ZMp/AEpq5fBohXLJepvGv60ZLjuHBdQtoRkXmOvEWRe++bc8I4gN8s+TQxu+4mVvLAp0OCKxfoV5bIoflxISeqtNICfSsOB1Mya4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860086; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EHdSfYa44ifrw4JLoefcZ8HjwoJfatHiQn3SHL7K7GQ=; b=ShM55SYl0S0MyarNKWkAs9/YhwyhljsWzoI/x9YrBC+bP9gdzhsFTaWodyp52fVuDrFJXPUnabuDTST5yWs5qMkMIOzCyYBgAQBeFHGrfAoJI1Q+kRWvbe8oiJs6fhybPkamQHeT+KndDQAxReYwcnGB7KKyPDFAMmOcDNN+yxM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1623860086498155.0285525409256; Wed, 16 Jun 2021 09:14:46 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id a11so3297593wrt.13 for ; Wed, 16 Jun 2021 09:14:45 -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 o26sm2179209wms.27.2021.06.16.09.14.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:14:44 -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=EHdSfYa44ifrw4JLoefcZ8HjwoJfatHiQn3SHL7K7GQ=; b=pieEz39UWLRSfoqL4M4mx3TucnoYuXmTueqD9OwUaEBfEUmLcGOx02iOBIgzb2zRbu 1Fr3Zv+crAizuB6ZV3rZNNQIh/8Em/8AoT98Lry9dI34Epi3bIhXVdLpbfeYGl4p6sJP dOUiLLHfTrHXBcytnC+rOJO8RGbicRjXXTAHDd/2ruug44spOozDkC4Z6PJQ69XpmsQg MCRt3AZUstRcJUy5cxEO+w2897c22lecZp1LB+eCT2nZyilU1OI7vPwdI2GfatMRiaAG 02cpck6lH+G6NghCETNxrbTGj3qt/HIcUM/yNUuxivctOjesGVaQKTOHCqkNAHLaUKxo Dc0A== 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=EHdSfYa44ifrw4JLoefcZ8HjwoJfatHiQn3SHL7K7GQ=; b=VZnC9CKM+5rqYJjUBgirQeZ43bE0PnW+cKdNbotJVGWcA28ZS9R/YDAEEB25O02Qc6 Ij3oC+ZCmR+F0DLGmEu67Z1TvxTVotqNZEDUYmFYvvpj5Dufui6AAG4wUKHVk/i57omY gg8PdGZaGRu1sVkC8TKBrxb68D8yo1OrxN0G1fUmebgdgGomIqU739xVys/dl1PvyuSr Q6bN2fnlDZfcs+CE1XIEnMS0atfcYdu1uSHU/QHIWxpTGBJJHsP07haa4Qvx57TfBIss 9Xbw9agnY+fswdlNKAVW+jRRjmX5UVr7R+z5a+UR/QmlH/s5YWdFlZJlvWddp9cNYJGF 6U3A== X-Gm-Message-State: AOAM531gq3CW/3i7aSqW7ona275XEVsDEOfaGoUNT4k2v95mwNRotFP6 gLJVAdUc3FHZt2nfVAOdoc8= X-Google-Smtp-Source: ABdhPJzLPrMLXLR+8FiTaORTuN19s0yMmCURhmB64bLGiupczKpOlM1CmjjEzL2KS/YSZ0jaFen4ng== X-Received: by 2002:a5d:4f05:: with SMTP id c5mr186692wru.341.1623860084809; Wed, 16 Jun 2021 09:14:44 -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: qemu-arm@nongnu.org, Corey Minyard , qemu-ppc@nongnu.org, "Signed-off-by : Frederic Konrad" , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 05/13] hw/i2c/ppc4xx_i2c: Add reference to datasheet Date: Wed, 16 Jun 2021 18:14:10 +0200 Message-Id: <20210616161418.2514095-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616161418.2514095-1-f4bug@amsat.org> References: <20210616161418.2514095-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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Richard Henderson --- 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 Feb 9 15:29:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623860091; cv=none; d=zohomail.com; s=zohoarc; b=F2Qhev2YGuxwJm2ERAyPNNzmzItXu/GahPkyoL55KLNo7IvfI07+0bg18QdvcUQ+Bvk/m0nyZOuWGXE7CCSiFojg+lQPXb9ro82Z+QsmjLm5d28vBxN5KWV/N4yLVuvQjPo8LmuMSEigTxGDYTk5EYhAKBF/Ry6On/jjjjgojaA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860091; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5aEVDqUseYYwXDUj9I4DDboAqkXF8aATk7ZG+d3YXVg=; b=oHYXCKEPCNrpv5m2SkhsMgODZYE0jS7KDL3enLdqmYShbrYibLCUmko3YqqaMBII5NznbDxmdJjm0iTgkv3p5qcSBl/8wD7qdTH31Pfj/F8eEnJfhoa8mJ6BfVaPKr0NuQHOHMqh9GXboGHUF9H9QtRqPU5VkT8dgU5YhhPd4wI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1623860091119365.7162215513513; Wed, 16 Jun 2021 09:14:51 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id q5so3354269wrm.1 for ; Wed, 16 Jun 2021 09:14:50 -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 m6sm3175364wrw.9.2021.06.16.09.14.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:14:49 -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=5aEVDqUseYYwXDUj9I4DDboAqkXF8aATk7ZG+d3YXVg=; b=XsqtSV8oaLOyjIC8TMHCtq4LHDQUpXFOl34+XwRMsfSAeIpR7EZjhuGjhA9ID9XWOf dRmC7Czh/ccm8obaYww7ul0vTXO1VhD6fZ+UDRZu638VNSyObx7335AQNKoFwUuzLYhu I+mIMeGh1HYTHIQjCUG9+WDa4KdRE5swTXBJhXTp/H742xSO2fX6tIneQ2CJYh/y65th A+QExky5feg8lgWDGLknuXWkNZoYFRJ0ieDh07noiDn41+cVQXxSvOOJ//qY01jvEsSu sFe3gU95tUKSVwFXUgQZLvpXfoHttwGc4owC+YKfNSR569FgqgDLEF8A7t5GRgpdEHcw gZNw== 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=5aEVDqUseYYwXDUj9I4DDboAqkXF8aATk7ZG+d3YXVg=; b=U2FCbUOXONr1VrkVQE9/PlajASSYP+35FMLLjoukbJ0gb3uHUvdGtLAYsM7ffDCD+m MdwnRh9xPHmJBt17KjWRiExVTQoJEjcjcR3AodYeTWlbu8pLAGBQNI8fqizYEh5leHn3 QFmhnvPawU35nl1PESaS3Toq7xFRRHUkcfO1GyeHksepyLLiKezfWepbkpTRazVIJFrk PohX3qjy+d5+WksryYtIKQeo/AJ0ZsrwaLM4GapRo4VsWNQMYr/Az/WQKZxZGuZOouSV BrYcXcI/5JTxc7cO9WJBE2PwCblc+k7VNX6GSAkHg5d9rFf17biXda51fOadkOAMuM2Z p4LQ== X-Gm-Message-State: AOAM5321yxnWHZUMDihDc32oCS6/GEbxRHv0+eGZwKn6GLEAJBw7Uike jnMneOPET+YwJ2vloOXDxOE= X-Google-Smtp-Source: ABdhPJyp1RkSmkBwi9661Rqx6Wxxrg1MgMzwGc8R+iQZl/yb+VD6xhkvLqNvF4lWRON6k75i9FOrMw== X-Received: by 2002:a05:6000:154c:: with SMTP id 12mr250756wry.126.1623860089435; Wed, 16 Jun 2021 09:14:49 -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: qemu-arm@nongnu.org, Corey Minyard , qemu-ppc@nongnu.org, "Signed-off-by : Frederic Konrad" , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 06/13] hw/i2c/ppc4xx_i2c: Replace i2c_send_recv() by i2c_recv() & i2c_send() Date: Wed, 16 Jun 2021 18:14:11 +0200 Message-Id: <20210616161418.2514095-7-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616161418.2514095-1-f4bug@amsat.org> References: <20210616161418.2514095-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 easire to review. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Richard Henderson --- 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..b3d3da56e38 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])) { + 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 Feb 9 15:29:51 2026 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=1623860096; cv=none; d=zohomail.com; s=zohoarc; b=QrB0VRqLCNL45uHjZ0eFbMkSaYnop7YWegnPRrgl6A0Qt8a/VaatilL77ZUAt037IL7jrXEyNU66KbF9Ozn55cjUGMGHl3mFrn6EunoZUkBCN6pVhf3Qotn/89PiNhVZdhR6ReDSLmu7skFF/SAiYVkzo6cEOW4n8hDYjwy0DhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860096; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xiYohDNx8TlWsyn3BtTL6DGqTBwgAW/ROdRkO4E8HY4=; b=ULap79TOxSq+8ifaTzRtZhZwfMejOeF9Z6wQ+fEDLtOz3/kUr5KR5WGg/4d/ybMP0Wmm0xpJUr2y18ceqMKRgUCUTah7+DTHadgOvlvAPVpmbiGaNRtgkKFHLCeNr2XlUwqxELR6xfR7ONE0uZtku5kQvwuUL8lsBQRcGrW/b3Q= 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 1623860096074722.2857953665657; Wed, 16 Jun 2021 09:14:56 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id i94so3321384wri.4 for ; Wed, 16 Jun 2021 09:14:55 -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 l9sm2272104wme.21.2021.06.16.09.14.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:14:53 -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=xiYohDNx8TlWsyn3BtTL6DGqTBwgAW/ROdRkO4E8HY4=; b=aOtuR9WIqaAD8EuWlMHLswsX7qgNibUGV9gDa9D+IJqM1HBSjtFGI0DQ40mWrk540y kKZZtEDPCaa0vPBcO0Yi1z6vaD86iKshbzdgvVU8b3U1sembRN7RIvFLW5uDpgf1y0rX csbghzGiUxhsmrMoEG8XV9alJ52ZsfOTHwbvM+Bm2sl5gx7Zke71qnGkHAp9AbBLEnvy NWydfgUEoTUkf64bpMXVbO28lxqOKfSsI3i/76BIvdmRjBTaHOUmFALwDjeJAPFV/DhT Qor5ZnHnguxIFG6sFp32DKCcsAfWdyEjIdTyoPgzTMvAe+S2Oxhvd3DeNujG3xOwJCh8 18tw== 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=xiYohDNx8TlWsyn3BtTL6DGqTBwgAW/ROdRkO4E8HY4=; b=LnxpBVwWQaImMMtAsRDYVdPVmVJNEsozdU9z/QPGLFmpeTopilVyis8XdnqTeK1W06 naC47Agf6Rc4IP00xnz3OzcEEuAJBFdIx4AsLy0Vl6FKHxoJOtCMRJ7NqHs3dlknl9Hk 32qLK2AZK9nZ+pcxUB/vKGZV6Z4s+Q/0Jb8SBcABDDyhonbb12VwNw0AAiEt6cCiqoU5 cXxWhKZkfugzhfuLX+3dKJNFNYOsoe/g6bg6F4bMJus0yo8kOpuAh7NNC4HRxB7Hu7XM t1O9DwiZH8FLc0DzjcZVLsA7GNTP1M3LfBiMC+hYYxkQrjF4XooZHKM72YseFGgWSwvF Jjaw== X-Gm-Message-State: AOAM532xcw1FTdhiJVO42EIh01aYkC0k+yn1nlT9cYrdp38szsrbkXVZ ycXYwJIV4rRvgnE1SrXEFM8= X-Google-Smtp-Source: ABdhPJwsN8eCQQYbkr0ajVMEPzlbrIOgk7Krr7lKeEptpHIOA991IlVLwNt6A1ghbcCME0vA5P6RxA== X-Received: by 2002:a5d:6747:: with SMTP id l7mr242368wrw.220.1623860094387; Wed, 16 Jun 2021 09:14:54 -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: qemu-arm@nongnu.org, Corey Minyard , qemu-ppc@nongnu.org, "Signed-off-by : Frederic Konrad" , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 07/13] hw/misc/auxbus: Fix MOT/classic I2C mode Date: Wed, 16 Jun 2021 18:14:12 +0200 Message-Id: <20210616161418.2514095-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616161418.2514095-1-f4bug@amsat.org> References: <20210616161418.2514095-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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Richard Henderson --- 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 Feb 9 15:29:51 2026 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=1623860100; cv=none; d=zohomail.com; s=zohoarc; b=KVk3LAGrxW+zoc6nKkiLsMbLotDjRAkN43VIHTVbeWpLzRDsHPHXA2MXEXFPPhxTAS9CJOF9DBPOTz6O4fiAOq04pnHdlXDhqzz4AUUtiXNrY3J1DaCwTFfAnivnQpQKJYa/E5CKhvWDvfPfUK/rB7V3kACIBWctUF4o7NOqiSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860100; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YnpC7skv5DHlC3FSHAcwV7gYnTT6SGeWYmONsyLMX7o=; b=L86Ay3M4/yWNXOxBl6o0AZ7ibQa/rPy5MgESHiOnDjU+zPuEz/rGeLAl7ZP2vXQ+3pCwcEble+b7ITI2Mh6N33qNwqt1zzRbM0Fy8Av7CG7mqfdKOdcdyizE/SCOssNC6ans0BdJrMSds8eICLjfwtM8sY2UjDE8MrU0gRSZONc= 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 1623860100837875.0282011578198; Wed, 16 Jun 2021 09:15:00 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id y7so3302553wrh.7 for ; Wed, 16 Jun 2021 09:15:00 -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 t4sm2632791wru.53.2021.06.16.09.14.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:14:58 -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=YnpC7skv5DHlC3FSHAcwV7gYnTT6SGeWYmONsyLMX7o=; b=U5uFFXrmFtFFjMKEeqShBc9WfToviVZLjgbgBoqIyAGpSlHZtRpiLMM0iriDBgFQzt cMwMdXSVbmzdk8RWge+lRqdkdeN4lpe0fhEdEEDgxhy/lsayVCH2EyziNR9A0rZR38T4 HLSia8GhrZKIfV5+UfIJ18ByCxZSd4SWWjcyYheDahNBk1uN4ISgi+jGLOxprQGD8nSq kQXS5gWU7HWwbhYSyzDtmGLuXujf2u0VHOqoefpKO3vbNi5QQIXTw3QxmzTZobL/X126 cxUfk/zkEMnaAwnoheu1x358yyyBjv+twwjyhy8Gq2AnFe08hTvnAXoJ9i6xTIsl8NE5 vyJw== 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=YnpC7skv5DHlC3FSHAcwV7gYnTT6SGeWYmONsyLMX7o=; b=IpDZ/OUYW0O20py7etywCM2c0FRULVYYMZJBWAzJshSBuAWcU2NzUJgOoVjRSo819K oYlSrE8KPqy8MKLLAr7+7DQt/s51Kh9kmX4QluBCBbqXN8IAWsSOamaXDtfO04unFb1p mbetzg7uAXZ2yhktf27u/KjpO/3oiL/uGwppW1xFX3CQRlDDOy+9gIIv8Fs/4ge2/kdc juWtT7KRyoVVfHbLv9urt4ASX2bBwQ07HB1WDo+4NONQGZc0/nGwKRdIg49FeImOsblh Tcl8cpWfjiNSzK6K306s6fznyPizw69f8dppwQLAHmaOnmTtd/NN1bQvVyHLyOg0tUfm 7B2Q== X-Gm-Message-State: AOAM531c99XfWLEfbEbTKBZjjjyPucPIxCMgIfHEtL4VldE0zbx3IJn8 z4//LbV4IKRV3kW++BAGpR8= X-Google-Smtp-Source: ABdhPJyCuvQerzDa/gdwo6sxV9DH8UybXciVgOuTuI/Fyc6mpfF0UiFmhZfn4TG7F6tPw1ux3Tdwbg== X-Received: by 2002:adf:f648:: with SMTP id x8mr200267wrp.215.1623860099030; Wed, 16 Jun 2021 09:14:59 -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: qemu-arm@nongnu.org, Corey Minyard , qemu-ppc@nongnu.org, "Signed-off-by : Frederic Konrad" , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 08/13] hw/misc/auxbus: Explode READ_I2C / WRITE_I2C_MOT cases Date: Wed, 16 Jun 2021 18:14:13 +0200 Message-Id: <20210616161418.2514095-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616161418.2514095-1-f4bug@amsat.org> References: <20210616161418.2514095-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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Richard Henderson --- 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 Feb 9 15:29:51 2026 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=1623860105; cv=none; d=zohomail.com; s=zohoarc; b=mzvG4Pm/ieNZu7zNr5yAk2hzYFdeZYbb2FPLgr/iVbobZuWew7wtlW9AC9XDyikKvj8wMb4DdHmYt67V6nuGKBQkdUcopJSfNUcjSwvluVjsSX7j0UnUQDwXTxnJXjoA7iEocnPYhQKHzbEIQh83c4k/ND3J0S3oboBkrT9Uzj8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860105; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1d4OoqsJ8FMcOnJf0dKzbcD5w9xCZwknQ2w/kjLbVKs=; b=cEsKJ7MSu/rfIE6AqOCnoRBk1ewZ0hmGshM9VtWI1hJV//r9MT0K5DPOLNMR/+RTdxWMVm+z8ld3iWzoxfr7ZDVTFQxEpGxGOZr/Bm93XsfnxulaGrXZaNAQdTvbFZ/MG7Lh3KO2WBdV+XaAAsU9Bmw3COOziwbG72AgNldWioI= 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 162386010546699.03877196441044; Wed, 16 Jun 2021 09:15:05 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id a11so3298784wrt.13 for ; Wed, 16 Jun 2021 09:15: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 n13sm3047802wrg.75.2021.06.16.09.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:15:03 -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=1d4OoqsJ8FMcOnJf0dKzbcD5w9xCZwknQ2w/kjLbVKs=; b=i+H/5yu7f69GuWpwop0RrbGr412l43TvPtu09sgrDzSzWSwnq3vbxtu0rUchVqpMms eF9cugj9zQtt/1O+PDDHkhWu9p4G48HWHsR/3VDXwl4R6xQefI4/cWAIuqf4+jDfxXQR O+V1ozowgKTbIcGdoAtkTRnOSIMXlWYVKEs/EATn+rxNGX0rSnGteVtV+Jg1+bE9OFYq BuAgmCMlVN6qPZpYJcMYA+d9lBDUOPrrwvj8BUS8friPMWVfbKydPhwYGwTMtcZ5HtoA D7TDnLvPQ4u8zujqvL/oGKLTSKNfCvqhfCqu62p2PNqc+HIg6sA9GnKxV7ntJ+/G7vOx F4GQ== 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=1d4OoqsJ8FMcOnJf0dKzbcD5w9xCZwknQ2w/kjLbVKs=; b=n6kNL7kzgY9DafPyWgZjoGTpmYou9YMzwWGsEJ9E0L6U8uRWwNu3Sq4ZtL9+ZDiLcU WBC8cpAI39ICty3JPdE6BvfL7dOyKAHA4/XRX9+vdyN4hjQ95fl4KLmFTnR+CzLokrul hiOcWpdFbF/JlfgAnh1LuVucS6KseKcIv0iTp0vT4SPVNiBgqAJ5On/dDvdegrhSJeS8 UUTdv/kM0eV2EDQ5hPlm8YbmVSJ601hir6ezsTzwGBNtL2GAYmS10qh7t56O5mReJCJK FTxSQtOtIFxce+aMLRky6zLO2qjO66IqthgMc2DHmR7M5gOLzUxppF5lCYyImpjQm5l9 qa2w== X-Gm-Message-State: AOAM532PC0Inlwa3iZ3H34l231oXQZIB1f41g0MkseWvIZ0rvk64LiPa GM/x7a6IHJG50mIeuJInwhI= X-Google-Smtp-Source: ABdhPJzFohbkMpY1xOxE3ngC98JZOaw404H0elLpFjjqD5J60cJIi2ZKJo4PCdJ7tOjzV/T/cef2Yw== X-Received: by 2002:a05:6000:128b:: with SMTP id f11mr203265wrx.171.1623860103704; Wed, 16 Jun 2021 09:15:03 -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: qemu-arm@nongnu.org, Corey Minyard , qemu-ppc@nongnu.org, "Signed-off-by : Frederic Konrad" , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 09/13] hw/misc/auxbus: Replace 'is_write' boolean by its value Date: Wed, 16 Jun 2021 18:14:14 +0200 Message-Id: <20210616161418.2514095-10-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616161418.2514095-1-f4bug@amsat.org> References: <20210616161418.2514095-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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Richard Henderson --- 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 Feb 9 15:29:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623860110; cv=none; d=zohomail.com; s=zohoarc; b=ecZF70i1z0TQIfbg3pKAiNk9BE5E0NOB2+M2Z5Z5DJ4pcrK/qQzFL9gtSl8EyQXLDAHp76V7sSJkYGTu9mn3LOQCyMzCDAl5EXbkEMklrIi0gLq/1nq0AWNEuueVtqhnRn/7cncnhgUwdtR3aSdNFfnlx0DaraAtWHZNE2kaNw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860110; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vAQOTgkXRhPf8zVosSRFgasjO/1Bn32INvkw+pDxE7k=; b=ncXJtSn/CmoN3dIsr+pk479rU8+GRa9+8DSw0ecIbY64gdvHlkNqDhkFn8iIsxquk78yQr49y5x/nmo1bCQtj2JlAd9AMhpZ51C+aF5xfm0SShPn66ImX6QoVyvY1NmmUF0X+ABBP4VKfdnO2LNvE12jadBV4j2sEr/SQ3SAvAE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1623860110259336.7861166396177; Wed, 16 Jun 2021 09:15:10 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id a11so3299047wrt.13 for ; Wed, 16 Jun 2021 09:15: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 n10sm2543446wre.95.2021.06.16.09.15.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:15:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vAQOTgkXRhPf8zVosSRFgasjO/1Bn32INvkw+pDxE7k=; b=Oy9vMtLOZAPeK0nmALXedUl1vVeHjS7cpXY+qKd5XKh/nrNHQXIVNct2k2sGPMAasO TviWSsUSA6DbzJ2H4kx6DEOHKUoH5LuEyblPG+a94oRPfsvQgWwYYaI5HW5Iien4hBrj nm/4QJsSSWk88yoKPkpb1Fre1YEuAEpcdH7v7MqzfOIuykhGzWoCHzXi2v31lgr/BqO+ Qk+H2G7TMiJaA4jmRfV2uG4dWCUCeWXvyOiBXrIq5ok7WKUgDpfAlYlWtPOpGvSt2MXl l4Ot/Q3DMFJCZZauMPWnH+GDFuBIy8q5ie2gomqzi/zFLC/go7wxC4SUzZ1xvWRPEqdI CxBw== 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=vAQOTgkXRhPf8zVosSRFgasjO/1Bn32INvkw+pDxE7k=; b=bdH5CeQ9F49fFTpL/k+6RU0nmBu62dJ6aX0AleyquIQcWhzbVMaWg7IHIplVRB4FY9 ek3Ov6MLhBBAcv7f5bDkY1SkbUJTvOAx1T7K4lwu8pXNSESOXV7InBuyoEn2/d/6h/PH QFFEdUyT25pYhPpvobrp4WGOP9OphBPR4aFaETi5CPbrVXm5NTPfUHxQCP9IZ5Xz3FR2 AU+xvABtiW/cZmlUUv4Pf8ClT5z2/sugXLa63I3k3OespITnZAcdHnfXrzWFGKIWulng CFfJL9PlX24I/ufc87Ix/KDPuFNKwN6W+q1fM8zZE9ktMGf8K4n3Vu5rYXqDjCogkxl1 aNIQ== X-Gm-Message-State: AOAM533O8/gfx34vfL9F4kDhydIhtOKtUhEXnLAIf6Cri6Cxa5MHU9lM eV1HSudl/W/UL9fn2pIi2y8= X-Google-Smtp-Source: ABdhPJzetfsS6t+HNdcnCAtVuvhVq/GM6GaBkmkTKK8o8eL1AsAmLvZlakv9XaNQnIZGyyXQhvEAjQ== X-Received: by 2002:a5d:6849:: with SMTP id o9mr258335wrw.44.1623860108495; Wed, 16 Jun 2021 09:15: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: qemu-arm@nongnu.org, Corey Minyard , qemu-ppc@nongnu.org, "Signed-off-by : Frederic Konrad" , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 10/13] hw/misc/auxbus: Replace i2c_send_recv() by i2c_recv() & i2c_send() Date: Wed, 16 Jun 2021 18:14:15 +0200 Message-Id: <20210616161418.2514095-11-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616161418.2514095-1-f4bug@amsat.org> References: <20210616161418.2514095-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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Richard Henderson --- hw/misc/auxbus.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c index d96219aef88..4d270ea9ec3 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,14 +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) { + for (i =3D 0; i < len; i++) { + if (i2c_send(i2c_bus, data[i]) < 0) { i2c_end_transfer(i2c_bus); break; } - len--; } - if (len =3D=3D 0) { + if (i =3D=3D len) { ret =3D AUX_I2C_ACK; } break; @@ -233,16 +227,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 Feb 9 15:29:51 2026 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=1623860114; cv=none; d=zohomail.com; s=zohoarc; b=WJSd8ImIFLH1CagCn13w7vGho3i+5KoJqqtUjup2ZWttLWjesq9jCqbZKA2kNwH+8191g2XSTfvUv9LGaWjpurm++qKqQougtu2SL8++Uwj9jJjnk422fzJxRVl3MnhbNPyMsQ/Vtz/DZS+h1jXjrVZ8ufZBOW5rzeKxFNkDlkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860114; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AM+Hzqy4d+379ZoGynzXBYcBHD9uH/8EFIiUHi8zc60=; b=jfOywFMD41qbz6qwRN7iuuFCDUmsUNg7So/1uD/94gWqbKR00ozCEsaCzcR338yqQ69yR4dmFoUGu2rz6dTlUHC93wf0beWnv26Fhatd80uTohiO4DK2Vono7G8W0kYlwsU7O7F8oxvnfesGST7HjAgQkzjqcyTw82PHq8qRKho= 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 1623860114951853.9851089696548; Wed, 16 Jun 2021 09:15:14 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id n23so1611596wms.2 for ; Wed, 16 Jun 2021 09:15: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 u15sm4472338wmq.1.2021.06.16.09.15.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:15: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=AM+Hzqy4d+379ZoGynzXBYcBHD9uH/8EFIiUHi8zc60=; b=KLsSqA5TYFhNn1OAyn3TfGM3IvIrzt4Kyw9Xtw2JW9XN356ijIjBsMQr8W3bXeCCnM rqT4L/TiZ0WhrfO+0soiSdXKn1VOGRv+gAHbUO/zmksrmr2YZHCXSEudxM59HBj+DwuV E1KethLImf/tDFRmtcPmnLzTVdFPAQa+0HwkWdWbhBDr7OaIjTjABSRZDSDaJZdas/1S slxzrMXYN3i5MQdmZ5/g/9E47H/c2RBwg70Q9jgQEz+Ymn8Igeig5ClPNfFA1rRHqfdy isWUmBE2QHdaI2uyWhLAJQP1s2eO8QL1AWjz6PQK9CyZMBSQ/4ABuIzZBtley/xisSeR 7tBg== 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=AM+Hzqy4d+379ZoGynzXBYcBHD9uH/8EFIiUHi8zc60=; b=pxAZu91O7AgHB7Rkh73kEki+GxLp9INr3m0wG1z+HQVYTjZz2Me486PjqQUwVwJvwm CPkDSCkObYN12RWrWECBFzfW/hCH7ENlTnNuEvUowJ0lAAhOJd+42UoO0luWxiJj0Igj jtRPnzoy1/5OvISm7W+vnDTRM3vPhDIpKVq7Hu2GhxIE5W1hmG+XI8N+99T3mCIp73rc wcml1ah1N7WcopcK9idJ+3/bb6EGTXyd0CxHN7WLmw7AOPiO1bEbgTsEaoeOHHYDNlVD Ti1aqD41sPMsPFUAHOwv7+wmkVza8vhwcDZs15jezjyh4U7j2VaLT6R7iAsXiKtn1gWL Cpkg== X-Gm-Message-State: AOAM530VaDGgqCpg2+6OcOmCQtV7IEaCMWcgDN9U56Dgr/CbQ5iyySuv LLg48HATJWYWLgRfwJU3BQg= X-Google-Smtp-Source: ABdhPJwjEQ+qe6jbfe+LCNp4q2EH165wlV13UCnN+0Dr8x5A/VfzjOF53dQeSAEy77VcIuXJNtpSXA== X-Received: by 2002:a05:600c:2109:: with SMTP id u9mr12429211wml.7.1623860113141; Wed, 16 Jun 2021 09:15: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: qemu-arm@nongnu.org, Corey Minyard , qemu-ppc@nongnu.org, "Signed-off-by : Frederic Konrad" , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 11/13] hw/i2c: Remove confusing i2c_send_recv() Date: Wed, 16 Jun 2021 18:14:16 +0200 Message-Id: <20210616161418.2514095-12-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616161418.2514095-1-f4bug@amsat.org> References: <20210616161418.2514095-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 confuse API. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Richard Henderson --- 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 Feb 9 15:29:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 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=1623860119; cv=none; d=zohomail.com; s=zohoarc; b=ZrqQYpJFWYha6r0mALsoxatzjlQzlgHRTkH77gHhEK5lJApBEMg46zY38W7b/kTZm61KrupGI6rfNA38dlK/wJXbJLRErVmnpKGFKGssMble5MTPaXwS3pEBIXptE/c92E/EEvOuvDoUZaGKTzZJwVoYdrztV/CCymASotmdB74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860119; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5j6k5TR5q8R5g85iAza6lwthsGjXgN7CmoQbjiM/TLc=; b=LEk0rjKlEVP70O+hF7B2MiMhWWNwqd02KQqKD8c+W3PovKWC4rGR3BRA+Vkk7qVFHGmnsFuB6Mz969XbO7BtjS54NLp0dQ+WkS6q4xj3J8y/ttbEVpWbBYoXahyUS94ZiXsn71Q+SVd69bgWZDtlC46+APtr3Vxjw7GLO+24Uuk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1623860119788559.7393651716878; Wed, 16 Jun 2021 09:15:19 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id q5so3355908wrm.1 for ; Wed, 16 Jun 2021 09:15: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 z5sm2569392wrp.92.2021.06.16.09.15.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:15: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=5j6k5TR5q8R5g85iAza6lwthsGjXgN7CmoQbjiM/TLc=; b=RF08CFAFL2cUXtvWVJrg6DbyykCCRhomZyvwSCXKTu+cHl/IwZ3gtlsydqPmDVTwJu TuwkoBkB/yeoglAbuLiq/7hCnAZL4G/BxrIWVqH359o07LK+nh0w58lUr8NLeAQ2Xr0n fR2AEF9Q2OJaqUjp9ys0j0deoZ0YrPAUVhIRdBXCTj8XxaZumJ3QCLPjUeA0CatvbpaH hYSvvEYNTWWLlpL8gwRybrKT+DGZ+NLIbTkjAGtY4hPCbJ6hNPo+k089X7X+mO4o4IRt ZOBDThZuSsgEMi+XArOF2m9F5PiatIWNokeQAFdT+rTf3CC9Inxxx3yJIAsCYAoeHyI2 cTtA== 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=5j6k5TR5q8R5g85iAza6lwthsGjXgN7CmoQbjiM/TLc=; b=uKhmvWB/6flT9xrlWiCTuzXkIYYhb/vBARcjalpimZGfYENbvcKnVpDxNHr1e9OnId LjNcLWAIh4wHb6dztThclSc3Q9CpaHwnPZf9UMPRWl8EZXJI3v6HtL7GQ3ri8iF/cxZv ZDGDcU7Y2oLCEbtzr7fx3OU4jGdY7XW0TGpYRnnNQtoQKcrn6AzyGWD1Irhy40S4qEzr TxWEXM/XG5cfbI/CVtVlsvIzn1kD2gZ4WKj8p7keelwtbd0kFIeQknInP5I7XiVUYJks qHIDCOhWhHdzNSmJDxhG4VsdfmBGgx3lW2SFWBZfhshUaXSOq10B4TdhdpUf2tmN09cm HCdg== X-Gm-Message-State: AOAM532qqlTlqEnkmDlCWwxdjKsv5Ijo0t8zpsMEgxCjUyUwDJg5JTMF 2/eV4heaACfztISq5MMCTiM= X-Google-Smtp-Source: ABdhPJzFEbZaYUS+F9R2mz1af3Ab7I4bXVkrDTWFljC3z6mZQLbn72XWDGfSww8Uz6M95sDrswQU4w== X-Received: by 2002:adf:fd90:: with SMTP id d16mr221942wrr.35.1623860118000; Wed, 16 Jun 2021 09:15: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: qemu-arm@nongnu.org, Corey Minyard , qemu-ppc@nongnu.org, "Signed-off-by : Frederic Konrad" , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 12/13] hw/i2c: Rename i2c_set_slave_address() -> i2c_slave_set_address() Date: Wed, 16 Jun 2021 18:14:17 +0200 Message-Id: <20210616161418.2514095-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616161418.2514095-1-f4bug@amsat.org> References: <20210616161418.2514095-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Richard Henderson --- 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 Feb 9 15:29:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623860124; cv=none; d=zohomail.com; s=zohoarc; b=GsA7EqwfQF2FQDnPFpxHwNsCfOG6VM8mm9a2tuxdoUrRb7hlZ0WXW5kfSzopciKnFJ/QSKwTDagLbBYJr+DWytULcdu4F3OE5TdIaMl1hVhS1e7bxjraZkAlmNOplcZruCEfVGYOc23RlcxMK9m9yH7PRpbF+SrUY/NeJLhYjYE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623860124; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6lt85/6Ab9aS88Gelb6VTdSzWi6Pxv6OIgfdzzi0PC0=; b=Ub4ZMPUbNLhFcAurhOZPGVhkSSMW19Y5Xpnn0rmM60bUVFUUaeSwBGu/slnGuX+/lva0yKUYKw1gQA8kgK2W/KdpQJkiqglBmjhMAJlPcjS3K0Aub1z9zH7k9pXQ9CpvZyz172tRiJMDNn+j00FrMASk7N6dBpDJGILqpaOjIUQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1623860124483392.3059706627529; Wed, 16 Jun 2021 09:15:24 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id i94so3323263wri.4 for ; Wed, 16 Jun 2021 09:15:23 -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 j34sm5190601wms.19.2021.06.16.09.15.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 09:15:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6lt85/6Ab9aS88Gelb6VTdSzWi6Pxv6OIgfdzzi0PC0=; b=AFjVHlJkrDVEUb2KrSgl5Mmxj5uGBUpgzArWtbqy8il0tszisGmBW7ohXMW0q19169 FWv8Hj/hCo0jrdA3HYI19GsPehjG4DDmgKhwggMt2U9CCoIAPfR0P2oEuilbhzuJTAiv jcUjg5FFmrLIIUiXrlzGYLD0x4wSutS1nAACUcAxx5gwJi0/Xw2fs8eSbLS5qpnZXJlc LQsU/ccElb40L5hcOi4Z32Lz6ZbKLOneeajUF0w+5JZx2Hi1qIpWiolx4qQLDJKRZD6S r/ACAwPVOSzsjinjEJbUeFTllcSzcbfNzba0/h+3n2wQmYWdE27JU5C+bEZBtRulSTCH rBpQ== 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=6lt85/6Ab9aS88Gelb6VTdSzWi6Pxv6OIgfdzzi0PC0=; b=XFZPZKaE6tWOi83XSfUOAIsCSxXRCZKssXi4jsEOlYsRgtIGUGb23IhQ5FjZxmu4Un asgEx5sJjb76O6YYJ4Dc6cccqMnK/qhwMkwXemBDAsk5sAKjO2lzERMflQ41NT/W4nW+ 8SopwMizY2tirzIoEhpq/HNN2FT9q5vf7DcdmYcHKCz2cHVHRXHsVuQFMUuxdOzOpk+V Ep2zdEefuoa/PaZi6UFLgcPFY2SYDZS4EGT4LjqmBVHKpjNxTQriAUv7EhH1mq3TT9vj W729Mn58+pTn79NySfdAUw04ozVB2MEfo4QHvyGxNzRjvXiSFCPJf5PHpOL0Xgx79nsW iHwA== X-Gm-Message-State: AOAM530iI5tJYQKoa2JcEnjKvEczByvpcucN13zyfMnrapI08gnePu5O sUPd0l1ZaL5usitVKlxXO+0= X-Google-Smtp-Source: ABdhPJz3TXpar0LJd26wsV5qdHuPrw+twYs5hAss7izgK51nzcP6QJMK1+8AlMpvynyaQZy/Xax+IQ== X-Received: by 2002:a5d:47a5:: with SMTP id 5mr193752wrb.259.1623860122762; Wed, 16 Jun 2021 09:15:22 -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: qemu-arm@nongnu.org, Corey Minyard , qemu-ppc@nongnu.org, "Signed-off-by : Frederic Konrad" , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 13/13] hw/i2c: Make i2c_start_transfer() direction argument a boolean Date: Wed, 16 Jun 2021 18:14:18 +0200 Message-Id: <20210616161418.2514095-14-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210616161418.2514095-1-f4bug@amsat.org> References: <20210616161418.2514095-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] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Corey Minyard Reviewed-by: Richard Henderson --- include/hw/i2c/i2c.h | 11 ++++++++++- hw/i2c/core.c | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 2adf521b271..5fe94c62c00 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -80,7 +80,16 @@ 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