len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 13:12:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

CONFIG_CHARGING

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12384 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-02-18 05:32:06 +00:00
parent bd47d48c21
commit 9a6f419775
25 changed files with 72 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/menus/display_menu.c
View file

@ -79,7 +79,7 @@ int flipdisplay_callback(int action,const struct menu_item_ex *this_item)
/* LCD MENU */
#ifdef CONFIG_BACKLIGHT
MENUITEM_SETTING(backlight_timeout, &global_settings.backlight_timeout, NULL);
#ifdef CONFIG_CHARGING
#if CONFIG_CHARGING
MENUITEM_SETTING(backlight_timeout_plugged,
&global_settings.backlight_timeout_plugged, NULL);
#endif
@ -174,7 +174,7 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU),
NULL, bitmap_icons_6x8[Icon_Display_menu]
#ifdef CONFIG_BACKLIGHT
,&backlight_timeout
# ifdef CONFIG_CHARGING
# if CONFIG_CHARGING
,&backlight_timeout_plugged
# endif
# ifdef HAS_BUTTON_HOLD
@ -218,7 +218,7 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU),
MENUITEM_SETTING(remote_backlight_timeout,
&global_settings.remote_backlight_timeout, NULL);
#ifdef CONFIG_CHARGING
#if CONFIG_CHARGING
MENUITEM_SETTING(remote_backlight_timeout_plugged,
&global_settings.remote_backlight_timeout_plugged, NULL);
#endif
@ -260,7 +260,7 @@ MENUITEM_SETTING(remote_reduce_ticking,
MAKE_MENU(lcd_remote_settings, ID2P(LANG_LCD_REMOTE_MENU),
NULL, bitmap_icons_6x8[Icon_Remote_Display_menu],
&remote_backlight_timeout,
#ifdef CONFIG_CHARGING
#if CONFIG_CHARGING
&remote_backlight_timeout_plugged,
#endif
#ifdef HAS_REMOTE_BUTTON_HOLD

8
apps/menus/settings_menu.c
View file

@ -110,7 +110,7 @@ MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, NOICON,
MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL);
MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL);
#ifdef HAVE_USB_POWER
#ifdef CONFIG_CHARGING
#if CONFIG_CHARGING
static int usbcharging_callback(int action,const struct menu_item_ex *this_item)
{
(void)this_item;
@ -131,7 +131,7 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, NOICON,
&battery_type,
#endif
#ifdef HAVE_USB_POWER
#ifdef CONFIG_CHARGING
#if CONFIG_CHARGING
&usb_charging,
#endif
#endif
@ -272,7 +272,7 @@ static int linein_callback(int action,const struct menu_item_ex *this_item)
}
MENUITEM_SETTING(line_in, &global_settings.line_in, linein_callback);
#endif
#ifdef CONFIG_CHARGING
#if CONFIG_CHARGING
MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL);
#endif
@ -296,7 +296,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
#if CONFIG_CODEC == MAS3507D
&line_in,
#endif
#ifdef CONFIG_CHARGING
#if CONFIG_CHARGING
&car_adapter_mode,
#endif
);