On 4/29/20 3:59 PM, Gerd Hoffmann wrote:
> Add and use RTC_ISA_BASE define instead of hardcoding 0x70.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> include/hw/rtc/mc146818rtc.h | 1 +
> hw/rtc/mc146818rtc.c | 5 ++---
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h
> index 10c93a096a1d..3713181b56fe 100644
> --- a/include/hw/rtc/mc146818rtc.h
> +++ b/include/hw/rtc/mc146818rtc.h
> @@ -47,6 +47,7 @@ typedef struct RTCState {
> } RTCState;
>
> #define RTC_ISA_IRQ 8
> +#define RTC_ISA_BASE 0x70
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> ISADevice *mc146818_rtc_init(ISABus *bus, int base_year,
> qemu_irq intercept_irq);
> diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
> index dc4269cc55cb..d18c09911be2 100644
> --- a/hw/rtc/mc146818rtc.c
> +++ b/hw/rtc/mc146818rtc.c
> @@ -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);
>