diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:31 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:31 -0800 |
| commit | 92c7311b1cb354745ec7b59b0e03910b3fe4c205 (patch) | |
| tree | 981e45bbed625c3b207f9a05908482de9b0bdfd3 /hw/android_arm.c | |
| parent | 8b23a6c7e1aee255004dd19098d4c2462b61b849 (diff) | |
| download | external_qemu-92c7311b1cb354745ec7b59b0e03910b3fe4c205.zip external_qemu-92c7311b1cb354745ec7b59b0e03910b3fe4c205.tar.gz external_qemu-92c7311b1cb354745ec7b59b0e03910b3fe4c205.tar.bz2 | |
auto import from //depot/cupcake/@136594
Diffstat (limited to 'hw/android_arm.c')
| -rw-r--r-- | hw/android_arm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/hw/android_arm.c b/hw/android_arm.c index efc8ba1..ae21be8 100644 --- a/hw/android_arm.c +++ b/hw/android_arm.c @@ -22,7 +22,6 @@ #define ARM_CPU_SAVE_VERSION 1 -int android_audio_enabled; char* audio_input_source = NULL; void goldfish_memlog_init(uint32_t base); @@ -116,10 +115,8 @@ static void android_arm_init(ram_addr_t ram_size, int vga_ram_size, goldfish_fb_init(ds, 0); #ifdef HAS_AUDIO - if (android_audio_enabled) { - AUD_init(); - goldfish_audio_init(0xff004000, 0, audio_input_source); - } + AUD_init(); + goldfish_audio_init(0xff004000, 0, audio_input_source); #endif { int idx = drive_get_index( IF_IDE, 0, 0 ); @@ -171,5 +168,7 @@ QEMUMachine android_arm_machine = { "android_arm", "ARM Android Emulator", android_arm_init, + 0, + 0, NULL }; |