diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2019-10-18 15:35:45 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-10-24 14:24:55 +0200 |
| commit | d578f7dfb4e4b911fd7c6418b9344dc3dccad7f3 (patch) | |
| tree | b70da68e101b5c123f3f3e22eeaece11b8dc0655 | |
| parent | 53e4b8018e600c256bd60e5898f6747eddbc2131 (diff) | |
| download | qemu-d578f7dfb4e4b911fd7c6418b9344dc3dccad7f3.zip qemu-d578f7dfb4e4b911fd7c6418b9344dc3dccad7f3.tar.gz qemu-d578f7dfb4e4b911fd7c6418b9344dc3dccad7f3.tar.bz2 | |
mc146818rtc: Move RTC_ISA_IRQ definition
The ISA default number for the RTC devices is not related to its
registers neither. Move this definition to "hw/timer/mc146818rtc.h".
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191018133547.10936-3-philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
| -rw-r--r-- | include/hw/timer/mc146818rtc.h | 2 | ||||
| -rw-r--r-- | include/hw/timer/mc146818rtc_regs.h | 2 | ||||
| -rw-r--r-- | tests/rtc-test.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h index 0f1c886..17761cf 100644 --- a/include/hw/timer/mc146818rtc.h +++ b/include/hw/timer/mc146818rtc.h @@ -39,6 +39,8 @@ typedef struct RTCState { QLIST_ENTRY(RTCState) link; } RTCState; +#define RTC_ISA_IRQ 8 + ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq); void rtc_set_memory(ISADevice *dev, int addr, int val); diff --git a/include/hw/timer/mc146818rtc_regs.h b/include/hw/timer/mc146818rtc_regs.h index bfbb57e..631f71c 100644 --- a/include/hw/timer/mc146818rtc_regs.h +++ b/include/hw/timer/mc146818rtc_regs.h @@ -27,8 +27,6 @@ #include "qemu/timer.h" -#define RTC_ISA_IRQ 8 - #define RTC_SECONDS 0 #define RTC_SECONDS_ALARM 1 #define RTC_MINUTES 2 diff --git a/tests/rtc-test.c b/tests/rtc-test.c index 6309b0e..18f8956 100644 --- a/tests/rtc-test.c +++ b/tests/rtc-test.c @@ -15,6 +15,7 @@ #include "libqtest-single.h" #include "qemu/timer.h" +#include "hw/timer/mc146818rtc.h" #include "hw/timer/mc146818rtc_regs.h" #define UIP_HOLD_LENGTH (8 * NANOSECONDS_PER_SECOND / 32768) |