[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/17] pl110: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 15/17] pl110: convert to memory API |
Date: |
Sun, 30 Oct 2011 16:33:52 +0200 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/pl110.c | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/hw/pl110.c b/hw/pl110.c
index 4ac710a..fbbcb2e 100644
--- a/hw/pl110.c
+++ b/hw/pl110.c
@@ -40,6 +40,7 @@ enum pl110_version
typedef struct {
SysBusDevice busdev;
+ MemoryRegion iomem;
DisplayState *ds;
int version;
@@ -301,7 +302,8 @@ static void pl110_update(pl110_state *s)
/* TODO: Implement interrupts. */
}
-static uint32_t pl110_read(void *opaque, target_phys_addr_t offset)
+static uint64_t pl110_read(void *opaque, target_phys_addr_t offset,
+ unsigned size)
{
pl110_state *s = (pl110_state *)opaque;
@@ -350,7 +352,7 @@ static uint32_t pl110_read(void *opaque, target_phys_addr_t
offset)
}
static void pl110_write(void *opaque, target_phys_addr_t offset,
- uint32_t val)
+ uint64_t val, unsigned size)
{
pl110_state *s = (pl110_state *)opaque;
int n;
@@ -416,16 +418,10 @@ static void pl110_write(void *opaque, target_phys_addr_t
offset,
}
}
-static CPUReadMemoryFunc * const pl110_readfn[] = {
- pl110_read,
- pl110_read,
- pl110_read
-};
-
-static CPUWriteMemoryFunc * const pl110_writefn[] = {
- pl110_write,
- pl110_write,
- pl110_write
+static const MemoryRegionOps pl110_ops = {
+ .read = pl110_read,
+ .write = pl110_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static void pl110_mux_ctrl_set(void *opaque, int line, int level)
@@ -437,12 +433,9 @@ static void pl110_mux_ctrl_set(void *opaque, int line, int
level)
static int pl110_init(SysBusDevice *dev)
{
pl110_state *s = FROM_SYSBUS(pl110_state, dev);
- int iomemtype;
- iomemtype = cpu_register_io_memory(pl110_readfn,
- pl110_writefn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, 0x1000, iomemtype);
+ memory_region_init_io(&s->iomem, &pl110_ops, s, "pl110", 0x1000);
+ sysbus_init_mmio_region(dev, &s->iomem);
sysbus_init_irq(dev, &s->irq);
qdev_init_gpio_in(&s->busdev.qdev, pl110_mux_ctrl_set, 1);
s->ds = graphic_console_init(pl110_update_display,
--
1.7.6.3
- [Qemu-devel] [PATCH 08/17] zaurus: convert to memory API, (continued)
- [Qemu-devel] [PATCH 08/17] zaurus: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 09/17] pl011: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 12/17] pl050: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 03/17] vexpress: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 04/17] virtex_ml507: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 06/17] jazz_led: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 11/17] pl031: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 10/17] pl022: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 16/17] pl181: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 17/17] pl190: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 15/17] pl110: convert to memory API,
Avi Kivity <=
- [Qemu-devel] [PATCH 13/17] pl061: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 14/17] pl080: convert to memory API, Avi Kivity, 2011/10/30