From patchwork Thu Sep 21 16:41:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 113873 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp2244539qgf; Thu, 21 Sep 2017 09:50:01 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDrh6nKWTRJcxvZSPOBVT1/mF+qHEHcLHKmhv4qso0oT5tUepGlExM6c1cRGnPX4ssfQXAF X-Received: by 10.55.147.197 with SMTP id v188mr3984636qkd.350.1506012601815; Thu, 21 Sep 2017 09:50:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506012601; cv=none; d=google.com; s=arc-20160816; b=EbWDOPAsP4pTu87I1m08FHQb8UYn8qSR2ym+MNCX1V/y6rEXkgk0ZOCqdaR+xW3yTk dcbGJZijDGCUYmHRJ4KG026/CDyLJE48HvvteDgAfYhl3Lw+ZEol9jqlBpk4gG4OZMbH 1ona3eZnuVeZVKs6gmeFyoUyZTviI48fFfrnxoGFaRkTq8G6zWclW/z44upTiLW0FIDt WxJg+GWFUaSPqtbmDr8hSb/jRCrFlFzU/dQXNCpu3Z325ycCbh/wPBlXZfxDgSoes3Ni WVp+yDms0uKQ/4vQeTUxAWzF1RLUlUBjy7EAQ/Viq7YH9iqtbutKjZY9m2fJnSfKUacP SGzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=Dn9zXJ4eBJ+l1Zdg2HcZGEhtCRCftPx9OMtGr9RQhYo=; b=vGWdd9ZDO9OogTpjiehSDGUbd1+j4fPDFLb49cxiwuWutv6gna3qO09enhAYyuxI6s Q/gPF6dle1VcvH6lK/mvP28OM+++Z4xYWoDfBqOBt5UUDLu3AHdAGXg2k8XdgSHpbhjb ix8F+eJIjyVCiwqBTUH+ienzuX2ennRs9SH1WE+phxF9RWhfvixwxmIOiOu3R4Z5wzEV g0aXGFEciGov4Fafjkc0LjUk356xH+gBb49tIH35axfiFSV3ZMs1A5V+lJX9/rkypq9c s9w3+ZsdaNkVY148I97WL/os9ShjLz7K3piEPnHvBAA4r+U4AFdIPiRN1+Q/MznFvZpx whzg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u58si140580qta.40.2017.09.21.09.50.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Sep 2017 09:50:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dv4fn-00020h-Ky for patch@linaro.org; Thu, 21 Sep 2017 12:49:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dv4XU-0003Ao-2T for qemu-devel@nongnu.org; Thu, 21 Sep 2017 12:41:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dv4XS-0003NX-2c for qemu-devel@nongnu.org; Thu, 21 Sep 2017 12:41:24 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37508) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dv4XR-0003Kb-OL for qemu-devel@nongnu.org; Thu, 21 Sep 2017 12:41:21 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1dv4XQ-0005E1-N9 for qemu-devel@nongnu.org; Thu, 21 Sep 2017 17:41:20 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 21 Sep 2017 17:41:34 +0100 Message-Id: <1506012099-13605-27-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506012099-13605-1-git-send-email-peter.maydell@linaro.org> References: <1506012099-13605-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 26/31] hw/arm/omap2.c: Don't use old_mmio X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Don't use old_mmio in the memory region ops struct. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 1505580378-9044-7-git-send-email-peter.maydell@linaro.org --- hw/arm/omap2.c | 49 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) -- 2.7.4 diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index 3f6076e..f5b1488 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -2087,19 +2087,44 @@ static void omap_sysctl_write(void *opaque, hwaddr addr, } } +static uint64_t omap_sysctl_readfn(void *opaque, hwaddr addr, + unsigned size) +{ + switch (size) { + case 1: + return omap_sysctl_read8(opaque, addr); + case 2: + return omap_badwidth_read32(opaque, addr); /* TODO */ + case 4: + return omap_sysctl_read(opaque, addr); + default: + g_assert_not_reached(); + } +} + +static void omap_sysctl_writefn(void *opaque, hwaddr addr, + uint64_t value, unsigned size) +{ + switch (size) { + case 1: + omap_sysctl_write8(opaque, addr, value); + break; + case 2: + omap_badwidth_write32(opaque, addr, value); /* TODO */ + break; + case 4: + omap_sysctl_write(opaque, addr, value); + break; + default: + g_assert_not_reached(); + } +} + static const MemoryRegionOps omap_sysctl_ops = { - .old_mmio = { - .read = { - omap_sysctl_read8, - omap_badwidth_read32, /* TODO */ - omap_sysctl_read, - }, - .write = { - omap_sysctl_write8, - omap_badwidth_write32, /* TODO */ - omap_sysctl_write, - }, - }, + .read = omap_sysctl_readfn, + .write = omap_sysctl_writefn, + .valid.min_access_size = 1, + .valid.max_access_size = 4, .endianness = DEVICE_NATIVE_ENDIAN, };