aboutsummaryrefslogtreecommitdiffstats
path: root/hw/pc.c
diff options
context:
space:
mode:
authorJun Nakajima <jnakajim@gmail.com>2011-02-24 13:16:01 -0800
committerJun Nakajima <jnakajim@gmail.com>2011-02-24 13:16:01 -0800
commit6f1983684711f211f14bce3e4624fefd8af0b16f (patch)
tree3bb6423e5957809e86bb37b48926acbc115cf862 /hw/pc.c
parentf00519bd7a1e10f9ede5701fb7881aacd44efeb1 (diff)
downloadexternal_qemu-6f1983684711f211f14bce3e4624fefd8af0b16f.zip
external_qemu-6f1983684711f211f14bce3e4624fefd8af0b16f.tar.gz
external_qemu-6f1983684711f211f14bce3e4624fefd8af0b16f.tar.bz2
x86: Fixing audio.
Change-Id: I0614450cd512d52bf24020dda1c933f0b22cb09b Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com> Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Diffstat (limited to 'hw/pc.c')
-rw-r--r--hw/pc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 72b6813..ff7670e 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -788,6 +788,7 @@ static int parallel_io[MAX_PARALLEL_PORTS] = { 0x378, 0x278, 0x3bc };
static int parallel_irq[MAX_PARALLEL_PORTS] = { 7, 7, 7 }; */
#ifdef HAS_AUDIO
+#ifndef CONFIG_ANDROID
static void audio_init (PCIBus *pci_bus, qemu_irq *pic)
{
struct soundhw *c;
@@ -805,6 +806,7 @@ static void audio_init (PCIBus *pci_bus, qemu_irq *pic)
}
}
#endif
+#endif
static void pc_init_ne2k_isa(NICInfo *nd, qemu_irq *pic)
{
@@ -1184,7 +1186,11 @@ static void pc_init1(ram_addr_t ram_size,
events_dev_init(event0_device.base, i8259[event0_device.irq]);
#ifdef HAS_AUDIO
+#ifndef CONFIG_ANDROID
audio_init(pci_enabled ? pci_bus : NULL, i8259);
+#else
+ goldfish_audio_init(0xff004000, 0, audio_input_source);
+#endif
#endif
#ifndef CONFIG_ANDROID