mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-09 05:05:20 -05:00
Fix red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20696 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
73e1bad355
commit
ab1e97aea8
1 changed files with 8 additions and 0 deletions
|
|
@ -182,11 +182,13 @@ static inline unsigned bcm_read32(unsigned address)
|
||||||
return BCM_DATA32; /* read value */
|
return BCM_DATA32; /* read value */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_LCD_SLEEP
|
||||||
static void continue_lcd_awake(void)
|
static void continue_lcd_awake(void)
|
||||||
{
|
{
|
||||||
lcd_state.waking = false;
|
lcd_state.waking = false;
|
||||||
wakeup_signal(&(lcd_state.initwakeup));
|
wakeup_signal(&(lcd_state.initwakeup));
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef BOOTLOADER
|
#ifndef BOOTLOADER
|
||||||
static void lcd_tick(void)
|
static void lcd_tick(void)
|
||||||
|
|
@ -210,15 +212,19 @@ static void lcd_tick(void)
|
||||||
BCM_CONTROL = 0x31;
|
BCM_CONTROL = 0x31;
|
||||||
lcd_state.update_timeout = current_tick + BCM_UPDATE_TIMEOUT;
|
lcd_state.update_timeout = current_tick + BCM_UPDATE_TIMEOUT;
|
||||||
lcd_state.state = LCD_UPDATING;
|
lcd_state.state = LCD_UPDATING;
|
||||||
|
#ifdef HAVE_LCD_SLEEP
|
||||||
if (lcd_state.waking)
|
if (lcd_state.waking)
|
||||||
continue_lcd_awake();
|
continue_lcd_awake();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else if ((lcd_state.state == LCD_UPDATING) && !bcm_is_busy)
|
else if ((lcd_state.state == LCD_UPDATING) && !bcm_is_busy)
|
||||||
{
|
{
|
||||||
/* Update finished properly and no new update pending. */
|
/* Update finished properly and no new update pending. */
|
||||||
lcd_state.state = LCD_IDLE;
|
lcd_state.state = LCD_IDLE;
|
||||||
|
#ifdef HAVE_LCD_SLEEP
|
||||||
if (lcd_state.waking)
|
if (lcd_state.waking)
|
||||||
continue_lcd_awake();
|
continue_lcd_awake();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if NUM_CORES > 1
|
#if NUM_CORES > 1
|
||||||
|
|
@ -259,8 +265,10 @@ static void lcd_unblock_and_update(void)
|
||||||
BCM_CONTROL = 0x31;
|
BCM_CONTROL = 0x31;
|
||||||
lcd_state.update_timeout = current_tick + BCM_UPDATE_TIMEOUT;
|
lcd_state.update_timeout = current_tick + BCM_UPDATE_TIMEOUT;
|
||||||
lcd_state.state = LCD_UPDATING;
|
lcd_state.state = LCD_UPDATING;
|
||||||
|
#ifdef HAVE_LCD_SLEEP
|
||||||
if (lcd_state.waking)
|
if (lcd_state.waking)
|
||||||
continue_lcd_awake();
|
continue_lcd_awake();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue