diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2010-05-14 16:29:17 +0900 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-05-15 16:21:49 +0000 |
| commit | 1d914fa0af66024faee8cc6fa3043a935f95f775 (patch) | |
| tree | 76fe5f88cb67e1f4e5f322fda4c44eb81b3a4859 /hw/pc.h | |
| parent | e1460e4707cd80982add597f5cb421289db84e4e (diff) | |
| download | focaccia-qemu-1d914fa0af66024faee8cc6fa3043a935f95f775.tar.gz focaccia-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/pc.h')
| -rw-r--r-- | hw/pc.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/pc.h b/hw/pc.h index e3cc0a58bd..2e2f4e2e1b 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -5,7 +5,6 @@ #include "ioport.h" #include "isa.h" #include "fdc.h" -#include "mc146818rtc.h" /* PC-style peripherals (also used by other machines). */ @@ -95,14 +94,14 @@ qemu_irq *pc_allocate_cpu_irq(void); void pc_vga_init(PCIBus *pci_bus); void pc_basic_device_init(qemu_irq *isa_irq, FDCtrl **floppy_controller, - RTCState **rtc_state); + ISADevice **rtc_state); void pc_init_ne2k_isa(NICInfo *nd); #ifdef HAS_AUDIO void pc_audio_init (PCIBus *pci_bus, qemu_irq *pic); #endif void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, const char *boot_device, DriveInfo **hd_table, - FDCtrl *floppy_controller, RTCState *s); + FDCtrl *floppy_controller, ISADevice *s); void pc_pci_device_init(PCIBus *pci_bus); void ioport_set_a20(int enable); |