summaryrefslogtreecommitdiffstats
path: root/hw/mips_malta.c
diff options
context:
space:
mode:
authorIsaku Yamahata2010-05-14 09:29:17 +0200
committerBlue Swirl2010-05-15 18:21:49 +0200
commit1d914fa0af66024faee8cc6fa3043a935f95f775 (patch)
tree76fe5f88cb67e1f4e5f322fda4c44eb81b3a4859 /hw/mips_malta.c
parentpc: move rtc declarations from pc.h into a dedicated header file. (diff)
downloadqemu-1d914fa0af66024faee8cc6fa3043a935f95f775.tar.gz
qemu-1d914fa0af66024faee8cc6fa3043a935f95f775.tar.xz
qemu-1d914fa0af66024faee8cc6fa3043a935f95f775.zip
rtc: make rtc_xxx accept/return ISADevice instead of RTCState.
To match rtc_xxx with qdev, make rtc_xxx accept and return ISADevice instead of RTCState. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/mips_malta.c')
-rw-r--r--hw/mips_malta.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 586c1c3b2f..792709bf5a 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -44,6 +44,7 @@
#include "ide.h"
#include "loader.h"
#include "elf.h"
+#include "mc146818rtc.h"
//#define DEBUG_BOARD_INIT
@@ -776,7 +777,7 @@ void mips_malta_init (ram_addr_t ram_size,
PCIBus *pci_bus;
ISADevice *isa_dev;
CPUState *env;
- RTCState *rtc_state;
+ ISADevice *rtc_state;
FDCtrl *floppy_controller;
MaltaFPGAState *malta_fpga;
qemu_irq *i8259;