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

audio: consolidate audio_init()

Browse source 
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>
This commit is contained in:
Isaku Yamahata 2011-01-21 19:53:45 +09:00 • committed by Aurelien Jarno
parent bec43cc3b6
commit 0dfa5ef90d
8 changed files with 41 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

23
hw/mips_malta.c
View file

@ -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();