[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 2/6] hw/gpio/omap_gpio.c: Don't use old_mmio
From: |
Peter Maydell |
Subject: |
[Qemu-arm] [PATCH 2/6] hw/gpio/omap_gpio.c: Don't use old_mmio |
Date: |
Sat, 16 Sep 2017 17:46:14 +0100 |
Drop the use of old_mmio in the omap2_gpio memory ops.
Signed-off-by: Peter Maydell <address@hidden>
---
hw/gpio/omap_gpio.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c
index 1df394e..17891e2 100644
--- a/hw/gpio/omap_gpio.c
+++ b/hw/gpio/omap_gpio.c
@@ -525,17 +525,23 @@ static void omap2_gpio_module_write(void *opaque, hwaddr
addr,
}
}
-static uint32_t omap2_gpio_module_readp(void *opaque, hwaddr addr)
+static uint64_t omap2_gpio_module_readp(void *opaque, hwaddr addr,
+ unsigned size)
{
return omap2_gpio_module_read(opaque, addr & ~3) >> ((addr & 3) << 3);
}
static void omap2_gpio_module_writep(void *opaque, hwaddr addr,
- uint32_t value)
+ uint64_t value, unsigned size)
{
uint32_t cur = 0;
uint32_t mask = 0xffff;
+ if (size == 4) {
+ omap2_gpio_module_write(opaque, addr, value);
+ return;
+ }
+
switch (addr & ~3) {
case 0x00: /* GPIO_REVISION */
case 0x14: /* GPIO_SYSSTATUS */
@@ -581,18 +587,10 @@ static void omap2_gpio_module_writep(void *opaque, hwaddr
addr,
}
static const MemoryRegionOps omap2_gpio_module_ops = {
- .old_mmio = {
- .read = {
- omap2_gpio_module_readp,
- omap2_gpio_module_readp,
- omap2_gpio_module_read,
- },
- .write = {
- omap2_gpio_module_writep,
- omap2_gpio_module_writep,
- omap2_gpio_module_write,
- },
- },
+ .read = omap2_gpio_module_readp,
+ .write = omap2_gpio_module_writep,
+ .valid.min_access_size = 1,
+ .valid.max_access_size = 4,
.endianness = DEVICE_NATIVE_ENDIAN,
};
--
2.7.4
- [Qemu-arm] [PATCH 0/6] convert some omap/palm devices from using old_mmio, Peter Maydell, 2017/09/16
- [Qemu-arm] [PATCH 6/6] hw/arm/omap2.c: Don't use old_mmio, Peter Maydell, 2017/09/16
- [Qemu-arm] [PATCH 5/6] hw/i2c/omap_i2c.c: Don't use old_mmio, Peter Maydell, 2017/09/16
- [Qemu-arm] [PATCH 3/6] hw/timer/omap_synctimer.c: Don't use old_mmio, Peter Maydell, 2017/09/16
- [Qemu-arm] [PATCH 4/6] hw/timer/omap_gptimer: Don't use old_mmio, Peter Maydell, 2017/09/16
- [Qemu-arm] [PATCH 2/6] hw/gpio/omap_gpio.c: Don't use old_mmio,
Peter Maydell <=
- [Qemu-arm] [PATCH 1/6] hw/arm/palm.c: Don't use old_mmio for static_ops, Peter Maydell, 2017/09/16
- Re: [Qemu-arm] [Qemu-devel] [PATCH 0/6] convert some omap/palm devices from using old_mmio, Mark Cave-Ayland, 2017/09/17