Commit d93884e8 authored Oct 18, 2019 by Philippe Mathieu-Daudé Committed by Paolo Bonzini Oct 24, 2019

mc146818rtc: Include mc146818rtc_regs.h directly in mc146818rtc.c



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é <philmd@redhat.com>
Message-Id: <20191018133547.10936-4-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

parent d578f7df

hw/timer/mc146818rtc.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,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 "qapi/qapi-commands-misc-target.h"

include/hw/timer/mc146818rtc.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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)