diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-04-12 22:12:13 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-04-12 22:12:13 +0000 |
commit | 47bf6c5a5ad1fd9143ab87328793b285230f74a3 (patch) | |
tree | 5199f2225a3dfc438bb1c4c5e9906f14664dfa43 /apps/menus/display_menu.c | |
parent | 734278b7d1fde5e177c6842f49c16b9df8c353fa (diff) | |
download | rockbox-47bf6c5a5ad1fd9143ab87328793b285230f74a3.tar.gz rockbox-47bf6c5a5ad1fd9143ab87328793b285230f74a3.zip |
Moved archos backlight code to target tree. Changed old mutlivalue CONFIG_BACKLIGHT to a simple HAVE_BACKLIGHT.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13136 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/display_menu.c')
-rw-r--r-- | apps/menus/display_menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index 0189749b18..660c68e996 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include "lcd-remote.h" | 38 | #include "lcd-remote.h" |
39 | 39 | ||
40 | 40 | ||
41 | #if CONFIG_BACKLIGHT | 41 | #ifdef HAVE_BACKLIGHT |
42 | int filterfirstkeypress_callback(int action,const struct menu_item_ex *this_item) | 42 | int filterfirstkeypress_callback(int action,const struct menu_item_ex *this_item) |
43 | { | 43 | { |
44 | (void)this_item; | 44 | (void)this_item; |
@@ -77,7 +77,7 @@ int flipdisplay_callback(int action,const struct menu_item_ex *this_item) | |||
77 | 77 | ||
78 | /***********************************/ | 78 | /***********************************/ |
79 | /* LCD MENU */ | 79 | /* LCD MENU */ |
80 | #if CONFIG_BACKLIGHT | 80 | #ifdef HAVE_BACKLIGHT |
81 | MENUITEM_SETTING(backlight_timeout, &global_settings.backlight_timeout, NULL); | 81 | MENUITEM_SETTING(backlight_timeout, &global_settings.backlight_timeout, NULL); |
82 | #if CONFIG_CHARGING | 82 | #if CONFIG_CHARGING |
83 | MENUITEM_SETTING(backlight_timeout_plugged, | 83 | MENUITEM_SETTING(backlight_timeout_plugged, |
@@ -102,7 +102,7 @@ MENUITEM_SETTING(lcd_sleep_after_backlight_off, | |||
102 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 102 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
103 | MENUITEM_SETTING(brightness_item, &global_settings.brightness, NULL); | 103 | MENUITEM_SETTING(brightness_item, &global_settings.brightness, NULL); |
104 | #endif | 104 | #endif |
105 | #endif /* CONFIG_BACKLIGHT */ | 105 | #endif /* HAVE_BACKLIGHT */ |
106 | #ifdef HAVE_LCD_CONTRAST | 106 | #ifdef HAVE_LCD_CONTRAST |
107 | MENUITEM_SETTING(contrast, &global_settings.contrast, NULL); | 107 | MENUITEM_SETTING(contrast, &global_settings.contrast, NULL); |
108 | #endif | 108 | #endif |
@@ -173,7 +173,7 @@ MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), | |||
173 | /* now the actual menu */ | 173 | /* now the actual menu */ |
174 | MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), | 174 | MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), |
175 | NULL, Icon_Display_menu | 175 | NULL, Icon_Display_menu |
176 | #if CONFIG_BACKLIGHT | 176 | #ifdef HAVE_BACKLIGHT |
177 | ,&backlight_timeout | 177 | ,&backlight_timeout |
178 | # if CONFIG_CHARGING | 178 | # if CONFIG_CHARGING |
179 | ,&backlight_timeout_plugged | 179 | ,&backlight_timeout_plugged |
@@ -192,7 +192,7 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), | |||
192 | # ifdef HAVE_BACKLIGHT_BRIGHTNESS | 192 | # ifdef HAVE_BACKLIGHT_BRIGHTNESS |
193 | ,&brightness_item | 193 | ,&brightness_item |
194 | # endif | 194 | # endif |
195 | #endif /* CONFIG_BACKLIGHT */ | 195 | #endif /* HAVE_BACKLIGHT */ |
196 | #ifdef HAVE_LCD_CONTRAST | 196 | #ifdef HAVE_LCD_CONTRAST |
197 | ,&contrast | 197 | ,&contrast |
198 | #endif | 198 | #endif |