devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

e200 doesnt have multiple batt capacities, so remove the option.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13900 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-07-15 03:56:04 +00:00
parent ba0a9c418c
commit b43bf7e639
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/menus/settings_menu.c
View file

@ -123,8 +123,12 @@ MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu,
/* Battery */ /* Battery */
#ifndef SIMULATOR #ifndef SIMULATOR
#if BATTERY_CAPACITY_INC > 0
MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL); MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL);
#endif
#if BATTERY_TYPES_COUNT > 1
MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL); MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL);
#endif
#ifdef HAVE_USB_POWER #ifdef HAVE_USB_POWER
#if CONFIG_CHARGING #if CONFIG_CHARGING
static int usbcharging_callback(int action,const struct menu_item_ex *this_item) 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
#endif #endif
#endif #endif
MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON,
&battery_capacity, #if BATTERY_CAPACITY_INC > 0
&battery_capacity,
#endif
#if BATTERY_TYPES_COUNT > 1 #if BATTERY_TYPES_COUNT > 1
&battery_type, &battery_type,
#endif #endif

3
apps/settings_list.c
View file

@ -483,12 +483,13 @@ const struct settings_list settings[] = {
#endif #endif
"max files in dir", UNIT_INT,50,10000,50,NULL,NULL,NULL), "max files in dir", UNIT_INT,50,10000,50,NULL,NULL,NULL),
#ifndef SIMULATOR #ifndef SIMULATOR
#if BATTERY_CAPACITY_INC > 0
INT_SETTING(0, battery_capacity, LANG_BATTERY_CAPACITY, BATTERY_CAPACITY_DEFAULT, INT_SETTING(0, battery_capacity, LANG_BATTERY_CAPACITY, BATTERY_CAPACITY_DEFAULT,
"battery capacity", UNIT_MAH, "battery capacity", UNIT_MAH,
BATTERY_CAPACITY_MIN, BATTERY_CAPACITY_MAX, BATTERY_CAPACITY_INC, BATTERY_CAPACITY_MIN, BATTERY_CAPACITY_MAX, BATTERY_CAPACITY_INC,
NULL, NULL, NULL), NULL, NULL, NULL),
#endif #endif
#endif
#if CONFIG_CHARGING #if CONFIG_CHARGING
OFFON_SETTING(NVRAM(1), car_adapter_mode, OFFON_SETTING(NVRAM(1), car_adapter_mode,
LANG_CAR_ADAPTER_MODE, false, "car adapter mode", NULL), LANG_CAR_ADAPTER_MODE, false, "car adapter mode", NULL),