[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/15] syborg_rtc: convert to memory API
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH 07/15] syborg_rtc: convert to memory API |
Date: |
Mon, 24 Oct 2011 23:03:33 +0200 |
Signed-off-by: Benoit Canet <address@hidden>
---
hw/syborg_rtc.c | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/hw/syborg_rtc.c b/hw/syborg_rtc.c
index 69f6ccf..375664f 100644
--- a/hw/syborg_rtc.c
+++ b/hw/syborg_rtc.c
@@ -35,12 +35,14 @@ enum {
typedef struct {
SysBusDevice busdev;
+ MemoryRegion iomem;
int64_t offset;
int64_t data;
qemu_irq irq;
} SyborgRTCState;
-static uint32_t syborg_rtc_read(void *opaque, target_phys_addr_t offset)
+static uint64_t syborg_rtc_read(void *opaque, target_phys_addr_t offset,
+ unsigned size)
{
SyborgRTCState *s = (SyborgRTCState *)opaque;
offset &= 0xfff;
@@ -58,7 +60,8 @@ static uint32_t syborg_rtc_read(void *opaque,
target_phys_addr_t offset)
}
}
-static void syborg_rtc_write(void *opaque, target_phys_addr_t offset, uint32_t
value)
+static void syborg_rtc_write(void *opaque, target_phys_addr_t offset,
+ uint64_t value, unsigned size)
{
SyborgRTCState *s = (SyborgRTCState *)opaque;
uint64_t now;
@@ -90,16 +93,10 @@ static void syborg_rtc_write(void *opaque,
target_phys_addr_t offset, uint32_t v
}
}
-static CPUReadMemoryFunc * const syborg_rtc_readfn[] = {
- syborg_rtc_read,
- syborg_rtc_read,
- syborg_rtc_read
-};
-
-static CPUWriteMemoryFunc * const syborg_rtc_writefn[] = {
- syborg_rtc_write,
- syborg_rtc_write,
- syborg_rtc_write
+static const MemoryRegionOps syborg_rtc_ops = {
+ .read = syborg_rtc_read,
+ .write = syborg_rtc_write,
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static const VMStateDescription vmstate_syborg_rtc = {
@@ -118,12 +115,9 @@ static int syborg_rtc_init(SysBusDevice *dev)
{
SyborgRTCState *s = FROM_SYSBUS(SyborgRTCState, dev);
struct tm tm;
- int iomemtype;
- iomemtype = cpu_register_io_memory(syborg_rtc_readfn,
- syborg_rtc_writefn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, 0x1000, iomemtype);
+ memory_region_init_io(&s->iomem, &syborg_rtc_ops, s, "rtc", 0x1000);
+ sysbus_init_mmio_region(dev, &s->iomem);
qemu_get_timedate(&tm, 0);
s->offset = (uint64_t)mktime(&tm) * 1000000000;
--
1.7.4.1
- [Qemu-devel] [PATCH 02/15] mst_fpga: convert to memory API, (continued)
- [Qemu-devel] [PATCH 02/15] mst_fpga: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 04/15] syborg_interrupt: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 03/15] syborg_fb: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 05/15] syborg_keyboard: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 06/15] syborg_pointer: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 08/15] syborg_serial: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 10/15] syborg_virtio: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 11/15] pl181: add vmstate, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 14/15] integratorcp: convert integratorcm to VMState, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 15/15] integratorcp: convert icp_pic to VMState, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 07/15] syborg_rtc: convert to memory API,
Benoît Canet <=
- [Qemu-devel] [PATCH 09/15] syborg_timer: convert to memory API, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 13/15] realview: convert realview i2c to VMState, Benoît Canet, 2011/10/24
- [Qemu-devel] [PATCH 12/15] bitbang_i2c: convert to VMState, Benoît Canet, 2011/10/24