[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/14] syborg_interrupt: convert to memory API
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH 03/14] syborg_interrupt: convert to memory API |
Date: |
Mon, 24 Oct 2011 22:38:22 +0200 |
Signed-off-by: Benoit Canet <address@hidden>
---
hw/syborg_interrupt.c | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/hw/syborg_interrupt.c b/hw/syborg_interrupt.c
index 1b0f3bb..512910a 100644
--- a/hw/syborg_interrupt.c
+++ b/hw/syborg_interrupt.c
@@ -55,6 +55,7 @@ typedef struct {
typedef struct {
SysBusDevice busdev;
+ MemoryRegion iomem;
int pending_count;
uint32_t num_irqs;
syborg_int_flags *flags;
@@ -84,7 +85,8 @@ static void syborg_int_set_irq(void *opaque, int irq, int
level)
}
}
-static uint32_t syborg_int_read(void *opaque, target_phys_addr_t offset)
+static uint64_t syborg_int_read(void *opaque, target_phys_addr_t offset,
+ unsigned size)
{
SyborgIntState *s = (SyborgIntState *)opaque;
int i;
@@ -114,7 +116,8 @@ static uint32_t syborg_int_read(void *opaque,
target_phys_addr_t offset)
}
}
-static void syborg_int_write(void *opaque, target_phys_addr_t offset, uint32_t
value)
+static void syborg_int_write(void *opaque, target_phys_addr_t offset,
+ uint64_t value, unsigned size)
{
SyborgIntState *s = (SyborgIntState *)opaque;
int i;
@@ -156,16 +159,10 @@ static void syborg_int_write(void *opaque,
target_phys_addr_t offset, uint32_t v
syborg_int_update(s);
}
-static CPUReadMemoryFunc * const syborg_int_readfn[] = {
- syborg_int_read,
- syborg_int_read,
- syborg_int_read
-};
-
-static CPUWriteMemoryFunc * const syborg_int_writefn[] = {
- syborg_int_write,
- syborg_int_write,
- syborg_int_write
+static const MemoryRegionOps syborg_int_ops = {
+ .read = syborg_int_read,
+ .write = syborg_int_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static void syborg_int_save(QEMUFile *f, void *opaque)
@@ -205,14 +202,12 @@ static int syborg_int_load(QEMUFile *f, void *opaque, int
version_id)
static int syborg_int_init(SysBusDevice *dev)
{
SyborgIntState *s = FROM_SYSBUS(SyborgIntState, dev);
- int iomemtype;
sysbus_init_irq(dev, &s->parent_irq);
qdev_init_gpio_in(&dev->qdev, syborg_int_set_irq, s->num_irqs);
- iomemtype = cpu_register_io_memory(syborg_int_readfn,
- syborg_int_writefn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, 0x1000, iomemtype);
+ memory_region_init_io(&s->iomem, &syborg_int_ops, s,
+ "interrupt", 0x1000);
+ sysbus_init_mmio_region(dev, &s->iomem);
s->flags = g_malloc0(s->num_irqs * sizeof(syborg_int_flags));
register_savevm(&dev->qdev, "syborg_int", -1, 1, syborg_int_save,
--
1.7.4.1
- [Qemu-devel] [PATCH 00/14] arm: more memory API and VMState conversion, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 01/14] mst_fpga: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 04/14] syborg_keyboard: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 05/14] syborg_pointer: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 02/14] syborg_fb: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 03/14] syborg_interrupt: convert to memory API,
Benoît Canet <=
- [Qemu-devel] [PATCH 07/14] syborg_serial: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 08/14] syborg_timer: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 10/14] pl181: add vmstate, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 13/14] integratorcp: convert integratorcm to VMState, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 09/14] syborg_virtio: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 14/14] integratorcp: convert icp_pic to VMState, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 12/14] realview: convert realview i2c to VMState, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 06/14] syborg_rtc: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 11/14] bitbang_i2c: convert to VMState, Benoît Canet, 2011/10/24
- Re: [Qemu-devel] [PATCH 00/14] arm: more memory API and VMState conversion, Avi Kivity, 2011/10/25