From 6c5c3495caa13948f4702004483836be6507f687 Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Tue, 19 Jul 2011 20:55:59 +0000 Subject: Disable ipod video battery capacity default detection for bootloader and simulator git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30171 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings_list.c | 2 +- firmware/SOURCES | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/settings_list.c b/apps/settings_list.c index 62a2d94afa..dcdeaecd53 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -784,7 +784,7 @@ const struct settings_list settings[] = { #define BATTERY_CAPACITY_MAX BATTERY_CAPACITY_DEFAULT #define BATTERY_CAPACITY_INC 0 #endif -#ifdef IPOD_VIDEO +#if defined(IPOD_VIDEO) && !defined(SIMULATOR) /* its easier to leave this one un-macro()ed for the time being */ { F_T_INT|F_DEF_ISFUNC|F_INT_SETTING, &global_settings.battery_capacity, LANG_BATTERY_CAPACITY, FUNCTYPE(battery_default_capacity), diff --git a/firmware/SOURCES b/firmware/SOURCES index 28e72e8bef..457519dba3 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1188,7 +1188,9 @@ target/arm/ipod/power-ipod.c target/arm/ipod/powermgmt-ipod-pcf.c target/arm/ipod/video/lcd-as-video.S target/arm/ipod/video/lcd-video.c +#ifndef BOOTLOADER target/arm/ipod/video/battery-video.c +#endif /* BOOTLOADER */ target/arm/usb-fw-pp502x.c #endif /* SIMULATOR */ #endif /* IPOD_VIDEO */ -- cgit v1.2.3