Re: [Qemu-devel] [PATCH 2/6] hw/gpio/omap_gpio.c: Don't use old_mmio

[Richard Henderson]

On 09/16/2017 11:46 AM, Peter Maydell wrote:
> Drop the use of old_mmio in the omap2_gpio memory ops.
> 
> Signed-off-by: Peter Maydell 
> ---
>  hw/gpio/omap_gpio.c | 26 --
>  1 file changed, 12 insertions(+), 14 deletions(-)

Reviewed-by: Richard Henderson 

r~

[Qemu-devel] [PATCH 2/6] hw/gpio/omap_gpio.c: Don't use old_mmio

[Peter Maydell]

Drop the use of old_mmio in the omap2_gpio memory ops.

Signed-off-by: Peter Maydell 
---
 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 = 0x;
 
+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