From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vul53-0006Dd-QT for qemu-devel@nongnu.org; Sun, 22 Dec 2013 10:36:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vul4y-0003FJ-9a for qemu-devel@nongnu.org; Sun, 22 Dec 2013 10:36:37 -0500 Received: from smtp5-g21.free.fr ([2a01:e0c:1:1599::14]:39268) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vul4x-0003Ez-LM for qemu-devel@nongnu.org; Sun, 22 Dec 2013 10:36:32 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 22 Dec 2013 16:37:27 +0100 Message-Id: <1387726650-8306-5-git-send-email-hpoussin@reactos.org> In-Reply-To: <1387726650-8306-1-git-send-email-hpoussin@reactos.org> References: <1387726650-8306-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 4/7] rc4030: do not use old_mmio accesses List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno Signed-off-by: Herv=C3=A9 Poussineau --- hw/dma/rc4030.c | 112 ++++++++-----------------------------------------= ------ 1 file changed, 16 insertions(+), 96 deletions(-) diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index 97214de..432a4e4 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -120,7 +120,7 @@ static void set_next_tick(rc4030State *s) } =20 /* called for accesses to rc4030 */ -static uint32_t rc4030_readl(void *opaque, hwaddr addr) +static uint64_t rc4030_read(void *opaque, hwaddr addr, unsigned int size= ) { rc4030State *s =3D opaque; uint32_t val; @@ -258,21 +258,6 @@ static uint32_t rc4030_readl(void *opaque, hwaddr ad= dr) return val; } =20 -static uint32_t rc4030_readw(void *opaque, hwaddr addr) -{ - uint32_t v =3D rc4030_readl(opaque, addr & ~0x3); - if (addr & 0x2) - return v >> 16; - else - return v & 0xffff; -} - -static uint32_t rc4030_readb(void *opaque, hwaddr addr) -{ - uint32_t v =3D rc4030_readl(opaque, addr & ~0x3); - return (v >> (8 * (addr & 0x3))) & 0xff; -} - static void rc4030_dma_as_update_one(rc4030State *s, int index, uint32_t new_frame) { @@ -358,10 +343,11 @@ static void rc4030_dma_table_update(rc4030State *s,= uint32_t new_tl_base, } } =20 - -static void rc4030_writel(void *opaque, hwaddr addr, uint32_t val) +static void rc4030_write(void *opaque, hwaddr addr, uint64_t data, + unsigned int size) { rc4030State *s =3D opaque; + uint32_t val =3D data; addr &=3D 0x3fff; =20 DPRINTF("write 0x%02x at " TARGET_FMT_plx "\n", val, addr); @@ -484,43 +470,11 @@ static void rc4030_writel(void *opaque, hwaddr addr= , uint32_t val) } } =20 -static void rc4030_writew(void *opaque, hwaddr addr, uint32_t val) -{ - uint32_t old_val =3D rc4030_readl(opaque, addr & ~0x3); - - if (addr & 0x2) - val =3D (val << 16) | (old_val & 0x0000ffff); - else - val =3D val | (old_val & 0xffff0000); - rc4030_writel(opaque, addr & ~0x3, val); -} - -static void rc4030_writeb(void *opaque, hwaddr addr, uint32_t val) -{ - uint32_t old_val =3D rc4030_readl(opaque, addr & ~0x3); - - switch (addr & 3) { - case 0: - val =3D val | (old_val & 0xffffff00); - break; - case 1: - val =3D (val << 8) | (old_val & 0xffff00ff); - break; - case 2: - val =3D (val << 16) | (old_val & 0xff00ffff); - break; - case 3: - val =3D (val << 24) | (old_val & 0x00ffffff); - break; - } - rc4030_writel(opaque, addr & ~0x3, val); -} - static const MemoryRegionOps rc4030_ops =3D { - .old_mmio =3D { - .read =3D { rc4030_readb, rc4030_readw, rc4030_readl, }, - .write =3D { rc4030_writeb, rc4030_writew, rc4030_writel, }, - }, + .read =3D rc4030_read, + .write =3D rc4030_write, + .impl.min_access_size =3D 4, + .impl.max_access_size =3D 4, .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 @@ -573,7 +527,7 @@ static void rc4030_periodic_timer(void *opaque) qemu_irq_raise(s->timer_irq); } =20 -static uint32_t jazzio_readw(void *opaque, hwaddr addr) +static uint64_t jazzio_read(void *opaque, hwaddr addr, unsigned int size= ) { rc4030State *s =3D opaque; uint32_t val; @@ -611,24 +565,11 @@ static uint32_t jazzio_readw(void *opaque, hwaddr a= ddr) return val; } =20 -static uint32_t jazzio_readb(void *opaque, hwaddr addr) -{ - uint32_t v; - v =3D jazzio_readw(opaque, addr & ~0x1); - return (v >> (8 * (addr & 0x1))) & 0xff; -} - -static uint32_t jazzio_readl(void *opaque, hwaddr addr) -{ - uint32_t v; - v =3D jazzio_readw(opaque, addr); - v |=3D jazzio_readw(opaque, addr + 2) << 16; - return v; -} - -static void jazzio_writew(void *opaque, hwaddr addr, uint32_t val) +static void jazzio_write(void *opaque, hwaddr addr, uint64_t data, + unsigned int size) { rc4030State *s =3D opaque; + uint32_t val =3D data; addr &=3D 0xfff; =20 DPRINTF("(jazz io controller) write 0x%04x at " TARGET_FMT_plx "\n",= val, addr); @@ -645,32 +586,11 @@ static void jazzio_writew(void *opaque, hwaddr addr= , uint32_t val) } } =20 -static void jazzio_writeb(void *opaque, hwaddr addr, uint32_t val) -{ - uint32_t old_val =3D jazzio_readw(opaque, addr & ~0x1); - - switch (addr & 1) { - case 0: - val =3D val | (old_val & 0xff00); - break; - case 1: - val =3D (val << 8) | (old_val & 0x00ff); - break; - } - jazzio_writew(opaque, addr & ~0x1, val); -} - -static void jazzio_writel(void *opaque, hwaddr addr, uint32_t val) -{ - jazzio_writew(opaque, addr, val & 0xffff); - jazzio_writew(opaque, addr + 2, (val >> 16) & 0xffff); -} - static const MemoryRegionOps jazzio_ops =3D { - .old_mmio =3D { - .read =3D { jazzio_readb, jazzio_readw, jazzio_readl, }, - .write =3D { jazzio_writeb, jazzio_writew, jazzio_writel, }, - }, + .read =3D jazzio_read, + .write =3D jazzio_write, + .impl.min_access_size =3D 2, + .impl.max_access_size =3D 2, .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 --=20 1.7.10.4