{"id":814531,"url":"http://patchwork.ozlabs.org/api/patches/814531/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505580378-9044-6-git-send-email-peter.maydell@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505580378-9044-6-git-send-email-peter.maydell@linaro.org>","list_archive_url":null,"date":"2017-09-16T16:46:17","name":"[5/6] hw/i2c/omap_i2c.c: Don't use old_mmio","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b850b5a55cce03d7dfcf2479d1a828f12ee4a9e3","submitter":{"id":5111,"url":"http://patchwork.ozlabs.org/api/people/5111/?format=json","name":"Peter Maydell","email":"peter.maydell@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505580378-9044-6-git-send-email-peter.maydell@linaro.org/mbox/","series":[{"id":3457,"url":"http://patchwork.ozlabs.org/api/series/3457/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3457","date":"2017-09-16T16:46:12","name":"convert some omap/palm devices from using old_mmio","version":1,"mbox":"http://patchwork.ozlabs.org/series/3457/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814531/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814531/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xvdZg4TPCz9s7C\n\tfor ;\n\tSun, 17 Sep 2017 02:51:23 +1000 (AEST)","from localhost ([::1]:57993 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtGJN-0003cX-PD\n\tfor incoming@patchwork.ozlabs.org; Sat, 16 Sep 2017 12:51:21 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:52621)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtGEG-0008Fh-PE\n\tfor qemu-devel@nongnu.org; Sat, 16 Sep 2017 12:46:05 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtGEF-0007AR-VK\n\tfor qemu-devel@nongnu.org; Sat, 16 Sep 2017 12:46:04 -0400","from orth.archaic.org.uk ([2001:8b0:1d0::2]:37412)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dtGEA-00075o-N8; Sat, 16 Sep 2017 12:45:58 -0400","from pm215 by orth.archaic.org.uk with local (Exim 4.89)\n\t(envelope-from )\n\tid 1dtGE2-000171-5a; Sat, 16 Sep 2017 17:45:50 +0100"],"From":"Peter Maydell ","To":"qemu-arm@nongnu.org,\n\tqemu-devel@nongnu.org","Date":"Sat, 16 Sep 2017 17:46:17 +0100","Message-Id":"<1505580378-9044-6-git-send-email-peter.maydell@linaro.org>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1505580378-9044-1-git-send-email-peter.maydell@linaro.org>","References":"<1505580378-9044-1-git-send-email-peter.maydell@linaro.org>","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2001:8b0:1d0::2","Subject":"[Qemu-devel] [PATCH 5/6] hw/i2c/omap_i2c.c: Don't use old_mmio","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"patches@linaro.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Don't use old_mmio in the memory region ops struct.\n\nSigned-off-by: Peter Maydell \n---\n hw/i2c/omap_i2c.c | 44 ++++++++++++++++++++++++++++++++------------\n 1 file changed, 32 insertions(+), 12 deletions(-)","diff":"diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c\nindex f6e80be..12264ee 100644\n--- a/hw/i2c/omap_i2c.c\n+++ b/hw/i2c/omap_i2c.c\n@@ -430,19 +430,39 @@ static void omap_i2c_writeb(void *opaque, hwaddr addr,\n }\n }\n \n+static uint64_t omap_i2c_readfn(void *opaque, hwaddr addr,\n+ unsigned size)\n+{\n+ switch (size) {\n+ case 2:\n+ return omap_i2c_read(opaque, addr);\n+ default:\n+ return omap_badwidth_read16(opaque, addr);\n+ }\n+}\n+\n+static void omap_i2c_writefn(void *opaque, hwaddr addr,\n+ uint64_t value, unsigned size)\n+{\n+ switch (size) {\n+ case 1:\n+ /* Only the last fifo write can be 8 bit. */\n+ omap_i2c_writeb(opaque, addr, value);\n+ break;\n+ case 2:\n+ omap_i2c_write(opaque, addr, value);\n+ break;\n+ default:\n+ omap_badwidth_write16(opaque, addr, value);\n+ break;\n+ }\n+}\n+\n static const MemoryRegionOps omap_i2c_ops = {\n- .old_mmio = {\n- .read = {\n- omap_badwidth_read16,\n- omap_i2c_read,\n- omap_badwidth_read16,\n- },\n- .write = {\n- omap_i2c_writeb, /* Only the last fifo write can be 8 bit. */\n- omap_i2c_write,\n- omap_badwidth_write16,\n- },\n- },\n+ .read = omap_i2c_readfn,\n+ .write = omap_i2c_writefn,\n+ .valid.min_access_size = 1,\n+ .valid.max_access_size = 4,\n .endianness = DEVICE_NATIVE_ENDIAN,\n };\n \n","prefixes":["5/6"]}