motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 07:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

isa: give ISABus/ISADevice to isa_create(), isa_bus_irqs() and isa_get_irq() functions

Browse source 
NULL is a valid bus/device, so there is no change in behaviour.

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Hervé Poussineau 2011-12-15 22:09:51 +01:00 • committed by Anthony Liguori
parent 0fa29915cd
commit 48a18b3c69
33 changed files with 170 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

8
arch_init.c
View file

@ -473,7 +473,7 @@ struct soundhw {
int enabled;
int isa;
union {
int (*init_isa) (qemu_irq *pic);
int (*init_isa) (ISABus *bus, qemu_irq *pic);
int (*init_pci) (PCIBus *bus);
} init;
};
@ -628,7 +628,7 @@ void select_soundhw(const char *optarg)
}
}
void audio_init(qemu_irq *isa_pic, PCIBus *pci_bus)
void audio_init(ISABus *isa_bus, qemu_irq *isa_pic, PCIBus *pci_bus)
{
struct soundhw *c;
@ -636,7 +636,7 @@ void audio_init(qemu_irq *isa_pic, PCIBus *pci_bus)
if (c->enabled) {
if (c->isa) {
if (isa_pic) {
c->init.init_isa(isa_pic);
c->init.init_isa(isa_bus, isa_pic);
}
} else {
if (pci_bus) {
@ -650,7 +650,7 @@ void audio_init(qemu_irq *isa_pic, PCIBus *pci_bus)
void select_soundhw(const char *optarg)
{
}
void audio_init(qemu_irq *isa_pic, PCIBus *pci_bus)
void audio_init(ISABus *isa_bus, qemu_irq *isa_pic, PCIBus *pci_bus)
{
}
#endif