[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/11] syborg_timer: convert to memory API
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH 10/11] syborg_timer: convert to memory API |
Date: |
Tue, 25 Oct 2011 12:32:43 +0200 |
Signed-off-by: Benoit Canet <address@hidden>
---
hw/syborg_timer.c | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/hw/syborg_timer.c b/hw/syborg_timer.c
index 50c813e..dfee457 100644
--- a/hw/syborg_timer.c
+++ b/hw/syborg_timer.c
@@ -53,6 +53,7 @@ enum {
typedef struct {
SysBusDevice busdev;
+ MemoryRegion iomem;
ptimer_state *timer;
int running;
int oneshot;
@@ -83,7 +84,8 @@ static void syborg_timer_tick(void *opaque)
syborg_timer_update(s);
}
-static uint32_t syborg_timer_read(void *opaque, target_phys_addr_t offset)
+static uint64_t syborg_timer_read(void *opaque, target_phys_addr_t offset,
+ unsigned size)
{
SyborgTimerState *s = (SyborgTimerState *)opaque;
@@ -114,7 +116,7 @@ static uint32_t syborg_timer_read(void *opaque,
target_phys_addr_t offset)
}
static void syborg_timer_write(void *opaque, target_phys_addr_t offset,
- uint32_t value)
+ uint64_t value, unsigned size)
{
SyborgTimerState *s = (SyborgTimerState *)opaque;
@@ -162,16 +164,10 @@ static void syborg_timer_write(void *opaque,
target_phys_addr_t offset,
}
}
-static CPUReadMemoryFunc * const syborg_timer_readfn[] = {
- syborg_timer_read,
- syborg_timer_read,
- syborg_timer_read
-};
-
-static CPUWriteMemoryFunc * const syborg_timer_writefn[] = {
- syborg_timer_write,
- syborg_timer_write,
- syborg_timer_write
+static const MemoryRegionOps syborg_timer_ops = {
+ .read = syborg_timer_read,
+ .write = syborg_timer_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static const VMStateDescription vmstate_syborg_timer = {
@@ -194,17 +190,14 @@ static int syborg_timer_init(SysBusDevice *dev)
{
SyborgTimerState *s = FROM_SYSBUS(SyborgTimerState, dev);
QEMUBH *bh;
- int iomemtype;
if (s->freq == 0) {
fprintf(stderr, "syborg_timer: Zero/unset frequency\n");
exit(1);
}
sysbus_init_irq(dev, &s->irq);
- iomemtype = cpu_register_io_memory(syborg_timer_readfn,
- syborg_timer_writefn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, 0x1000, iomemtype);
+ memory_region_init_io(&s->iomem, &syborg_timer_ops, s, "timer", 0x1000);
+ sysbus_init_mmio_region(dev, &s->iomem);
bh = qemu_bh_new(syborg_timer_tick, s);
s->timer = ptimer_init(bh);
--
1.7.5.4
- [Qemu-devel] [PATCH 00/11] V3 arm memory API conversion, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 01/11] integratorcp: convert control to sysbus, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 02/11] marvell_88x8618_audio: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 03/11] mst_fpga: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 04/11] syborg_fb: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 05/11] syborg_interrupt: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 06/11] syborg_keyboard: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 07/11] syborg_pointer: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 10/11] syborg_timer: convert to memory API,
Benoît Canet <=
- [Qemu-devel] [PATCH 11/11] syborg_virtio: convert to memory API, Benoît Canet, 2011/10/25
- Re: [Qemu-devel] [PATCH 00/11] V3 arm memory API conversion, Avi Kivity, 2011/10/25
- [Qemu-devel] [PATCH 09/11] syborg_serial: convert to memory API, Benoît Canet, 2011/10/25
- [Qemu-devel] [PATCH 08/11] syborg_rtc: convert to memory API, Benoît Canet, 2011/10/25