diff options
| -rw-r--r-- | arch_init.c | 10 | ||||
| -rw-r--r-- | arch_init.h | 2 | ||||
| -rw-r--r-- | hw/adlib.c | 2 | ||||
| -rw-r--r-- | hw/audiodev.h | 8 | ||||
| -rw-r--r-- | hw/cs4231a.c | 2 | ||||
| -rw-r--r-- | hw/gus.c | 2 | ||||
| -rw-r--r-- | hw/mips_jazz.c | 2 | ||||
| -rw-r--r-- | hw/mips_malta.c | 2 | ||||
| -rw-r--r-- | hw/pc.h | 2 | ||||
| -rw-r--r-- | hw/pc_piix.c | 2 | ||||
| -rw-r--r-- | hw/pcspk.c | 2 | ||||
| -rw-r--r-- | hw/sb16.c | 2 |
12 files changed, 19 insertions, 19 deletions
diff --git a/arch_init.c b/arch_init.c index 3bc2a41dd..d4c92b0a4 100644 --- a/arch_init.c +++ b/arch_init.c @@ -473,7 +473,7 @@ struct soundhw { int enabled; int isa; union { - int (*init_isa) (ISABus *bus, qemu_irq *pic); + int (*init_isa) (ISABus *bus); int (*init_pci) (PCIBus *bus); } init; }; @@ -628,15 +628,15 @@ void select_soundhw(const char *optarg) } } -void audio_init(ISABus *isa_bus, qemu_irq *isa_pic, PCIBus *pci_bus) +void audio_init(ISABus *isa_bus, PCIBus *pci_bus) { struct soundhw *c; for (c = soundhw; c->name; ++c) { if (c->enabled) { if (c->isa) { - if (isa_pic) { - c->init.init_isa(isa_bus, isa_pic); + if (isa_bus) { + c->init.init_isa(isa_bus); } } else { if (pci_bus) { @@ -650,7 +650,7 @@ void audio_init(ISABus *isa_bus, qemu_irq *isa_pic, PCIBus *pci_bus) void select_soundhw(const char *optarg) { } -void audio_init(ISABus *isa_bus, qemu_irq *isa_pic, PCIBus *pci_bus) +void audio_init(ISABus *isa_bus, PCIBus *pci_bus) { } #endif diff --git a/arch_init.h b/arch_init.h index 074f02a8c..828256cc4 100644 --- a/arch_init.h +++ b/arch_init.h @@ -27,7 +27,7 @@ void do_acpitable_option(const char *optarg); void do_smbios_option(const char *optarg); void cpudef_init(void); int audio_available(void); -void audio_init(ISABus *isa_bus, qemu_irq *isa_pic, PCIBus *pci_bus); +void audio_init(ISABus *isa_bus, PCIBus *pci_bus); int tcg_available(void); int kvm_available(void); int xen_available(void); diff --git a/hw/adlib.c b/hw/adlib.c index b5e15644a..dd8b1888c 100644 --- a/hw/adlib.c +++ b/hw/adlib.c @@ -275,7 +275,7 @@ static void Adlib_fini (AdlibState *s) AUD_remove_card (&s->card); } -int Adlib_init (ISABus *bus, qemu_irq *pic) +int Adlib_init (ISABus *bus) { AdlibState *s = &glob_adlib; struct audsettings as; diff --git a/hw/audiodev.h b/hw/audiodev.h index bfa324a79..ed2790f5f 100644 --- a/hw/audiodev.h +++ b/hw/audiodev.h @@ -2,19 +2,19 @@ int es1370_init(PCIBus *bus); /* sb16.c */ -int SB16_init(ISABus *bus, qemu_irq *pic); +int SB16_init(ISABus *bus); /* adlib.c */ -int Adlib_init(ISABus *bus, qemu_irq *pic); +int Adlib_init(ISABus *bus); /* gus.c */ -int GUS_init(ISABus *bus, qemu_irq *pic); +int GUS_init(ISABus *bus); /* ac97.c */ int ac97_init(PCIBus *bus); /* cs4231a.c */ -int cs4231a_init(ISABus *bus, qemu_irq *pic); +int cs4231a_init(ISABus *bus); /* intel-hda.c + hda-audio.c */ int intel_hda_and_codec_init(PCIBus *bus); diff --git a/hw/cs4231a.c b/hw/cs4231a.c index 02388298a..dc77a3aa1 100644 --- a/hw/cs4231a.c +++ b/hw/cs4231a.c @@ -659,7 +659,7 @@ static int cs4231a_initfn (ISADevice *dev) return 0; } -int cs4231a_init (ISABus *bus, qemu_irq *pic) +int cs4231a_init (ISABus *bus) { isa_create_simple (bus, "cs4231a"); return 0; @@ -293,7 +293,7 @@ static int gus_initfn (ISADevice *dev) return 0; } -int GUS_init (ISABus *bus, qemu_irq *pic) +int GUS_init (ISABus *bus) { isa_create_simple (bus, "gus"); return 0; diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 8ed66cecc..da0498201 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -281,7 +281,7 @@ static void mips_jazz_init(MemoryRegion *address_space, /* Sound card */ /* FIXME: missing Jazz sound at 0x8000c000, rc4030[2] */ - audio_init(isa_bus, i8259, NULL); + audio_init(isa_bus, NULL); /* NVRAM */ dev = qdev_create(NULL, "ds1225y"); diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 330924eee..d94ad1d8c 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -973,7 +973,7 @@ void mips_malta_init (ram_addr_t ram_size, fdctrl_init_isa(isa_bus, fd); /* Sound card */ - audio_init(isa_bus, NULL, pci_bus); + audio_init(isa_bus, pci_bus); /* Network card */ network_init(); @@ -176,7 +176,7 @@ extern int no_hpet; /* pcspk.c */ void pcspk_init(ISADevice *pit); -int pcspk_audio_init(ISABus *bus, qemu_irq *pic); +int pcspk_audio_init(ISABus *bus); /* piix_pci.c */ struct PCII440FXState; diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 77b88b40c..b70431fe8 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -222,7 +222,7 @@ static void pc_init1(MemoryRegion *system_memory, qdev_property_add_child(qdev_resolve_path("/i440fx/piix3", NULL), "rtc", (DeviceState *)rtc_state, NULL); - audio_init(isa_bus, gsi, pci_enabled ? pci_bus : NULL); + audio_init(isa_bus, pci_enabled ? pci_bus : NULL); pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, floppy, idebus[0], idebus[1], rtc_state); diff --git a/hw/pcspk.c b/hw/pcspk.c index 4d949fbce..acb016773 100644 --- a/hw/pcspk.c +++ b/hw/pcspk.c @@ -96,7 +96,7 @@ static void pcspk_callback(void *opaque, int free) } } -int pcspk_audio_init(ISABus *bus, qemu_irq *pic) +int pcspk_audio_init(ISABus *bus) { PCSpkState *s = &pcspk_state; struct audsettings as = {PCSPK_SAMPLE_RATE, 1, AUD_FMT_U8, 0}; @@ -1385,7 +1385,7 @@ static int sb16_initfn (ISADevice *dev) return 0; } -int SB16_init (ISABus *bus, qemu_irq *pic) +int SB16_init (ISABus *bus) { isa_create_simple (bus, "sb16"); return 0; |