From patchwork Thu Aug 11 11:47:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 109597 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 CA19CB6F82 for ; Thu, 11 Aug 2011 21:48:32 +1000 (EST) Received: from localhost ([::1]:40901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrTkU-00086b-2K for incoming@patchwork.ozlabs.org; Thu, 11 Aug 2011 07:48:30 -0400 Received: from eggs.gnu.org ([140.186.70.92]:45006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrTjy-0006yS-U5 for qemu-devel@nongnu.org; Thu, 11 Aug 2011 07:48:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrTju-0007UM-Nz for qemu-devel@nongnu.org; Thu, 11 Aug 2011 07:47:58 -0400 Received: from mail-fx0-f45.google.com ([209.85.161.45]:51798) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrTju-0007T2-HK for qemu-devel@nongnu.org; Thu, 11 Aug 2011 07:47:54 -0400 Received: by mail-fx0-f45.google.com with SMTP id b27so1841923fxb.4 for ; Thu, 11 Aug 2011 04:47:54 -0700 (PDT) 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; bh=zsnzxuCjs3pR0Vr50tAOIE/oMbGd8JKAk8uZ/kmhXTw=; b=c9Mm0znG/x8KTIZdkxpD+afr3x9qzgPqqIoiGzgELGLtBFLipjJDZmDjqER9fexPqs QRiC49ErKc7Me5pNHZ2fDz3xVcdKOgqhoPQL31RoGwu0ALXfj9GtQo2Iq0bfOGyTKqgq 6hl+ZQ1pmTy1pqk7leg9SAzpM816kPMEWJMPE= Received: by 10.223.75.194 with SMTP id z2mr3159552faj.89.1313063273995; Thu, 11 Aug 2011 04:47:53 -0700 (PDT) Received: from localhost (h59ec324b.selukar.dyn.perspektivbredband.net [89.236.50.75]) by mx.google.com with ESMTPS id g16sm785744faa.27.2011.08.11.04.47.52 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Aug 2011 04:47:52 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Date: Thu, 11 Aug 2011 13:47:45 +0200 Message-Id: <1313063268-4208-2-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1313063268-4208-1-git-send-email-edgar.iglesias@gmail.com> References: <1313063268-4208-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.45 Cc: "Edgar E. Iglesias" , avi@redhat.com, edgar@axis.com Subject: [Qemu-devel] [PATCH 2/5] etrax-ser: Convert to MemoryRegion 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 From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- hw/etraxfs_ser.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/hw/etraxfs_ser.c b/hw/etraxfs_ser.c index 28b86ea..f862231 100644 --- a/hw/etraxfs_ser.c +++ b/hw/etraxfs_ser.c @@ -47,6 +47,7 @@ struct etrax_serial { SysBusDevice busdev; + MemoryRegion mmio; CharDriverState *chr; qemu_irq irq; @@ -73,7 +74,8 @@ static void ser_update_irq(struct etrax_serial *s) qemu_set_irq(s->irq, !!s->regs[R_MASKED_INTR]); } -static uint32_t ser_readl (void *opaque, target_phys_addr_t addr) +static uint64_t +ser_read(void *opaque, target_phys_addr_t addr, unsigned int size) { struct etrax_serial *s = opaque; D(CPUState *env = s->env); @@ -108,10 +110,12 @@ static uint32_t ser_readl (void *opaque, target_phys_addr_t addr) } static void -ser_writel (void *opaque, target_phys_addr_t addr, uint32_t value) +ser_write(void *opaque, target_phys_addr_t addr, + uint64_t val64, unsigned int size) { struct etrax_serial *s = opaque; - unsigned char ch = value; + uint32_t value = val64; + unsigned char ch = val64; D(CPUState *env = s->env); D(qemu_log("%s " TARGET_FMT_plx "=%x\n", __func__, addr, value)); @@ -142,14 +146,14 @@ ser_writel (void *opaque, target_phys_addr_t addr, uint32_t value) ser_update_irq(s); } -static CPUReadMemoryFunc * const ser_read[] = { - NULL, NULL, - &ser_readl, -}; - -static CPUWriteMemoryFunc * const ser_write[] = { - NULL, NULL, - &ser_writel, +static const MemoryRegionOps ser_ops = { + .read = ser_read, + .write = ser_write, + .endianness = DEVICE_NATIVE_ENDIAN, + .valid = { + .min_access_size = 4, + .max_access_size = 4 + } }; static void serial_receive(void *opaque, const uint8_t *buf, int size) @@ -207,12 +211,11 @@ static void etraxfs_ser_reset(DeviceState *d) static int etraxfs_ser_init(SysBusDevice *dev) { struct etrax_serial *s = FROM_SYSBUS(typeof (*s), dev); - int ser_regs; sysbus_init_irq(dev, &s->irq); - ser_regs = cpu_register_io_memory(ser_read, ser_write, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, R_MAX * 4, ser_regs); + memory_region_init_io(&s->mmio, &ser_ops, s, "etraxfs-serial", R_MAX * 4); + sysbus_init_mmio_region(dev, &s->mmio); + s->chr = qdev_init_chardev(&dev->qdev); if (s->chr) qemu_chr_add_handlers(s->chr,