Commit ba480fa6 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Michael S. Tsirkin
Browse files

rtc: add RTC_ISA_BASE 



Add and use RTC_ISA_BASE define instead of hardcoding 0x70.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-Id: <20200429140003.7336-7-kraxel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
parent a53e581e

hw/rtc/mc146818rtc.c

+2 −3
Original line number Diff line number Diff line
@@ -908,7 +908,6 @@ static void rtc_realizefn(DeviceState *dev, Error **errp) 
{

    ISADevice *isadev = ISA_DEVICE(dev);

    RTCState *s = MC146818_RTC(dev);

    int base = 0x70;



    s->cmos_data[RTC_REG_A] = 0x26;

    s->cmos_data[RTC_REG_B] = 0x02;
@@ -951,7 +950,7 @@ static void rtc_realizefn(DeviceState *dev, Error **errp) 
    qemu_register_suspend_notifier(&s->suspend_notifier);



    memory_region_init_io(&s->io, OBJECT(s), &cmos_ops, s, "rtc", 2);

    isa_register_ioport(isadev, &s->io, base);

    isa_register_ioport(isadev, &s->io, RTC_ISA_BASE);



    /* register rtc 0x70 port for coalesced_pio */

    memory_region_set_flush_coalesced(&s->io);
@@ -960,7 +959,7 @@ static void rtc_realizefn(DeviceState *dev, Error **errp) 
    memory_region_add_subregion(&s->io, 0, &s->coalesced_io);

    memory_region_add_coalescing(&s->coalesced_io, 0, 1);



    qdev_set_legacy_instance_id(dev, base, 3);

    qdev_set_legacy_instance_id(dev, RTC_ISA_BASE, 3);

    qemu_register_reset(rtc_reset, s);



    object_property_add_tm(OBJECT(s), "date", rtc_get_date, NULL);

include/hw/rtc/mc146818rtc.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ typedef struct RTCState { 
} RTCState;



#define RTC_ISA_IRQ 8

#define RTC_ISA_BASE 0x70



ISADevice *mc146818_rtc_init(ISABus *bus, int base_year,

                             qemu_irq intercept_irq);