OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pl011: convert to memory API

Browse Source 
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-10-10 17:08:49 +02:00
parent e71ceafc7d
commit 4848475794
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/pl011.c
View File

@ -12,6 +12,7 @@
typedef struct { typedef struct {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion iomem;
uint32_t readbuff; uint32_t readbuff;
uint32_t flags; uint32_t flags;
uint32_t lcr; uint32_t lcr;
@ -53,7 +54,8 @@ static void pl011_update(pl011_state *s)
qemu_set_irq(s->irq, flags != 0); qemu_set_irq(s->irq, flags != 0);
} }
static uint32_t pl011_read(void *opaque, target_phys_addr_t offset) static uint64_t pl011_read(void *opaque, target_phys_addr_t offset,
unsigned size)
{ {
pl011_state *s = (pl011_state *)opaque; pl011_state *s = (pl011_state *)opaque;
uint32_t c; uint32_t c;
@ -123,7 +125,7 @@ static void pl011_set_read_trigger(pl011_state *s)
} }
static void pl011_write(void *opaque, target_phys_addr_t offset, static void pl011_write(void *opaque, target_phys_addr_t offset,
uint32_t value) uint64_t value, unsigned size)
{ {
pl011_state *s = (pl011_state *)opaque; pl011_state *s = (pl011_state *)opaque;
unsigned char ch; unsigned char ch;
@ -223,16 +225,10 @@ static void pl011_event(void *opaque, int event)
pl011_put_fifo(opaque, 0x400); pl011_put_fifo(opaque, 0x400);
} }
static CPUReadMemoryFunc * const pl011_readfn[] = { static const MemoryRegionOps pl011_ops = {
pl011_read, .read = pl011_read,
pl011_read, .write = pl011_write,
pl011_read .endianness = DEVICE_NATIVE_ENDIAN,
};
static CPUWriteMemoryFunc * const pl011_writefn[] = {
pl011_write,
pl011_write,
pl011_write
}; };
static const VMStateDescription vmstate_pl011 = { static const VMStateDescription vmstate_pl011 = {
@ -262,13 +258,10 @@ static const VMStateDescription vmstate_pl011 = {
static int pl011_init(SysBusDevice *dev, const unsigned char *id) static int pl011_init(SysBusDevice *dev, const unsigned char *id)
{ {
int iomemtype;
pl011_state *s = FROM_SYSBUS(pl011_state, dev); pl011_state *s = FROM_SYSBUS(pl011_state, dev);
iomemtype = cpu_register_io_memory(pl011_readfn, memory_region_init_io(&s->iomem, &pl011_ops, s, "pl011", 0x1000);
pl011_writefn, s, sysbus_init_mmio_region(dev, &s->iomem);
DEVICE_NATIVE_ENDIAN);
sysbus_init_mmio(dev, 0x1000,iomemtype);
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
s->id = id; s->id = id;
s->chr = qdev_init_chardev(&dev->qdev); s->chr = qdev_init_chardev(&dev->qdev);