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

stellaris: convert gptm to memory API 

Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Benoît Canet 2011-10-17 17:28:32 +02:00 committed by Avi Kivity
parent 71a2df0557
commit 2443fa274c
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/stellaris.c
View File

@ -45,6 +45,7 @@ typedef const struct {
typedef struct gptm_state { typedef struct gptm_state {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion iomem;
uint32_t config; uint32_t config;
uint32_t mode[2]; uint32_t mode[2];
uint32_t control; uint32_t control;
@ -140,7 +141,8 @@ static void gptm_tick(void *opaque)
gptm_update_irq(s); gptm_update_irq(s);
} }
static uint32_t gptm_read(void *opaque, target_phys_addr_t offset) static uint64_t gptm_read(void *opaque, target_phys_addr_t offset,
unsigned size)
{ {
gptm_state *s = (gptm_state *)opaque; gptm_state *s = (gptm_state *)opaque;
@ -188,7 +190,8 @@ static uint32_t gptm_read(void *opaque, target_phys_addr_t offset)
} }
} }
static void gptm_write(void *opaque, target_phys_addr_t offset, uint32_t value) static void gptm_write(void *opaque, target_phys_addr_t offset,
uint64_t value, unsigned size)
{ {
gptm_state *s = (gptm_state *)opaque; gptm_state *s = (gptm_state *)opaque;
uint32_t oldval; uint32_t oldval;
@ -268,16 +271,10 @@ static void gptm_write(void *opaque, target_phys_addr_t offset, uint32_t value)
gptm_update_irq(s); gptm_update_irq(s);
} }
static CPUReadMemoryFunc * const gptm_readfn[] = { static const MemoryRegionOps gptm_ops = {
gptm_read, .read = gptm_read,
gptm_read, .write = gptm_write,
gptm_read .endianness = DEVICE_NATIVE_ENDIAN,
};
static CPUWriteMemoryFunc * const gptm_writefn[] = {
gptm_write,
gptm_write,
gptm_write
}; };
static const VMStateDescription vmstate_stellaris_gptm = { static const VMStateDescription vmstate_stellaris_gptm = {
@ -305,16 +302,14 @@ static const VMStateDescription vmstate_stellaris_gptm = {
static int stellaris_gptm_init(SysBusDevice *dev) static int stellaris_gptm_init(SysBusDevice *dev)
{ {
int iomemtype;
gptm_state *s = FROM_SYSBUS(gptm_state, dev); gptm_state *s = FROM_SYSBUS(gptm_state, dev);
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
qdev_init_gpio_out(&dev->qdev, &s->trigger, 1); qdev_init_gpio_out(&dev->qdev, &s->trigger, 1);
iomemtype = cpu_register_io_memory(gptm_readfn, memory_region_init_io(&s->iomem, &gptm_ops, s,
gptm_writefn, s, "gptm", 0x1000);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->iomem);
sysbus_init_mmio(dev, 0x1000, iomemtype);
s->opaque[0] = s->opaque[1] = s; s->opaque[0] = s->opaque[1] = s;
s->timer[0] = qemu_new_timer_ns(vm_clock, gptm_tick, &s->opaque[0]); s->timer[0] = qemu_new_timer_ns(vm_clock, gptm_tick, &s->opaque[0]);