mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
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>
This commit is contained in:
parent
e1460e4707
commit
1d914fa0af
9 changed files with 34 additions and 26 deletions
5
hw/pc.h
5
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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue