diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-03-17 02:43:47 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-03-17 02:43:47 +0000 |
commit | b7739fbf1c838cb6e6e47f9d28d5b339828e1e30 (patch) | |
tree | f4011d6a14cd93fae2002eeccdd63e039ab44f7e /firmware/scroll_engine.c | |
parent | aad712d39f3cdeb95a22e56edb805554dd0a90e1 (diff) | |
download | rockbox-b7739fbf1c838cb6e6e47f9d28d5b339828e1e30.tar.gz rockbox-b7739fbf1c838cb6e6e47f9d28d5b339828e1e30.zip |
Rework lcd_enabled and lcd_set/call_enable hook
a) lcd_enabled() is now lcd_active(), and is available for HAVE_LCD_SLEEP only targets (e.g. ipod video) too. It was depandent on HAVE_LCD_ENALE only before
b) rename the hook accordingly, and implement the hook for other other targets too (e.g. the clip [the only mono target with lcd_enable/lcd_sleep yet, so the code is still in the lcd driver], ipod, fuze, c200)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20331 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/scroll_engine.c')
-rw-r--r-- | firmware/scroll_engine.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c index 6c7f7e6eb0..8d84c797e9 100644 --- a/firmware/scroll_engine.c +++ b/firmware/scroll_engine.c | |||
@@ -305,8 +305,8 @@ static void scroll_thread(void) | |||
305 | 305 | ||
306 | if (scroll & SCROLL_LCD) | 306 | if (scroll & SCROLL_LCD) |
307 | { | 307 | { |
308 | #ifdef HAVE_LCD_ENABLE | 308 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
309 | if (lcd_enabled()) | 309 | if (lcd_active()) |
310 | #endif | 310 | #endif |
311 | lcd_scroll_fn(); | 311 | lcd_scroll_fn(); |
312 | lcd_scroll_info.last_scroll = current_tick; | 312 | lcd_scroll_info.last_scroll = current_tick; |
@@ -328,8 +328,8 @@ static void scroll_thread(void) | |||
328 | while (1) | 328 | while (1) |
329 | { | 329 | { |
330 | sleep(lcd_scroll_info.ticks); | 330 | sleep(lcd_scroll_info.ticks); |
331 | #ifdef HAVE_LCD_ENABLE | 331 | #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) |
332 | if (lcd_enabled()) | 332 | if (lcd_active()) |
333 | #endif | 333 | #endif |
334 | lcd_scroll_fn(); | 334 | lcd_scroll_fn(); |
335 | } | 335 | } |