diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:04:49 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:04:49 -0800 |
| commit | df7881f07f53b041dc0568be8528e9dbb74994cc (patch) | |
| tree | 1b3e036f7df4241bf0c2d527b73198c50e1d7891 /hw/android_arm.c | |
| parent | 55f4e4a5ec657a017e3bf75299ad71fd1c968dd3 (diff) | |
| download | external_qemu-df7881f07f53b041dc0568be8528e9dbb74994cc.zip external_qemu-df7881f07f53b041dc0568be8528e9dbb74994cc.tar.gz external_qemu-df7881f07f53b041dc0568be8528e9dbb74994cc.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'hw/android_arm.c')
| -rw-r--r-- | hw/android_arm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/android_arm.c b/hw/android_arm.c index 7b1d446..3455054 100644 --- a/hw/android_arm.c +++ b/hw/android_arm.c @@ -12,6 +12,7 @@ #include "vl.h" #include "arm_pic.h" #include "goldfish_device.h" +#include "android/globals.h" int android_audio_enabled; char* audio_input_source = NULL; @@ -112,7 +113,8 @@ static void android_arm_init(int ram_size, int vga_ram_size, goldfish_memlog_init(0xff006000); - goldfish_battery_init(); + if (android_hw->hw_battery) + goldfish_battery_init(); goldfish_add_device_no_io(&event0_device); events_dev_init(event0_device.base, goldfish_pic[event0_device.irq]); @@ -146,4 +148,5 @@ QEMUMachine android_arm_machine = { "android_arm", "ARM Android Emulator", android_arm_init, + NULL }; |