[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/17] pl022: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 10/17] pl022: convert to memory API |
Date: |
Sun, 30 Oct 2011 16:33:47 +0200 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/pl022.c | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/hw/pl022.c b/hw/pl022.c
index 9a1cb71..e0cf2b0 100644
--- a/hw/pl022.c
+++ b/hw/pl022.c
@@ -42,6 +42,7 @@
typedef struct {
SysBusDevice busdev;
+ MemoryRegion iomem;
uint32_t cr0;
uint32_t cr1;
uint32_t bitmask;
@@ -130,7 +131,8 @@ static void pl022_xfer(pl022_state *s)
pl022_update(s);
}
-static uint32_t pl022_read(void *opaque, target_phys_addr_t offset)
+static uint64_t pl022_read(void *opaque, target_phys_addr_t offset,
+ unsigned size)
{
pl022_state *s = (pl022_state *)opaque;
int val;
@@ -173,7 +175,7 @@ static uint32_t pl022_read(void *opaque, target_phys_addr_t
offset)
}
static void pl022_write(void *opaque, target_phys_addr_t offset,
- uint32_t value)
+ uint64_t value, unsigned size)
{
pl022_state *s = (pl022_state *)opaque;
@@ -193,7 +195,7 @@ static void pl022_write(void *opaque, target_phys_addr_t
offset,
break;
case 0x08: /* DR */
if (s->tx_fifo_len < 8) {
- DPRINTF("TX %02x\n", value);
+ DPRINTF("TX %02x\n", (unsigned)value);
s->tx_fifo[s->tx_fifo_head] = value & s->bitmask;
s->tx_fifo_head = (s->tx_fifo_head + 1) & 7;
s->tx_fifo_len++;
@@ -227,16 +229,10 @@ static void pl022_reset(pl022_state *s)
s->sr = PL022_SR_TFE | PL022_SR_TNF;
}
-static CPUReadMemoryFunc * const pl022_readfn[] = {
- pl022_read,
- pl022_read,
- pl022_read
-};
-
-static CPUWriteMemoryFunc * const pl022_writefn[] = {
- pl022_write,
- pl022_write,
- pl022_write
+static const MemoryRegionOps pl022_ops = {
+ .read = pl022_read,
+ .write = pl022_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static const VMStateDescription vmstate_pl022 = {
@@ -279,12 +275,9 @@ static void pl022_reset(pl022_state *s)
static int pl022_init(SysBusDevice *dev)
{
pl022_state *s = FROM_SYSBUS(pl022_state, dev);
- int iomemtype;
- iomemtype = cpu_register_io_memory(pl022_readfn,
- pl022_writefn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, 0x1000, iomemtype);
+ memory_region_init_io(&s->iomem, &pl022_ops, s, "pl022", 0x1000);
+ sysbus_init_mmio_region(dev, &s->iomem);
sysbus_init_irq(dev, &s->irq);
s->ssi = ssi_create_bus(&dev->qdev, "ssi");
pl022_reset(s);
--
1.7.6.3
- [Qemu-devel] [PATCH 02/17] versatilepb: convert to memory API, (continued)
- [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, 2011/10/30
- [Qemu-devel] [PATCH 10/17] pl022: convert to memory API,
Avi Kivity <=
- [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