[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] hw/m68k/mcf5206: Convert away from old_mmio
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 2/6] hw/m68k/mcf5206: Convert away from old_mmio |
Date: |
Fri, 1 Jun 2018 15:12:19 +0100 |
Convert the mcf5206 device away from using the old_mmio field
of MemoryRegionOps. This device is used by the an5206 board.
Signed-off-by: Peter Maydell <address@hidden>
---
hw/m68k/mcf5206.c | 48 +++++++++++++++++++++++++++++++++++------------
1 file changed, 36 insertions(+), 12 deletions(-)
diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index 6ad1e4bd2d..0962911837 100644
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -513,19 +513,43 @@ static void m5206_mbar_writel(void *opaque, hwaddr offset,
m5206_mbar_write(s, offset, value, 4);
}
+static uint64_t m5206_mbar_readfn(void *opaque, hwaddr addr, unsigned size)
+{
+ switch (size) {
+ case 1:
+ return m5206_mbar_readb(opaque, addr);
+ case 2:
+ return m5206_mbar_readw(opaque, addr);
+ case 4:
+ return m5206_mbar_readl(opaque, addr);
+ default:
+ g_assert_not_reached();
+ }
+}
+
+static void m5206_mbar_writefn(void *opaque, hwaddr addr,
+ uint64_t value, unsigned size)
+{
+ switch (size) {
+ case 1:
+ m5206_mbar_writeb(opaque, addr, value);
+ break;
+ case 2:
+ m5206_mbar_writew(opaque, addr, value);
+ break;
+ case 4:
+ m5206_mbar_writel(opaque, addr, value);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
+
static const MemoryRegionOps m5206_mbar_ops = {
- .old_mmio = {
- .read = {
- m5206_mbar_readb,
- m5206_mbar_readw,
- m5206_mbar_readl,
- },
- .write = {
- m5206_mbar_writeb,
- m5206_mbar_writew,
- m5206_mbar_writel,
- },
- },
+ .read = m5206_mbar_readfn,
+ .write = m5206_mbar_writefn,
+ .valid.min_access_size = 1,
+ .valid.max_access_size = 4,
.endianness = DEVICE_NATIVE_ENDIAN,
};
--
2.17.1
- Re: [Qemu-devel] [PATCH 4/6] hw/watchdog/wdt_i6300esb: Convert away from old_mmio, (continued)
- [Qemu-devel] [PATCH 6/6] hw/char/parallel: Convert away from old_mmio, Peter Maydell, 2018/06/01
- [Qemu-devel] [PATCH 5/6] hw/input/pckbd: Convert away from old_mmio, Peter Maydell, 2018/06/01
- [Qemu-devel] [PATCH 1/6] hw/sh/sh7750: Convert away from old_mmio, Peter Maydell, 2018/06/01
- [Qemu-devel] [PATCH 3/6] hw/block/pflash_cfi02: Convert away from old_mmio, Peter Maydell, 2018/06/01
- [Qemu-devel] [PATCH 2/6] hw/m68k/mcf5206: Convert away from old_mmio,
Peter Maydell <=
- Re: [Qemu-devel] [PATCH 0/6] More conversions away from old_mmio, Peter Maydell, 2018/06/11