diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2011-07-19 20:55:59 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2011-07-19 20:55:59 +0000 |
commit | 6c5c3495caa13948f4702004483836be6507f687 (patch) | |
tree | 863822e36476e505c910c97aabab77981ebe811c | |
parent | aa27d47782ad57fe586bd18988c64dd0f005421c (diff) | |
download | rockbox-6c5c3495caa13948f4702004483836be6507f687.tar.gz rockbox-6c5c3495caa13948f4702004483836be6507f687.zip |
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
-rw-r--r-- | apps/settings_list.c | 2 | ||||
-rw-r--r-- | firmware/SOURCES | 2 |
2 files changed, 3 insertions, 1 deletions
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[] = { | |||
784 | #define BATTERY_CAPACITY_MAX BATTERY_CAPACITY_DEFAULT | 784 | #define BATTERY_CAPACITY_MAX BATTERY_CAPACITY_DEFAULT |
785 | #define BATTERY_CAPACITY_INC 0 | 785 | #define BATTERY_CAPACITY_INC 0 |
786 | #endif | 786 | #endif |
787 | #ifdef IPOD_VIDEO | 787 | #if defined(IPOD_VIDEO) && !defined(SIMULATOR) |
788 | /* its easier to leave this one un-macro()ed for the time being */ | 788 | /* its easier to leave this one un-macro()ed for the time being */ |
789 | { F_T_INT|F_DEF_ISFUNC|F_INT_SETTING, &global_settings.battery_capacity, | 789 | { F_T_INT|F_DEF_ISFUNC|F_INT_SETTING, &global_settings.battery_capacity, |
790 | LANG_BATTERY_CAPACITY, FUNCTYPE(battery_default_capacity), | 790 | 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 | |||
1188 | target/arm/ipod/powermgmt-ipod-pcf.c | 1188 | target/arm/ipod/powermgmt-ipod-pcf.c |
1189 | target/arm/ipod/video/lcd-as-video.S | 1189 | target/arm/ipod/video/lcd-as-video.S |
1190 | target/arm/ipod/video/lcd-video.c | 1190 | target/arm/ipod/video/lcd-video.c |
1191 | #ifndef BOOTLOADER | ||
1191 | target/arm/ipod/video/battery-video.c | 1192 | target/arm/ipod/video/battery-video.c |
1193 | #endif /* BOOTLOADER */ | ||
1192 | target/arm/usb-fw-pp502x.c | 1194 | target/arm/usb-fw-pp502x.c |
1193 | #endif /* SIMULATOR */ | 1195 | #endif /* SIMULATOR */ |
1194 | #endif /* IPOD_VIDEO */ | 1196 | #endif /* IPOD_VIDEO */ |