ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pxa2xx_gpio: convert to memory API 

Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Benoît Canet 2011-10-30 14:50:11 +01:00 committed by Avi Kivity
parent af687ddc61
commit 55a8b801a4
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/pxa2xx_gpio.c
View File

@ -16,6 +16,7 @@
typedef struct PXA2xxGPIOInfo PXA2xxGPIOInfo; typedef struct PXA2xxGPIOInfo PXA2xxGPIOInfo;
struct PXA2xxGPIOInfo { struct PXA2xxGPIOInfo {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion iomem;
qemu_irq irq0, irq1, irqX; qemu_irq irq0, irq1, irqX;
int lines; int lines;
int ncpu; int ncpu;
@ -137,7 +138,8 @@ static void pxa2xx_gpio_handler_update(PXA2xxGPIOInfo *s) {
} }
} }
static uint32_t pxa2xx_gpio_read(void *opaque, target_phys_addr_t offset) static uint64_t pxa2xx_gpio_read(void *opaque, target_phys_addr_t offset,
unsigned size)
{ {
PXA2xxGPIOInfo *s = (PXA2xxGPIOInfo *) opaque; PXA2xxGPIOInfo *s = (PXA2xxGPIOInfo *) opaque;
uint32_t ret; uint32_t ret;
@ -188,8 +190,8 @@ static uint32_t pxa2xx_gpio_read(void *opaque, target_phys_addr_t offset)
return 0; return 0;
} }
static void pxa2xx_gpio_write(void *opaque, static void pxa2xx_gpio_write(void *opaque, target_phys_addr_t offset,
target_phys_addr_t offset, uint32_t value) uint64_t value, unsigned size)
{ {
PXA2xxGPIOInfo *s = (PXA2xxGPIOInfo *) opaque; PXA2xxGPIOInfo *s = (PXA2xxGPIOInfo *) opaque;
int bank; int bank;
@ -240,16 +242,10 @@ static void pxa2xx_gpio_write(void *opaque,
} }
} }
static CPUReadMemoryFunc * const pxa2xx_gpio_readfn[] = { static const MemoryRegionOps pxa_gpio_ops = {
pxa2xx_gpio_read, .read = pxa2xx_gpio_read,
pxa2xx_gpio_read, .write = pxa2xx_gpio_write,
pxa2xx_gpio_read .endianness = DEVICE_NATIVE_ENDIAN,
};
static CPUWriteMemoryFunc * const pxa2xx_gpio_writefn[] = {
pxa2xx_gpio_write,
pxa2xx_gpio_write,
pxa2xx_gpio_write
}; };
DeviceState *pxa2xx_gpio_init(target_phys_addr_t base, DeviceState *pxa2xx_gpio_init(target_phys_addr_t base,
@ -275,7 +271,6 @@ DeviceState *pxa2xx_gpio_init(target_phys_addr_t base,
static int pxa2xx_gpio_initfn(SysBusDevice *dev) static int pxa2xx_gpio_initfn(SysBusDevice *dev)
{ {
int iomemtype;
PXA2xxGPIOInfo *s; PXA2xxGPIOInfo *s;
s = FROM_SYSBUS(PXA2xxGPIOInfo, dev); s = FROM_SYSBUS(PXA2xxGPIOInfo, dev);
@ -285,10 +280,8 @@ static int pxa2xx_gpio_initfn(SysBusDevice *dev)
qdev_init_gpio_in(&dev->qdev, pxa2xx_gpio_set, s->lines); qdev_init_gpio_in(&dev->qdev, pxa2xx_gpio_set, s->lines);
qdev_init_gpio_out(&dev->qdev, s->handler, s->lines); qdev_init_gpio_out(&dev->qdev, s->handler, s->lines);
iomemtype = cpu_register_io_memory(pxa2xx_gpio_readfn, memory_region_init_io(&s->iomem, &pxa_gpio_ops, s, "pxa2xx-gpio", 0x1000);
pxa2xx_gpio_writefn, s, DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->iomem);
sysbus_init_mmio(dev, 0x1000, iomemtype);
sysbus_init_irq(dev, &s->irq0); sysbus_init_irq(dev, &s->irq0);
sysbus_init_irq(dev, &s->irq1); sysbus_init_irq(dev, &s->irq1);
sysbus_init_irq(dev, &s->irqX); sysbus_init_irq(dev, &s->irqX);