diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-05-14 19:29:25 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-05-14 19:29:25 +0000 |
commit | 009cebeab263085d142c413386f1fc7760792b6d (patch) | |
tree | b78e716cd627ad53bad8a51cad007b3a2a1fa421 /apps/menus/display_menu.c | |
parent | bdc6e624bc7dd9c798a024a951b3da0dabf1ddc4 (diff) | |
download | rockbox-009cebeab263085d142c413386f1fc7760792b6d.tar.gz rockbox-009cebeab263085d142c413386f1fc7760792b6d.zip |
Straigten-out lcd sleeping on Gigabeat F/X. Add a service function to backlight.c to handle lcd sleep timer. Make HAVE_LCD_SLEEP useable without a setting and use HAVE_LCD_SLEEP_SETTING when a setting is available in addition to HCD_HAVE_SLEEP. If a setting isn't used, the target must define the timeout to be used in the config.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17505 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/display_menu.c')
-rw-r--r-- | apps/menus/display_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index 57d2f72be5..5ba8c2ecb1 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -94,7 +94,7 @@ MENUITEM_SETTING(backlight_fade_out, &global_settings.backlight_fade_out, NULL); | |||
94 | MENUITEM_SETTING(bl_filter_first_keypress, | 94 | MENUITEM_SETTING(bl_filter_first_keypress, |
95 | &global_settings.bl_filter_first_keypress, | 95 | &global_settings.bl_filter_first_keypress, |
96 | filterfirstkeypress_callback); | 96 | filterfirstkeypress_callback); |
97 | #ifdef HAVE_LCD_SLEEP | 97 | #ifdef HAVE_LCD_SLEEP_SETTING |
98 | MENUITEM_SETTING(lcd_sleep_after_backlight_off, | 98 | MENUITEM_SETTING(lcd_sleep_after_backlight_off, |
99 | &global_settings.lcd_sleep_after_backlight_off, NULL); | 99 | &global_settings.lcd_sleep_after_backlight_off, NULL); |
100 | #endif | 100 | #endif |
@@ -130,7 +130,7 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), | |||
130 | ,&backlight_fade_in, &backlight_fade_out | 130 | ,&backlight_fade_in, &backlight_fade_out |
131 | # endif | 131 | # endif |
132 | ,&bl_filter_first_keypress | 132 | ,&bl_filter_first_keypress |
133 | # ifdef HAVE_LCD_SLEEP | 133 | # ifdef HAVE_LCD_SLEEP_SETTING |
134 | ,&lcd_sleep_after_backlight_off | 134 | ,&lcd_sleep_after_backlight_off |
135 | # endif | 135 | # endif |
136 | # ifdef HAVE_BACKLIGHT_BRIGHTNESS | 136 | # ifdef HAVE_BACKLIGHT_BRIGHTNESS |