summaryrefslogtreecommitdiff
path: root/firmware/target
diff options
context:
space:
mode:
authorRani Hod <raenye@gmail.com>2006-07-31 19:13:21 +0000
committerRani Hod <raenye@gmail.com>2006-07-31 19:13:21 +0000
commitcc839a26711069399ec86cdb63b2d246fa3395d2 (patch)
treeded3154dc6447cc92e44c974fe6f40c558ff4d12 /firmware/target
parent14313485f76767f21fcd241d55f7cdb36167d6bf (diff)
downloadrockbox-cc839a26711069399ec86cdb63b2d246fa3395d2.zip
rockbox-cc839a26711069399ec86cdb63b2d246fa3395d2.tar.gz
rockbox-cc839a26711069399ec86cdb63b2d246fa3395d2.tar.bz2
rockbox-cc839a26711069399ec86cdb63b2d246fa3395d2.tar.xz
Applied FS#5734 by Michael Sevakis (X5 LCD contrast bugfix and
some #define fixup). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10388 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target')
-rwxr-xr-xfirmware/target/coldfire/iaudio/x5/lcd-x5.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/firmware/target/coldfire/iaudio/x5/lcd-x5.c b/firmware/target/coldfire/iaudio/x5/lcd-x5.c
index 7c155ea..c06521e 100755
--- a/firmware/target/coldfire/iaudio/x5/lcd-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/lcd-x5.c
@@ -139,17 +139,20 @@ inline void lcd_write_data(const unsigned short* p_bytes, int count)
int lcd_default_contrast(void)
{
- return 16;
+ return DEFAULT_CONTRAST_SETTING;
}
void lcd_set_contrast(int val)
{
- if (val >= 15) // val must'nt be 15 or 31
- ++val;
- if (val > 30)
- return;
-
- lcd_write_reg(0x0e, 0x201e + (val << 8));
+ /* Clamp val in range 0-14, 16-30 */
+ if (val < 1)
+ val = 0;
+ else if (val <= 15)
+ --val;
+ else if (val > 30)
+ val = 30;
+
+ lcd_write_reg(0x0e, 0x2018 + (val << 8));
}
void lcd_set_invert_display(bool yesno)