[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 12/14] hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 12/14] hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less |
Date: |
Fri, 4 Oct 2019 01:04:02 +0200 |
Only 2 source files require the "mc146818rtc_regs.h" header.
Instead of having it processed 12 times, by all objects
using "mc146818rtc.h", include it directly where used.
Reviewed-by: Alistair Francis <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/rtc/mc146818rtc.c | 1 +
hw/timer/hpet.c | 1 +
include/hw/rtc/mc146818rtc.h | 1 -
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index ced15f764f..9d4ed54f65 100644
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -35,6 +35,7 @@
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
#include "hw/rtc/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc_regs.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-misc-target.h"
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 02bf8a8ce8..9f17aaa278 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -34,6 +34,7 @@
#include "hw/timer/hpet.h"
#include "hw/sysbus.h"
#include "hw/rtc/mc146818rtc.h"
+#include "hw/rtc/mc146818rtc_regs.h"
#include "migration/vmstate.h"
#include "hw/timer/i8254.h"
diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h
index 2e9331637a..7fa59d4279 100644
--- a/include/hw/rtc/mc146818rtc.h
+++ b/include/hw/rtc/mc146818rtc.h
@@ -10,7 +10,6 @@
#define HW_RTC_MC146818RTC_H
#include "hw/isa/isa.h"
-#include "hw/rtc/mc146818rtc_regs.h"
#define TYPE_MC146818_RTC "mc146818rtc"
--
2.20.1
- [PATCH v2 07/14] hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory, (continued)
- [PATCH v2 07/14] hw: Move TWL92230 device from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/10/03
- [PATCH v2 08/14] hw: Move DS1338 device from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/10/03
- [PATCH v2 09/14] hw: Move Xilinx ZynqMP RTC from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/10/03
- [PATCH v2 10/14] hw: Move Exynos4210 RTC from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/10/03
- [PATCH v2 11/14] hw: Move Aspeed RTC from hw/timer/ to hw/rtc/ subdirectory, Philippe Mathieu-Daudé, 2019/10/03
- [PATCH v2 12/14] hw/rtc/mc146818: Include mc146818rtc_regs.h a bit less,
Philippe Mathieu-Daudé <=
- [PATCH v2 13/14] hw/rtc/xlnx-zynqmp-rtc: Remove unused "ptimer.h" include, Philippe Mathieu-Daudé, 2019/10/03
- [PATCH v2 14/14] hw/rtc/aspeed_rtc: Remove unused includes, Philippe Mathieu-Daudé, 2019/10/03
- Re: [PATCH v2 00/14] hw: Split RTC devices from hw/timer/ to hw/rtc/, Peter Maydell, 2019/10/24