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

audio merge (malc)

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1601 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2005-11-05 18:55:28 +00:00
parent f04308e452
commit c0fe3827ea
23 changed files with 984 additions and 801 deletions
Download patch file Download diff file Expand all files Collapse all files

22
hw/pc.c
View file

@ -601,19 +601,23 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
DMA_init(0);
if (audio_enabled) {
AUD_init();
if (sb16_enabled)
SB16_init ();
AudioState *audio;
audio = AUD_init();
if (audio) {
if (sb16_enabled)
SB16_init (audio);
#ifdef CONFIG_ADLIB
if (adlib_enabled)
Adlib_init ();
if (adlib_enabled)
Adlib_init (audio);
#endif
#ifdef CONFIG_GUS
if (gus_enabled)
GUS_init ();
if (gus_enabled)
GUS_init (audio);
#endif
if (pci_enabled && es1370_enabled)
es1370_init (pci_bus);
if (pci_enabled && es1370_enabled)
es1370_init (pci_bus, audio);
}
}
floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table);