aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorHervé Poussineau <hpoussin@reactos.org>2011-12-15 22:10:01 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-20 15:44:31 -0600
commit4a0f031d5bd2399eec5eea062e44b5271a855faf (patch)
tree6d66829cdc94ed55279c3c955a37b7acf2375e15 /hw
parentd3c68e4f45b54c447c9a169533c286cb1be62b59 (diff)
audio: remove unused parameter isa_pic
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/adlib.c2
-rw-r--r--hw/audiodev.h8
-rw-r--r--hw/cs4231a.c2
-rw-r--r--hw/gus.c2
-rw-r--r--hw/mips_jazz.c2
-rw-r--r--hw/mips_malta.c2
-rw-r--r--hw/pc.h2
-rw-r--r--hw/pc_piix.c2
-rw-r--r--hw/pcspk.c2
-rw-r--r--hw/sb16.c2
10 files changed, 13 insertions, 13 deletions
diff --git a/hw/adlib.c b/hw/adlib.c
index b5e15644ac..dd8b1888cf 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 bfa324a799..ed2790f5f6 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 02388298a6..dc77a3aa15 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;
diff --git a/hw/gus.c b/hw/gus.c
index 17cceee5ba..ab872d8dc5 100644
--- a/hw/gus.c
+++ b/hw/gus.c
@@ -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 8ed66cecca..da0498201a 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 330924eeef..d94ad1d8c1 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();
diff --git a/hw/pc.h b/hw/pc.h
index 17648ccb0d..13e41f101e 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -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 77b88b40cf..b70431fe87 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 4d949fbce7..acb016773b 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};
diff --git a/hw/sb16.c b/hw/sb16.c
index 88ad8e85cd..887b32e794 100644
--- a/hw/sb16.c
+++ b/hw/sb16.c
@@ -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;