diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-16 17:46:13 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-21 16:34:27 +0100 |
commit | 7b675f1f971ba8a65711e38c2a2faac4244899c1 (patch) | |
tree | 9e415be1a92465c17e7ca6e7c335dcfb510d58f6 /hw/arm/palm.c | |
parent | 4ce31af4aeb8471f6a913de7c59d3bde1fc4f03d (diff) | |
download | qemu-7b675f1f971ba8a65711e38c2a2faac4244899c1.zip qemu-7b675f1f971ba8a65711e38c2a2faac4244899c1.tar.gz qemu-7b675f1f971ba8a65711e38c2a2faac4244899c1.tar.bz2 |
hw/arm/palm.c: Don't use old_mmio for static_ops
Update the static_ops functions to use new-style mmio
rather than the legacy old_mmio functions.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 1505580378-9044-2-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw/arm/palm.c')
-rw-r--r-- | hw/arm/palm.c | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/hw/arm/palm.c b/hw/arm/palm.c index b8753e2..a1f55d7 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -31,26 +31,16 @@ #include "exec/address-spaces.h" #include "cpu.h" -static uint32_t static_readb(void *opaque, hwaddr offset) +static uint64_t static_read(void *opaque, hwaddr offset, unsigned size) { - uint32_t *val = (uint32_t *) opaque; - return *val >> ((offset & 3) << 3); -} + uint32_t *val = (uint32_t *)opaque; + uint32_t sizemask = 7 >> size; -static uint32_t static_readh(void *opaque, hwaddr offset) -{ - uint32_t *val = (uint32_t *) opaque; - return *val >> ((offset & 1) << 3); -} - -static uint32_t static_readw(void *opaque, hwaddr offset) -{ - uint32_t *val = (uint32_t *) opaque; - return *val >> ((offset & 0) << 3); + return *val >> ((offset & sizemask) << 3); } -static void static_write(void *opaque, hwaddr offset, - uint32_t value) +static void static_write(void *opaque, hwaddr offset, uint64_t value, + unsigned size) { #ifdef SPY printf("%s: value %08lx written at " PA_FMT "\n", @@ -59,10 +49,10 @@ static void static_write(void *opaque, hwaddr offset, } static const MemoryRegionOps static_ops = { - .old_mmio = { - .read = { static_readb, static_readh, static_readw, }, - .write = { static_write, static_write, static_write, }, - }, + .read = static_read, + .write = static_write, + .valid.min_access_size = 1, + .valid.max_access_size = 4, .endianness = DEVICE_NATIVE_ENDIAN, }; |