summaryrefslogtreecommitdiff
path: root/hw/pc.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-11-09 23:09:44 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-11-09 23:09:44 +0000
commitfb065187e4ee9e0d1709b344ec01bb426ff1e43b (patch)
treeca7bf5ed6f0731429b9f9b6d62f2993583c9bcfb /hw/pc.c
parentbf71c9d9b64a70e56db351c38ff71e5e27d871e7 (diff)
downloadqemu-fb065187e4ee9e0d1709b344ec01bb426ff1e43b.tar.gz
audio clean up (initial patch by malc)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1131 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/pc.c')
-rw-r--r--hw/pc.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/hw/pc.c b/hw/pc.c
index fbcd969802..06ec7b1b69 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -555,8 +555,19 @@ void pc_init(int ram_size, int vga_ram_size, int boot_device,
DMA_init(0);
if (audio_enabled) {
- /* no audio supported yet for win32 */
AUD_init();
+#ifdef USE_SB16
+ if (sb16_enabled)
+ SB16_init ();
+#endif
+#ifdef CONFIG_ADLIB
+ if (adlib_enabled)
+ Adlib_init ();
+#endif
+#ifdef USE_GUS
+ if (gus_enabled)
+ GUS_init ();
+#endif
}
floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table);