diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-15 14:57:13 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-15 15:23:34 +0100 |
commit | d2af524a18dae38691cd13e1aa70d133e9c645b7 (patch) | |
tree | 834b45a02784f5d29d759df4dece643e3144b8fe /hw/sh4 | |
parent | 519655e62590f8eaed1a17d159b70be24d74967e (diff) | |
download | qemu-d2af524a18dae38691cd13e1aa70d133e9c645b7.zip qemu-d2af524a18dae38691cd13e1aa70d133e9c645b7.tar.gz qemu-d2af524a18dae38691cd13e1aa70d133e9c645b7.tar.bz2 |
hw/sh/sh7750: Convert away from old_mmio
Convert the sh7750 device away from using the old_mmio field
of MemoryRegionOps. This device is used by the sh4 r2d board.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180601141223.26630-2-peter.maydell@linaro.org
Diffstat (limited to 'hw/sh4')
-rw-r--r-- | hw/sh4/sh7750.c | 44 |
1 files changed, 36 insertions, 8 deletions
diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 2dc07a9..2fb6e61 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -450,15 +450,43 @@ static void sh7750_mem_writel(void *opaque, hwaddr addr, } } +static uint64_t sh7750_mem_readfn(void *opaque, hwaddr addr, unsigned size) +{ + switch (size) { + case 1: + return sh7750_mem_readb(opaque, addr); + case 2: + return sh7750_mem_readw(opaque, addr); + case 4: + return sh7750_mem_readl(opaque, addr); + default: + g_assert_not_reached(); + } +} + +static void sh7750_mem_writefn(void *opaque, hwaddr addr, + uint64_t value, unsigned size) +{ + switch (size) { + case 1: + sh7750_mem_writeb(opaque, addr, value); + break; + case 2: + sh7750_mem_writew(opaque, addr, value); + break; + case 4: + sh7750_mem_writel(opaque, addr, value); + break; + default: + g_assert_not_reached(); + } +} + static const MemoryRegionOps sh7750_mem_ops = { - .old_mmio = { - .read = {sh7750_mem_readb, - sh7750_mem_readw, - sh7750_mem_readl }, - .write = {sh7750_mem_writeb, - sh7750_mem_writew, - sh7750_mem_writel }, - }, + .read = sh7750_mem_readfn, + .write = sh7750_mem_writefn, + .valid.min_access_size = 1, + .valid.max_access_size = 4, .endianness = DEVICE_NATIVE_ENDIAN, }; |