Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

backlight.c move some conditionals out to functions

Browse source 
de clutter bavklight_thread a bit

no functional changes

Change-Id: Iee3901a0abcea9bcf4fe364839af177e3791d980
This commit is contained in:
William Wilgus 2022-12-07 09:03:59 -05:00 committed by William Wilgus
parent 90bc76956c
commit a1e4385acb
1 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
firmware/backlight.c
View file

@ -123,7 +123,7 @@ static int backlight_timeout_plugged = 5*HZ;
#ifdef HAS_BUTTON_HOLD #ifdef HAS_BUTTON_HOLD
static int backlight_on_button_hold = 0; static int backlight_on_button_hold = 0;
#endif #endif
static void backlight_timeout_handler(void); static void backlight_handle_timeout(void);
#ifdef HAVE_BUTTON_LIGHT #ifdef HAVE_BUTTON_LIGHT
static int buttonlight_timer; static int buttonlight_timer;
@ -551,6 +551,17 @@ static void remote_backlight_update_state(void)
} }
#endif /* HAVE_REMOTE_LCD */ #endif /* HAVE_REMOTE_LCD */
static void backlight_queue_wait(struct queue_event *ev)
{
#if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \
|| (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG)
if (backlight_fading_state != NOT_FADING)
queue_wait_w_tmo(&backlight_queue, ev, FADE_DELAY);
else
#endif
queue_wait_w_tmo(&backlight_queue, ev, BACKLIGHT_THREAD_TIMEOUT);
}
void backlight_thread(void) void backlight_thread(void)
{ {
struct queue_event ev; struct queue_event ev;
@ -558,13 +569,7 @@ void backlight_thread(void)
while(1) while(1)
{ {
#if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ backlight_queue_wait(&ev);
|| (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG)
if (backlight_fading_state != NOT_FADING)
queue_wait_w_tmo(&backlight_queue, &ev, FADE_DELAY);
else
#endif
queue_wait_w_tmo(&backlight_queue, &ev, BACKLIGHT_THREAD_TIMEOUT);
switch(ev.id) switch(ev.id)
{ /* These events must always be processed */ { /* These events must always be processed */
#ifdef _BACKLIGHT_FADE_BOOST #ifdef _BACKLIGHT_FADE_BOOST
@ -686,24 +691,7 @@ void backlight_thread(void)
#endif #endif
break; break;
case SYS_TIMEOUT: case SYS_TIMEOUT:
#if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ backlight_handle_timeout();
|| (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG)
if (backlight_fading_state != NOT_FADING)
{
if ((_backlight_fade_step(backlight_fading_state)))
{ /* finished fading */
#ifdef HAVE_LCD_SLEEP
if (backlight_fading_state == FADING_DOWN)
{ /* start sleep countdown */
backlight_lcd_sleep_countdown(true);
}
#endif
backlight_fading_state = NOT_FADING;
}
}
else
#endif /* CONFIG_BACKLIGHT_FADING */
backlight_timeout_handler();
break; break;
} }
} /* end while */ } /* end while */
@ -763,6 +751,28 @@ static void backlight_timeout_handler(void)
} }
} }
static void backlight_handle_timeout(void)
{
#if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \
|| (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG)
if (backlight_fading_state != NOT_FADING)
{
if ((_backlight_fade_step(backlight_fading_state)))
{ /* finished fading */
#ifdef HAVE_LCD_SLEEP
if (backlight_fading_state == FADING_DOWN)
{ /* start sleep countdown */
backlight_lcd_sleep_countdown(true);
}
#endif
backlight_fading_state = NOT_FADING;
}
}
else
#endif /* CONFIG_BACKLIGHT_FADING */
backlight_timeout_handler();
}
void backlight_init(void) void backlight_init(void)
{ {
queue_init(&backlight_queue, true); queue_init(&backlight_queue, true);