[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/17] pl031: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 11/17] pl031: convert to memory API |
Date: |
Sun, 30 Oct 2011 16:33:48 +0200 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/pl031.c | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/hw/pl031.c b/hw/pl031.c
index 017a313..4ff96f9 100644
--- a/hw/pl031.c
+++ b/hw/pl031.c
@@ -32,6 +32,7 @@
typedef struct {
SysBusDevice busdev;
+ MemoryRegion iomem;
QEMUTimer *timer;
qemu_irq irq;
@@ -105,7 +106,8 @@ static void pl031_set_alarm(pl031_state *s)
}
}
-static uint32_t pl031_read(void *opaque, target_phys_addr_t offset)
+static uint64_t pl031_read(void *opaque, target_phys_addr_t offset,
+ unsigned size)
{
pl031_state *s = (pl031_state *)opaque;
@@ -141,7 +143,7 @@ static uint32_t pl031_read(void *opaque, target_phys_addr_t
offset)
}
static void pl031_write(void * opaque, target_phys_addr_t offset,
- uint32_t value)
+ uint64_t value, unsigned size)
{
pl031_state *s = (pl031_state *)opaque;
@@ -186,31 +188,19 @@ static void pl031_write(void * opaque, target_phys_addr_t
offset,
}
}
-static CPUWriteMemoryFunc * const pl031_writefn[] = {
- pl031_write,
- pl031_write,
- pl031_write
-};
-
-static CPUReadMemoryFunc * const pl031_readfn[] = {
- pl031_read,
- pl031_read,
- pl031_read
+static const MemoryRegionOps pl031_ops = {
+ .read = pl031_read,
+ .write = pl031_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static int pl031_init(SysBusDevice *dev)
{
- int iomemtype;
pl031_state *s = FROM_SYSBUS(pl031_state, dev);
struct tm tm;
- iomemtype = cpu_register_io_memory(pl031_readfn, pl031_writefn, s,
- DEVICE_NATIVE_ENDIAN);
- if (iomemtype == -1) {
- hw_error("pl031_init: Can't register I/O memory\n");
- }
-
- sysbus_init_mmio(dev, 0x1000, iomemtype);
+ memory_region_init_io(&s->iomem, &pl031_ops, s, "pl031", 0x1000);
+ sysbus_init_mmio_region(dev, &s->iomem);
sysbus_init_irq(dev, &s->irq);
/* ??? We assume vm_clock is zero at this point. */
--
1.7.6.3
- [Qemu-devel] [PATCH 01/17] tosa: convert to memory API, (continued)
- [Qemu-devel] [PATCH 01/17] tosa: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 02/17] versatilepb: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 07/17] parallel: convert to memory API, Avi Kivity, 2011/10/30
- [Qemu-devel] [PATCH 05/17] shix: convert to memory API, Avi Kivity, 2011/10/30
- [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 <=
- [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, 2011/10/30
- [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