diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-10-04 01:03:53 +0200 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2019-10-24 20:13:10 +0200 |
| commit | bcdb90640ae41128e0c2ae2ec8ebf5a832102097 (patch) | |
| tree | 62743a64e9670faca7aba86faf50153d141c3665 /include | |
| parent | 877c181cd41e024ba1d076f96efe3c5777938846 (diff) | |
hw: Move MC146818 device from hw/timer/ to hw/rtc/ subdirectory
The MC146818 is a Real Time Clock, not a timer.
Move it under the hw/rtc/ subdirectory.
Use copyright statement from 80cabfad163 for "hw/rtc/mc146818rtc.h".
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191003230404.19384-4-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/rtc/mc146818rtc.h (renamed from include/hw/timer/mc146818rtc.h) | 14 | ||||
| -rw-r--r-- | include/hw/rtc/mc146818rtc_regs.h (renamed from include/hw/timer/mc146818rtc_regs.h) | 5 |
2 files changed, 14 insertions, 5 deletions
diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h index fe6ed63f71..2e9331637a 100644 --- a/include/hw/timer/mc146818rtc.h +++ b/include/hw/rtc/mc146818rtc.h @@ -1,8 +1,16 @@ -#ifndef MC146818RTC_H -#define MC146818RTC_H +/* + * QEMU MC146818 RTC emulation + * + * Copyright (c) 2003-2004 Fabrice Bellard + * + * SPDX-License-Identifier: MIT + */ + +#ifndef HW_RTC_MC146818RTC_H +#define HW_RTC_MC146818RTC_H #include "hw/isa/isa.h" -#include "hw/timer/mc146818rtc_regs.h" +#include "hw/rtc/mc146818rtc_regs.h" #define TYPE_MC146818_RTC "mc146818rtc" diff --git a/include/hw/timer/mc146818rtc_regs.h b/include/hw/rtc/mc146818rtc_regs.h index bfbb57e570..dd6c09e2fc 100644 --- a/include/hw/timer/mc146818rtc_regs.h +++ b/include/hw/rtc/mc146818rtc_regs.h @@ -22,10 +22,11 @@ * THE SOFTWARE. */ -#ifndef MC146818RTC_REGS_H -#define MC146818RTC_REGS_H +#ifndef HW_RTC_MC146818RTC_REGS_H +#define HW_RTC_MC146818RTC_REGS_H #include "qemu/timer.h" +#include "qemu/host-utils.h" #define RTC_ISA_IRQ 8 |