ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

syborg_rtc: convert to memory API 

Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Benoît Canet 2011-10-24 22:38:25 +02:00 committed by Avi Kivity
parent 9ca9e358e2
commit 43b8c30da2
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/syborg_rtc.c
View File

@ -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;