proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-09 05:05:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rtc: Convert to isa_register_ioport

Browse Source 
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Richard Henderson 2011-08-15 15:40:21 -07:00 committed by Avi Kivity
parent 9936d6e423
commit b2c5009b45
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/mc146818rtc.c
View File

@ -81,6 +81,7 @@
typedef struct RTCState { typedef struct RTCState {
ISADevice dev; ISADevice dev;
MemoryRegion io;
uint8_t cmos_data[128]; uint8_t cmos_data[128];
uint8_t cmos_index; uint8_t cmos_index;
struct tm current_tm; struct tm current_tm;
@ -604,6 +605,15 @@ static void rtc_reset(void *opaque)
#endif #endif
} }
static const MemoryRegionPortio cmos_portio[] = {
{0, 2, 1, .read = cmos_ioport_read, .write = cmos_ioport_write },
PORTIO_END_OF_LIST(),
};
static const MemoryRegionOps cmos_ops = {
.old_portio = cmos_portio
};
static int rtc_initfn(ISADevice *dev) static int rtc_initfn(ISADevice *dev)
{ {
RTCState *s = DO_UPCAST(RTCState, dev, dev); RTCState *s = DO_UPCAST(RTCState, dev, dev);
@ -632,9 +642,8 @@ static int rtc_initfn(ISADevice *dev)
qemu_get_clock_ns(rtc_clock) + (get_ticks_per_sec() * 99) / 100; qemu_get_clock_ns(rtc_clock) + (get_ticks_per_sec() * 99) / 100;
qemu_mod_timer(s->second_timer2, s->next_second_time); qemu_mod_timer(s->second_timer2, s->next_second_time);
register_ioport_write(base, 2, 1, cmos_ioport_write, s); memory_region_init_io(&s->io, &cmos_ops, s, "rtc", 2);
register_ioport_read(base, 2, 1, cmos_ioport_read, s); isa_register_ioport(dev, &s->io, base);
isa_init_ioport_range(dev, base, 2);
qdev_set_legacy_instance_id(&dev->qdev, base, 2); qdev_set_legacy_instance_id(&dev->qdev, base, 2);
qemu_register_reset(rtc_reset, s); qemu_register_reset(rtc_reset, s);