diff options
| -rw-r--r-- | Makefile.target | 2 | ||||
| -rw-r--r-- | hw/pc.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target index ab263bd..7b7c1bc 100644 --- a/Makefile.target +++ b/Makefile.target @@ -61,6 +61,7 @@ HW_SOURCES := \ cdrom.c \ dma.c \ irq.c \ + goldfish_audio.c \ goldfish_device.c \ goldfish_events_device.c \ goldfish_fb.c \ @@ -84,7 +85,6 @@ HW_SOURCES := \ ifeq ($(EMULATOR_TARGET_ARCH),arm) HW_SOURCES += android_arm.c \ arm_pic.c \ - goldfish_audio.c \ goldfish_interrupt.c \ goldfish_switch.c \ goldfish_timer.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 |