diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-01-21 19:53:45 +0900 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-01-25 09:18:00 +0100 |
| commit | 0dfa5ef90d0b4eebaf810a897459a009e4b1cef2 (patch) | |
| tree | c1a786583824fb1f382eda76db648bca988a3461 /hw/mips_malta.c | |
| parent | bec43cc3b61d025841d550800d3835986446061d (diff) | |
audio: consolidate audio_init()
consolidate audio_init() and remove references to shoundhw.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw/mips_malta.c')
| -rw-r--r-- | hw/mips_malta.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 87554169c..2d3f242cc 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -37,7 +37,7 @@ #include "vmware_vga.h" #include "qemu-char.h" #include "sysemu.h" -#include "audio/audio.h" +#include "arch_init.h" #include "boards.h" #include "qemu-log.h" #include "mips-bios.h" @@ -457,25 +457,6 @@ static MaltaFPGAState *malta_fpga_init(target_phys_addr_t base, qemu_irq uart_ir return s; } -/* Audio support */ -static void audio_init (PCIBus *pci_bus) -{ - struct soundhw *c; - int audio_enabled = 0; - - for (c = soundhw; !audio_enabled && c->name; ++c) { - audio_enabled = c->enabled; - } - - if (audio_enabled) { - for (c = soundhw; c->name; ++c) { - if (c->enabled) { - c->init.init_pci(pci_bus); - } - } - } -} - /* Network support */ static void network_init(void) { @@ -967,7 +948,7 @@ void mips_malta_init (ram_addr_t ram_size, fdctrl_init_isa(fd); /* Sound card */ - audio_init(pci_bus); + audio_init(NULL, pci_bus); /* Network card */ network_init(); |