mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/gpio/omap_gpio.c: Don't use old_mmio

Browse Source 
Drop the use of old_mmio in the omap2_gpio memory ops.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 1505580378-9044-3-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2017-09-16 17:46:14 +01:00
parent 7b675f1f97
commit 940caf1f7e
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/gpio/omap_gpio.c
View File

@ -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); return omap2_gpio_module_read(opaque, addr & ~3) >> ((addr & 3) << 3);
} }
static void omap2_gpio_module_writep(void *opaque, hwaddr addr, static void omap2_gpio_module_writep(void *opaque, hwaddr addr,
uint32_t value) uint64_t value, unsigned size)
{ {
uint32_t cur = 0; uint32_t cur = 0;
uint32_t mask = 0xffff; uint32_t mask = 0xffff;
if (size == 4) {
omap2_gpio_module_write(opaque, addr, value);
return;
}
switch (addr & ~3) { switch (addr & ~3) {
case 0x00: /* GPIO_REVISION */ case 0x00: /* GPIO_REVISION */
case 0x14: /* GPIO_SYSSTATUS */ 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 = { static const MemoryRegionOps omap2_gpio_module_ops = {
.old_mmio = { .read = omap2_gpio_module_readp,
.read = { .write = omap2_gpio_module_writep,
omap2_gpio_module_readp, .valid.min_access_size = 1,
omap2_gpio_module_readp, .valid.max_access_size = 4,
omap2_gpio_module_read,
},
.write = {
omap2_gpio_module_writep,
omap2_gpio_module_writep,
omap2_gpio_module_write,
},
},
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };