diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2008-04-02 22:16:14 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2008-04-02 22:16:14 +0000 |
| commit | 5c87a98b97b9ab6bd9647bb0bb8d00f58d5f179b (patch) | |
| tree | b61feaa66d26f63df09f03d0cb6921ac80edf560 /firmware/backlight.c | |
| parent | cdae493f96150808007883a7fb0b582d46af4a1a (diff) | |
| download | rockbox-5c87a98b97b9ab6bd9647bb0bb8d00f58d5f179b.zip rockbox-5c87a98b97b9ab6bd9647bb0bb8d00f58d5f179b.tar.gz rockbox-5c87a98b97b9ab6bd9647bb0bb8d00f58d5f179b.tar.bz2 rockbox-5c87a98b97b9ab6bd9647bb0bb8d00f58d5f179b.tar.xz | |
Greyscale library: * Implement linearisation curve flipping for 1st/2nd Gen iPods (LCD is inverted when backlight is on, so the curve is also inverted). This needs a slight extension of is_backlight_on() functionality in the core. * Thorough recalibration of all reachable greyscale targets, and #ifdef cleanup. * Reduce on-target gamma a bit, because the displayable contrast range of a monochrome/greyscale isn't that high.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16936 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/backlight.c')
| -rw-r--r-- | firmware/backlight.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index 0f66fbf..19e6933 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c @@ -631,13 +631,13 @@ void backlight_off(void) queue_post(&backlight_queue, BACKLIGHT_OFF, 0); } -/* returns true when the backlight is on OR when it's set to always off */ -bool is_backlight_on(void) +/* returns true when the backlight is on, + * and optionally when it's set to always off. */ +bool is_backlight_on(bool ignore_always_off) { - if (backlight_timer || backlight_timeout <= 0) - return true; - else - return false; + return (backlight_timer > 0) /* countdown */ + || (backlight_timeout == 0) /* always on */ + || ((backlight_timeout < 0) && !ignore_always_off); } /* return value in ticks; 0 means always on, <0 means always off */ @@ -752,13 +752,13 @@ int remote_backlight_get_current_timeout(void) return remote_backlight_timeout; } -/* returns true when the backlight is on OR when it's set to always off */ -bool is_remote_backlight_on(void) +/* returns true when the backlight is on, and + * optionally when it's set to always off */ +bool is_remote_backlight_on(bool ignore_always_off) { - if (remote_backlight_timer != 0 || remote_backlight_timeout <= 0) - return true; - else - return false; + return (remote_backlight_timer > 0) /* countdown */ + || (remote_backlight_timeout == 0) /* always on */ + || ((remote_backlight_timeout < 0) && !ignore_always_off); } #endif /* HAVE_REMOTE_LCD */ |