diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-07-15 03:56:04 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-07-15 03:56:04 +0000 |
commit | b43bf7e6397fe79ce99530fd10c0eb34b192c253 (patch) | |
tree | ec88c44920f83e58484bf043bf614aaa99fccf8e /apps/menus/settings_menu.c | |
parent | ba0a9c418cba30575c9282a2bc5aa5c0a4b6a89b (diff) | |
download | rockbox-b43bf7e6397fe79ce99530fd10c0eb34b192c253.tar.gz rockbox-b43bf7e6397fe79ce99530fd10c0eb34b192c253.zip |
e200 doesnt have multiple batt capacities, so remove the option.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13900 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/settings_menu.c')
-rw-r--r-- | apps/menus/settings_menu.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index a11a7f0c40..302a7428aa 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -123,8 +123,12 @@ MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu, | |||
123 | 123 | ||
124 | /* Battery */ | 124 | /* Battery */ |
125 | #ifndef SIMULATOR | 125 | #ifndef SIMULATOR |
126 | #if BATTERY_CAPACITY_INC > 0 | ||
126 | MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL); | 127 | MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL); |
128 | #endif | ||
129 | #if BATTERY_TYPES_COUNT > 1 | ||
127 | MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL); | 130 | MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL); |
131 | #endif | ||
128 | #ifdef HAVE_USB_POWER | 132 | #ifdef HAVE_USB_POWER |
129 | #if CONFIG_CHARGING | 133 | #if CONFIG_CHARGING |
130 | static int usbcharging_callback(int action,const struct menu_item_ex *this_item) | 134 | static int usbcharging_callback(int action,const struct menu_item_ex *this_item) |
@@ -142,7 +146,9 @@ MENUITEM_SETTING(usb_charging, &global_settings.usb_charging, usbcharging_callba | |||
142 | #endif | 146 | #endif |
143 | #endif | 147 | #endif |
144 | MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, | 148 | MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, |
145 | &battery_capacity, | 149 | #if BATTERY_CAPACITY_INC > 0 |
150 | &battery_capacity, | ||
151 | #endif | ||
146 | #if BATTERY_TYPES_COUNT > 1 | 152 | #if BATTERY_TYPES_COUNT > 1 |
147 | &battery_type, | 153 | &battery_type, |
148 | #endif | 154 | #endif |