diff options
-rw-r--r-- | apps/menus/settings_menu.c | 4 | ||||
-rw-r--r-- | apps/settings.c | 2 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/settings_list.c | 6 | ||||
-rw-r--r-- | firmware/backlight.c | 50 | ||||
-rw-r--r-- | firmware/drivers/button.c | 2 | ||||
-rw-r--r-- | firmware/export/backlight.h | 6 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h | 6 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/backlight-c200_e200.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/backlight-target.h | 4 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/button-e200.c | 2 |
14 files changed, 51 insertions, 51 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 9a4079f1d0..8adcfe9b7a 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -337,7 +337,7 @@ MENUITEM_SETTING(car_adapter_mode, &global_settings.car_adapter_mode, NULL); | |||
337 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); | 337 | MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL); |
338 | 338 | ||
339 | #ifdef HAVE_BUTTON_LIGHT | 339 | #ifdef HAVE_BUTTON_LIGHT |
340 | MENUITEM_SETTING(button_light_timeout, &global_settings.button_light_timeout, NULL); | 340 | MENUITEM_SETTING(buttonlight_timeout, &global_settings.buttonlight_timeout, NULL); |
341 | #endif | 341 | #endif |
342 | 342 | ||
343 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 343 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
@@ -371,7 +371,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), | |||
371 | &car_adapter_mode, | 371 | &car_adapter_mode, |
372 | #endif | 372 | #endif |
373 | #ifdef HAVE_BUTTON_LIGHT | 373 | #ifdef HAVE_BUTTON_LIGHT |
374 | &button_light_timeout, | 374 | &buttonlight_timeout, |
375 | #endif | 375 | #endif |
376 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 376 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
377 | &buttonlight_brightness | 377 | &buttonlight_brightness |
diff --git a/apps/settings.c b/apps/settings.c index 26036c8948..6656b84552 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -713,7 +713,7 @@ void settings_apply(void) | |||
713 | buttonlight_set_brightness(global_settings.buttonlight_brightness); | 713 | buttonlight_set_brightness(global_settings.buttonlight_brightness); |
714 | #endif | 714 | #endif |
715 | #ifdef HAVE_BUTTON_LIGHT | 715 | #ifdef HAVE_BUTTON_LIGHT |
716 | button_backlight_set_timeout(global_settings.button_light_timeout); | 716 | buttonlight_set_timeout(global_settings.buttonlight_timeout); |
717 | #endif | 717 | #endif |
718 | #ifndef HAVE_FLASH_STORAGE | 718 | #ifndef HAVE_FLASH_STORAGE |
719 | ata_spindown(global_settings.disk_spindown); | 719 | ata_spindown(global_settings.disk_spindown); |
diff --git a/apps/settings.h b/apps/settings.h index ee8fd48831..7399f62b1e 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -739,7 +739,7 @@ struct user_settings | |||
739 | unsigned char colors_file[MAX_FILENAME+1]; | 739 | unsigned char colors_file[MAX_FILENAME+1]; |
740 | #endif | 740 | #endif |
741 | #ifdef HAVE_BUTTON_LIGHT | 741 | #ifdef HAVE_BUTTON_LIGHT |
742 | int button_light_timeout; | 742 | int buttonlight_timeout; |
743 | #endif | 743 | #endif |
744 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 744 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
745 | int buttonlight_brightness; | 745 | int buttonlight_brightness; |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 7981f279ff..a409d51df1 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -711,7 +711,7 @@ const struct settings_list settings[] = { | |||
711 | TALK_ID(7, UNIT_SEC), TALK_ID(8, UNIT_SEC), TALK_ID(9, UNIT_SEC), | 711 | TALK_ID(7, UNIT_SEC), TALK_ID(8, UNIT_SEC), TALK_ID(9, UNIT_SEC), |
712 | TALK_ID(10, UNIT_SEC), TALK_ID(15, UNIT_SEC), TALK_ID(20, UNIT_SEC), | 712 | TALK_ID(10, UNIT_SEC), TALK_ID(15, UNIT_SEC), TALK_ID(20, UNIT_SEC), |
713 | TALK_ID(25, UNIT_SEC), TALK_ID(30, UNIT_SEC), TALK_ID(45, UNIT_SEC), | 713 | TALK_ID(25, UNIT_SEC), TALK_ID(30, UNIT_SEC), TALK_ID(45, UNIT_SEC), |
714 | TALK_ID(60, UNIT_SEC), TALK_ID(90, UNIT_SEC), TALK_ID(2, UNIT_MIN), | 714 | TALK_ID(60, UNIT_SEC), TALK_ID(90, UNIT_SEC), TALK_ID(2, UNIT_MIN), |
715 | TALK_ID(3, UNIT_MIN), TALK_ID(5, UNIT_MIN), TALK_ID(10, UNIT_MIN), | 715 | TALK_ID(3, UNIT_MIN), TALK_ID(5, UNIT_MIN), TALK_ID(10, UNIT_MIN), |
716 | TALK_ID(20, UNIT_MIN), TALK_ID(45, UNIT_MIN), TALK_ID(90, UNIT_MIN)), | 716 | TALK_ID(20, UNIT_MIN), TALK_ID(45, UNIT_MIN), TALK_ID(90, UNIT_MIN)), |
717 | STRINGCHOICE_SETTING(0, peak_meter_hold, LANG_PM_PEAK_HOLD, 3, | 717 | STRINGCHOICE_SETTING(0, peak_meter_hold, LANG_PM_PEAK_HOLD, 3, |
@@ -1254,11 +1254,11 @@ const struct settings_list settings[] = { | |||
1254 | THEME_DIR "/", ".colours", MAX_FILENAME+1), | 1254 | THEME_DIR "/", ".colours", MAX_FILENAME+1), |
1255 | #endif | 1255 | #endif |
1256 | #ifdef HAVE_BUTTON_LIGHT | 1256 | #ifdef HAVE_BUTTON_LIGHT |
1257 | INT_SETTING_W_CFGVALS(F_FLIPLIST, button_light_timeout, | 1257 | INT_SETTING_W_CFGVALS(F_FLIPLIST, buttonlight_timeout, |
1258 | LANG_BUTTONLIGHT_TIMEOUT, 6, | 1258 | LANG_BUTTONLIGHT_TIMEOUT, 6, |
1259 | "button light timeout", backlight_times_conf, UNIT_SEC, | 1259 | "button light timeout", backlight_times_conf, UNIT_SEC, |
1260 | 0, 18, 1, backlight_formatter, backlight_getlang, | 1260 | 0, 18, 1, backlight_formatter, backlight_getlang, |
1261 | button_backlight_set_timeout), | 1261 | buttonlight_set_timeout), |
1262 | #endif | 1262 | #endif |
1263 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 1263 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
1264 | INT_SETTING(0, buttonlight_brightness, LANG_BUTTONLIGHT_BRIGHTNESS, DEFAULT_BRIGHTNESS_SETTING, | 1264 | INT_SETTING(0, buttonlight_brightness, LANG_BUTTONLIGHT_BRIGHTNESS, DEFAULT_BRIGHTNESS_SETTING, |
diff --git a/firmware/backlight.c b/firmware/backlight.c index a0d08f1e83..7cbdeb45e8 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -108,66 +108,66 @@ static int backlight_on_button_hold = 0; | |||
108 | #endif | 108 | #endif |
109 | 109 | ||
110 | #ifdef HAVE_BUTTON_LIGHT | 110 | #ifdef HAVE_BUTTON_LIGHT |
111 | static int button_backlight_timer; | 111 | static int buttonlight_timer; |
112 | static int button_backlight_timeout = 5*HZ; | 112 | static int buttonlight_timeout = 5*HZ; |
113 | 113 | ||
114 | /* internal interface */ | 114 | /* internal interface */ |
115 | static void _button_backlight_on(void) | 115 | static void _buttonlight_on(void) |
116 | { | 116 | { |
117 | #ifndef SIMULATOR | 117 | #ifndef SIMULATOR |
118 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 118 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
119 | __button_backlight_dim(false); | 119 | __buttonlight_dim(false); |
120 | #else | 120 | #else |
121 | __button_backlight_on(); | 121 | __buttonlight_on(); |
122 | #endif | 122 | #endif |
123 | #endif | 123 | #endif |
124 | } | 124 | } |
125 | 125 | ||
126 | void _button_backlight_off(void) | 126 | void _buttonlight_off(void) |
127 | { | 127 | { |
128 | #ifndef SIMULATOR | 128 | #ifndef SIMULATOR |
129 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 129 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
130 | if(button_backlight_timeout>0) | 130 | if(buttonlight_timeout>0) |
131 | __button_backlight_dim(true); | 131 | __buttonlight_dim(true); |
132 | else | 132 | else |
133 | #endif | 133 | #endif |
134 | __button_backlight_off(); | 134 | __buttonlight_off(); |
135 | #endif | 135 | #endif |
136 | } | 136 | } |
137 | 137 | ||
138 | /* Update state of buttonlight according to timeout setting */ | 138 | /* Update state of buttonlight according to timeout setting */ |
139 | static void buttonlight_update_state(void) | 139 | static void buttonlight_update_state(void) |
140 | { | 140 | { |
141 | button_backlight_timer = button_backlight_timeout; | 141 | buttonlight_timer = buttonlight_timeout; |
142 | 142 | ||
143 | /* Buttonlight == OFF in the setting? */ | 143 | /* Buttonlight == OFF in the setting? */ |
144 | if (button_backlight_timer < 0) | 144 | if (buttonlight_timer < 0) |
145 | { | 145 | { |
146 | button_backlight_timer = 0; /* Disable the timeout */ | 146 | buttonlight_timer = 0; /* Disable the timeout */ |
147 | _button_backlight_off(); | 147 | _buttonlight_off(); |
148 | } | 148 | } |
149 | else | 149 | else |
150 | _button_backlight_on(); | 150 | _buttonlight_on(); |
151 | } | 151 | } |
152 | 152 | ||
153 | /* external interface */ | 153 | /* external interface */ |
154 | void button_backlight_on(void) | 154 | void buttonlight_on(void) |
155 | { | 155 | { |
156 | queue_remove_from_head(&backlight_queue, BUTTON_LIGHT_ON); | 156 | queue_remove_from_head(&backlight_queue, BUTTON_LIGHT_ON); |
157 | queue_post(&backlight_queue, BUTTON_LIGHT_ON, 0); | 157 | queue_post(&backlight_queue, BUTTON_LIGHT_ON, 0); |
158 | } | 158 | } |
159 | 159 | ||
160 | void button_backlight_off(void) | 160 | void buttonlight_off(void) |
161 | { | 161 | { |
162 | queue_post(&backlight_queue, BUTTON_LIGHT_OFF, 0); | 162 | queue_post(&backlight_queue, BUTTON_LIGHT_OFF, 0); |
163 | } | 163 | } |
164 | 164 | ||
165 | void button_backlight_set_timeout(int index) | 165 | void buttonlight_set_timeout(int index) |
166 | { | 166 | { |
167 | if((unsigned)index >= sizeof(backlight_timeout_value)) | 167 | if((unsigned)index >= sizeof(backlight_timeout_value)) |
168 | /* if given a weird value, use default */ | 168 | /* if given a weird value, use default */ |
169 | index = 6; | 169 | index = 6; |
170 | button_backlight_timeout = HZ * backlight_timeout_value[index]; | 170 | buttonlight_timeout = HZ * backlight_timeout_value[index]; |
171 | buttonlight_update_state(); | 171 | buttonlight_update_state(); |
172 | } | 172 | } |
173 | 173 | ||
@@ -543,8 +543,8 @@ void backlight_thread(void) | |||
543 | break; | 543 | break; |
544 | 544 | ||
545 | case BUTTON_LIGHT_OFF: | 545 | case BUTTON_LIGHT_OFF: |
546 | button_backlight_timer = 0; | 546 | buttonlight_timer = 0; |
547 | _button_backlight_off(); | 547 | _buttonlight_off(); |
548 | break; | 548 | break; |
549 | #endif | 549 | #endif |
550 | 550 | ||
@@ -597,12 +597,12 @@ static void backlight_tick(void) | |||
597 | } | 597 | } |
598 | #endif /* HAVE_REMOVE_LCD */ | 598 | #endif /* HAVE_REMOVE_LCD */ |
599 | #ifdef HAVE_BUTTON_LIGHT | 599 | #ifdef HAVE_BUTTON_LIGHT |
600 | if (button_backlight_timer) | 600 | if (buttonlight_timer) |
601 | { | 601 | { |
602 | button_backlight_timer--; | 602 | buttonlight_timer--; |
603 | if (button_backlight_timer == 0) | 603 | if (buttonlight_timer == 0) |
604 | { | 604 | { |
605 | button_backlight_off(); | 605 | buttonlight_off(); |
606 | } | 606 | } |
607 | } | 607 | } |
608 | #endif /* HAVE_BUTTON_LIGHT */ | 608 | #endif /* HAVE_BUTTON_LIGHT */ |
@@ -825,7 +825,7 @@ void backlight_init(void) | |||
825 | 825 | ||
826 | void backlight_on(void) {} | 826 | void backlight_on(void) {} |
827 | void backlight_off(void) {} | 827 | void backlight_off(void) {} |
828 | void button_backlight_on(void) {} | 828 | void buttonlight_on(void) {} |
829 | void backlight_set_timeout(int index) {(void)index;} | 829 | void backlight_set_timeout(int index) {(void)index;} |
830 | bool is_backlight_on(void) {return true;} | 830 | bool is_backlight_on(void) {return true;} |
831 | #ifdef HAVE_REMOTE_LCD | 831 | #ifdef HAVE_REMOTE_LCD |
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index 7ab78f6cb0..3daa08b2c3 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -259,7 +259,7 @@ static void button_tick(void) | |||
259 | { | 259 | { |
260 | backlight_on(); | 260 | backlight_on(); |
261 | #ifdef HAVE_BUTTON_LIGHT | 261 | #ifdef HAVE_BUTTON_LIGHT |
262 | button_backlight_on(); | 262 | buttonlight_on(); |
263 | #endif | 263 | #endif |
264 | } | 264 | } |
265 | 265 | ||
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h index a0e46d2ffe..8df45990fd 100644 --- a/firmware/export/backlight.h +++ b/firmware/export/backlight.h | |||
@@ -80,9 +80,9 @@ void buttonlight_set_brightness(int val); | |||
80 | #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ | 80 | #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ |
81 | 81 | ||
82 | #ifdef HAVE_BUTTON_LIGHT | 82 | #ifdef HAVE_BUTTON_LIGHT |
83 | void button_backlight_on(void); | 83 | void buttonlight_on(void); |
84 | void button_backlight_off(void); | 84 | void buttonlight_off(void); |
85 | void button_backlight_set_timeout(int index); | 85 | void buttonlight_set_timeout(int index); |
86 | #endif | 86 | #endif |
87 | 87 | ||
88 | #endif /* BACKLIGHT_H */ | 88 | #endif /* BACKLIGHT_H */ |
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c index d2beaeee87..c132be5f69 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | |||
@@ -328,17 +328,17 @@ static void led_control_service(void) | |||
328 | } | 328 | } |
329 | #endif /* BOOTLOADER */ | 329 | #endif /* BOOTLOADER */ |
330 | 330 | ||
331 | void __button_backlight_on(void) | 331 | void __buttonlight_on(void) |
332 | { | 332 | { |
333 | buttonlight_control = BUTTONLIGHT_CONTROL_ON; | 333 | buttonlight_control = BUTTONLIGHT_CONTROL_ON; |
334 | } | 334 | } |
335 | 335 | ||
336 | void __button_backlight_off(void) | 336 | void __buttonlight_off(void) |
337 | { | 337 | { |
338 | buttonlight_control = BUTTONLIGHT_CONTROL_OFF; | 338 | buttonlight_control = BUTTONLIGHT_CONTROL_OFF; |
339 | } | 339 | } |
340 | 340 | ||
341 | void __button_backlight_dim(bool dim_now) | 341 | void __buttonlight_dim(bool dim_now) |
342 | { | 342 | { |
343 | buttonlight_control = BUTTONLIGHT_CONTROL_IDLE; | 343 | buttonlight_control = BUTTONLIGHT_CONTROL_IDLE; |
344 | buttonlight_target = (dim_now == true) ? 0 : buttonlight_brightness; | 344 | buttonlight_target = (dim_now == true) ? 0 : buttonlight_brightness; |
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h index c51d8f20f0..0589557791 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h +++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h | |||
@@ -48,11 +48,11 @@ void __backlight_set_brightness(int brightness); | |||
48 | 48 | ||
49 | void __buttonlight_set_brightness(int brightness); | 49 | void __buttonlight_set_brightness(int brightness); |
50 | 50 | ||
51 | void __button_backlight_on(void); | 51 | void __buttonlight_on(void); |
52 | void __button_backlight_off(void); | 52 | void __buttonlight_off(void); |
53 | 53 | ||
54 | /* true: backlight fades off - false: backlight fades on */ | 54 | /* true: backlight fades off - false: backlight fades on */ |
55 | void __backlight_dim(bool dim); | 55 | void __backlight_dim(bool dim); |
56 | void __button_backlight_dim(bool dim_now); | 56 | void __buttonlight_dim(bool dim_now); |
57 | 57 | ||
58 | #endif | 58 | #endif |
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c index 5655d92ef8..4a818d6bfc 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c | |||
@@ -82,7 +82,7 @@ int button_read_device(void) | |||
82 | /* if the buttons dont agree twice in a row, then its none */ | 82 | /* if the buttons dont agree twice in a row, then its none */ |
83 | lastbutton = btn; | 83 | lastbutton = btn; |
84 | btn = BUTTON_NONE; | 84 | btn = BUTTON_NONE; |
85 | button_backlight_on(); | 85 | buttonlight_on(); |
86 | } | 86 | } |
87 | 87 | ||
88 | /* Check for hold first - exit if asserted with no button pressed */ | 88 | /* Check for hold first - exit if asserted with no button pressed */ |
@@ -107,7 +107,7 @@ int button_read_device(void) | |||
107 | 107 | ||
108 | if (buttons & (1 << 4)) | 108 | if (buttons & (1 << 4)) |
109 | btn |= BUTTON_A; | 109 | btn |= BUTTON_A; |
110 | button_backlight_on(); | 110 | buttonlight_on(); |
111 | } | 111 | } |
112 | 112 | ||
113 | /* the touchpad */ | 113 | /* the touchpad */ |
@@ -128,7 +128,7 @@ int button_read_device(void) | |||
128 | 128 | ||
129 | if (touchpad & (1 << 3)) | 129 | if (touchpad & (1 << 3)) |
130 | btn |= BUTTON_SELECT; | 130 | btn |= BUTTON_SELECT; |
131 | button_backlight_on(); | 131 | buttonlight_on(); |
132 | } | 132 | } |
133 | 133 | ||
134 | return btn; | 134 | return btn; |
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c index 7921e0ccd4..ac37908b05 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c | |||
@@ -64,7 +64,7 @@ void power_off(void) | |||
64 | { | 64 | { |
65 | /* turn off backlight and wait for 1 second */ | 65 | /* turn off backlight and wait for 1 second */ |
66 | __backlight_off(); | 66 | __backlight_off(); |
67 | __button_backlight_off(); | 67 | __buttonlight_off(); |
68 | sleep(HZ); | 68 | sleep(HZ); |
69 | /* set SLEEP bit to on in CLKCON to turn off */ | 69 | /* set SLEEP bit to on in CLKCON to turn off */ |
70 | CLKCON |=(1<<3); | 70 | CLKCON |=(1<<3); |
diff --git a/firmware/target/arm/sandisk/backlight-c200_e200.c b/firmware/target/arm/sandisk/backlight-c200_e200.c index 0dd4a2122b..f7835e1bd9 100644 --- a/firmware/target/arm/sandisk/backlight-c200_e200.c +++ b/firmware/target/arm/sandisk/backlight-c200_e200.c | |||
@@ -51,7 +51,7 @@ void __backlight_off(void) | |||
51 | } | 51 | } |
52 | 52 | ||
53 | #ifdef HAVE_BUTTON_LIGHT | 53 | #ifdef HAVE_BUTTON_LIGHT |
54 | void __button_backlight_on(void) | 54 | void __buttonlight_on(void) |
55 | { | 55 | { |
56 | GPIOG_OUTPUT_VAL |= 0x80; | 56 | GPIOG_OUTPUT_VAL |= 0x80; |
57 | #ifdef SANSA_C200 | 57 | #ifdef SANSA_C200 |
@@ -59,7 +59,7 @@ void __button_backlight_on(void) | |||
59 | #endif | 59 | #endif |
60 | } | 60 | } |
61 | 61 | ||
62 | void __button_backlight_off(void) | 62 | void __buttonlight_off(void) |
63 | { | 63 | { |
64 | GPIOG_OUTPUT_VAL &=~ 0x80; | 64 | GPIOG_OUTPUT_VAL &=~ 0x80; |
65 | #ifdef SANSA_C200 | 65 | #ifdef SANSA_C200 |
diff --git a/firmware/target/arm/sandisk/backlight-target.h b/firmware/target/arm/sandisk/backlight-target.h index 1b1a6ad4e1..53a87fbbb3 100644 --- a/firmware/target/arm/sandisk/backlight-target.h +++ b/firmware/target/arm/sandisk/backlight-target.h | |||
@@ -26,7 +26,7 @@ void __backlight_set_brightness(int brightness); | |||
26 | int __backlight_is_on(void); | 26 | int __backlight_is_on(void); |
27 | 27 | ||
28 | #ifdef HAVE_BUTTON_LIGHT | 28 | #ifdef HAVE_BUTTON_LIGHT |
29 | void __button_backlight_on(void); | 29 | void __buttonlight_on(void); |
30 | void __button_backlight_off(void); | 30 | void __buttonlight_off(void); |
31 | #endif | 31 | #endif |
32 | #endif | 32 | #endif |
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-e200.c b/firmware/target/arm/sandisk/sansa-e200/button-e200.c index f6a01c863c..5988e165a7 100644 --- a/firmware/target/arm/sandisk/sansa-e200/button-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/button-e200.c | |||
@@ -196,7 +196,7 @@ void clickwheel_int(void) | |||
196 | than every 1/4 second*/ | 196 | than every 1/4 second*/ |
197 | next_backlight_on = current_tick + HZ/4; | 197 | next_backlight_on = current_tick + HZ/4; |
198 | backlight_on(); | 198 | backlight_on(); |
199 | button_backlight_on(); | 199 | buttonlight_on(); |
200 | reset_poweroff_timer(); | 200 | reset_poweroff_timer(); |
201 | } | 201 | } |
202 | 202 | ||