[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/32] mc146818rtc: Include "mc146818rtc_regs.h" directly in mc14
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 05/32] mc146818rtc: Include "mc146818rtc_regs.h" directly in mc146818rtc.c |
Date: |
Tue, 15 Oct 2019 18:26:38 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
Devices/boards wanting to use the MC146818 RTC don't need
the knowledge its internal registers. Move the "mc146818rtc_regs.h"
inclusion to mc146818rtc.c where it is required.
We can not move this file from include/hw/timer/ to hw/timer/ for
local inclusion because the ACPI FADT table use the RTC_CENTURY
register address.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/timer/mc146818rtc.c | 1 +
include/hw/timer/mc146818rtc.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index e40b54e743..0c04b74c2e 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -41,6 +41,7 @@
#include "qapi/qapi-events-misc-target.h"
#include "qapi/visitor.h"
#include "exec/address-spaces.h"
+#include "hw/timer/mc146818rtc_regs.h"
#ifdef TARGET_I386
#include "hw/i386/apic.h"
diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h
index 17761cf6d9..a857dcdc69 100644
--- a/include/hw/timer/mc146818rtc.h
+++ b/include/hw/timer/mc146818rtc.h
@@ -5,7 +5,6 @@
#include "qemu/queue.h"
#include "qemu/timer.h"
#include "hw/isa/isa.h"
-#include "hw/timer/mc146818rtc_regs.h"
#define TYPE_MC146818_RTC "mc146818rtc"
#define MC146818_RTC(obj) OBJECT_CHECK(RTCState, (obj), TYPE_MC146818_RTC)
--
2.21.0
- Re: [PATCH 02/32] hw/i386/pc: Move kvm_i8259_init() declaration to sysemu/kvm.h, (continued)
[PATCH 03/32] mc146818rtc: move structure to header file, Philippe Mathieu-Daudé, 2019/10/15
[PATCH 04/32] mc146818rtc: Move RTC_ISA_IRQ definition, Philippe Mathieu-Daudé, 2019/10/15
[PATCH 05/32] mc146818rtc: Include "mc146818rtc_regs.h" directly in mc146818rtc.c,
Philippe Mathieu-Daudé <=
[PATCH 06/32] mc146818rtc: always register rtc to rtc list, Philippe Mathieu-Daudé, 2019/10/15
[PATCH 07/32] MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets, Philippe Mathieu-Daudé, 2019/10/15
[PATCH 08/32] piix4: rename some variables in realize function, Philippe Mathieu-Daudé, 2019/10/15
[PATCH 09/32] piix4: add Reset Control Register, Philippe Mathieu-Daudé, 2019/10/15
[PATCH 10/32] piix4: add a i8259 interrupt controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/15