From patchwork Tue Nov 22 14:23:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 127098 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 83DF81007D1 for ; Wed, 23 Nov 2011 01:52:05 +1100 (EST) Received: from localhost ([::1]:58273 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSrGm-0003ZX-FE for incoming@patchwork.ozlabs.org; Tue, 22 Nov 2011 09:24:20 -0500 Received: from eggs.gnu.org ([140.186.70.92]:57253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSrGN-000306-Hg for qemu-devel@nongnu.org; Tue, 22 Nov 2011 09:23:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RSrGC-0007yL-Pj for qemu-devel@nongnu.org; Tue, 22 Nov 2011 09:23:50 -0500 Received: from mail-ey0-f173.google.com ([209.85.215.173]:35715) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RSrGC-0007xr-Ca for qemu-devel@nongnu.org; Tue, 22 Nov 2011 09:23:44 -0500 Received: by eyh6 with SMTP id 6so245853eyh.4 for ; Tue, 22 Nov 2011 06:23:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=XxjsWnv6LNz2ai7NURGv8LxWcfz2t4VQD3FpybBMoAQ=; b=wldqfo7D1feWkdYAX3BZPj6+rRR5I41mdfXqQZgSOEPcWk/x9StKYr6FhF4W5U35Hq S0bhSLS7EmiRm7+VR1pD/82S9633OM+EgLuD/RoWXFRXM1QLy3DcWi4GSZb/f2YbKOny yeVS2yXYQiKZyU5vsE37ENRyJgsmQnMXTpYb4= Received: by 10.180.90.195 with SMTP id by3mr10362562wib.30.1321971823353; Tue, 22 Nov 2011 06:23:43 -0800 (PST) Received: from Laure.box.in.chocolate-blue.net ([109.190.18.76]) by mx.google.com with ESMTPS id fi11sm16789016wbb.9.2011.11.22.06.23.42 (version=SSLv3 cipher=OTHER); Tue, 22 Nov 2011 06:23:42 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Tue, 22 Nov 2011 15:23:22 +0100 Message-Id: <1321971808-20072-6-git-send-email-benoit.canet@gmail.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1321971808-20072-1-git-send-email-benoit.canet@gmail.com> References: <1321971808-20072-1-git-send-email-benoit.canet@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.215.173 Cc: =?UTF-8?q?Beno=C3=AEt=20Canet?= , avi@redhat.com Subject: [Qemu-devel] [PATCH 05/11] lm32_uart: convert to memory API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Benoît Canet --- hw/lm32_uart.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hw/lm32_uart.c b/hw/lm32_uart.c index 3678545..5701c88 100644 --- a/hw/lm32_uart.c +++ b/hw/lm32_uart.c @@ -27,6 +27,7 @@ #include "trace.h" #include "qemu-char.h" #include "qemu-error.h" +#include "exec-memory.h" enum { R_RXTX = 0, @@ -91,6 +92,7 @@ enum { struct LM32UartState { SysBusDevice busdev; + MemoryRegion iomem; CharDriverState *chr; qemu_irq irq; @@ -124,7 +126,8 @@ static void uart_update_irq(LM32UartState *s) qemu_set_irq(s->irq, irq); } -static uint32_t uart_read(void *opaque, target_phys_addr_t addr) +static uint64_t uart_read(void *opaque, target_phys_addr_t addr, + unsigned size) { LM32UartState *s = opaque; uint32_t r = 0; @@ -158,7 +161,8 @@ static uint32_t uart_read(void *opaque, target_phys_addr_t addr) return r; } -static void uart_write(void *opaque, target_phys_addr_t addr, uint32_t value) +static void uart_write(void *opaque, target_phys_addr_t addr, + uint64_t value, unsigned size) { LM32UartState *s = opaque; unsigned char ch = value; @@ -192,16 +196,14 @@ static void uart_write(void *opaque, target_phys_addr_t addr, uint32_t value) uart_update_irq(s); } -static CPUReadMemoryFunc * const uart_read_fn[] = { - NULL, - NULL, - &uart_read, -}; - -static CPUWriteMemoryFunc * const uart_write_fn[] = { - NULL, - NULL, - &uart_write, +static const MemoryRegionOps uart_ops = { + .read = uart_read, + .write = uart_write, + .endianness = DEVICE_NATIVE_ENDIAN, + .valid = { + .min_access_size = 4, + .max_access_size = 4, + }, }; static void uart_rx(void *opaque, const uint8_t *buf, int size) @@ -245,13 +247,11 @@ static void uart_reset(DeviceState *d) static int lm32_uart_init(SysBusDevice *dev) { LM32UartState *s = FROM_SYSBUS(typeof(*s), dev); - int uart_regs; sysbus_init_irq(dev, &s->irq); - uart_regs = cpu_register_io_memory(uart_read_fn, uart_write_fn, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, R_MAX * 4, uart_regs); + memory_region_init_io(&s->iomem, &uart_ops, s, "uart", R_MAX * 4); + sysbus_init_mmio_region(dev, &s->iomem); s->chr = qdev_init_chardev(&dev->qdev); if (s->chr) {