From 41534a9acec37061bb130315e0dd5c57edcb7870 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 27 Jul 2007 12:40:36 +0000 Subject: 2nd gen: Correct LCD inversion state on init. * Fine tuned default contrast. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14025 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config-ipod1g2g.h | 2 +- firmware/target/arm/ipod/lcd-gray.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config-ipod1g2g.h index bfff2b2..b69d401 100644 --- a/firmware/export/config-ipod1g2g.h +++ b/firmware/export/config-ipod1g2g.h @@ -38,7 +38,7 @@ /* LCD contrast */ #define MIN_CONTRAST_SETTING 5 #define MAX_CONTRAST_SETTING 63 -#define DEFAULT_CONTRAST_SETTING 28 /* Match boot contrast */ +#define DEFAULT_CONTRAST_SETTING 30 /* Match boot contrast */ #define CONFIG_KEYPAD IPOD_1G2G_PAD diff --git a/firmware/target/arm/ipod/lcd-gray.c b/firmware/target/arm/ipod/lcd-gray.c index 7a60eb6..0a29550 100644 --- a/firmware/target/arm/ipod/lcd-gray.c +++ b/firmware/target/arm/ipod/lcd-gray.c @@ -72,6 +72,7 @@ static inline bool timer_check(int clock_start, int usecs) /* The backlight makes the LCD appear negative on the 1st/2nd gen */ static bool lcd_inverted = false; static bool lcd_backlit = false; +static void invert_display(void); #endif /* needed for flip */ @@ -134,7 +135,11 @@ static void lcd_cmd_and_data(unsigned cmd, unsigned data) /* LCD init */ void lcd_init_device(void) { +#ifdef HAVE_BACKLIGHT_INVERSION + invert_display(); +#else lcd_cmd_and_data(R_DISPLAY_CONTROL, 0x0009); +#endif lcd_set_flip(false); lcd_cmd_and_data(R_ENTRY_MODE, 0x0000); @@ -153,7 +158,7 @@ void lcd_init_device(void) int lcd_default_contrast(void) { #ifdef IPOD_1G2G - return 28; + return 30; #elif defined(IPOD_MINI) || defined(IPOD_MINI2G) || defined(IPOD_3G) return 42; #else -- cgit v1.1