From cc839a26711069399ec86cdb63b2d246fa3395d2 Mon Sep 17 00:00:00 2001 From: Rani Hod Date: Mon, 31 Jul 2006 19:13:21 +0000 Subject: 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 --- apps/settings.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'apps/settings.h') diff --git a/apps/settings.h b/apps/settings.h index d32b58a..983e589 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -200,6 +200,13 @@ extern unsigned char vp_dummy[VIRT_SIZE]; /* get the string ID from a virtual pointer, -1 if not virtual */ #define P2ID(p) ((p>=VIRT_PTR && p<=VIRT_PTR+VIRT_SIZE) ? p-VIRT_PTR : -1) +/* !defined(HAVE_LCD_COLOR) implies HAVE_LCD_CONTRAST with default 40. + Explicitly define HAVE_LCD_CONTRAST in config file for newer ports for + simplicity. */ +#if !defined(HAVE_LCD_COLOR) +#define HAVE_LCD_CONTRAST +#define DEFAULT_CONTRAST_SETTING 40 +#endif struct user_settings { @@ -274,7 +281,7 @@ struct user_settings /* device settings */ -#if !defined(HAVE_LCD_COLOR) || defined(IAUDIO_X5) +#ifdef HAVE_LCD_CONTRAST int contrast; /* lcd contrast */ #endif bool invert; /* invert display */ @@ -571,10 +578,10 @@ extern long lasttime; extern const char rec_base_directory[]; /* system defines */ - #ifdef IAUDIO_X5 -#define MIN_CONTRAST_SETTING 0 -#define MAX_CONTRAST_SETTING 29 +#define MIN_CONTRAST_SETTING 1 +#define MAX_CONTRAST_SETTING 30 +#define DEFAULT_CONTRAST_SETTING 19 #elif defined HAVE_LCD_CHARCELLS #define MIN_CONTRAST_SETTING 5 #define MAX_CONTRAST_SETTING 31 -- cgit v1.1