diff options
author | Michael Chicoine <mc2739@gmail.com> | 2010-05-28 12:19:26 +0000 |
---|---|---|
committer | Michael Chicoine <mc2739@gmail.com> | 2010-05-28 12:19:26 +0000 |
commit | 0ae59df3fa49a31889d4889c5c8bad1c9519379a (patch) | |
tree | 7abd5881c63b137e1928f7c5be627e1cc8801138 /firmware/target/arm/as3525/sansa-e200v2 | |
parent | bdb6bf553596918d0d329670dcc8c370d645608e (diff) | |
download | rockbox-0ae59df3fa49a31889d4889c5c8bad1c9519379a.tar.gz rockbox-0ae59df3fa49a31889d4889c5c8bad1c9519379a.zip |
Simplify lcd invert
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26353 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/as3525/sansa-e200v2')
-rw-r--r-- | firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c index 5a4c58f5b3..438020fb68 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c +++ b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c | |||
@@ -79,11 +79,6 @@ static bool display_on = false; /* is the display turned on? */ | |||
79 | #define R_ENTRY_MODE_VERT 0x7038 | 79 | #define R_ENTRY_MODE_VERT 0x7038 |
80 | #define R_ENTRY_MODE_SOLID_VERT 0x1038 | 80 | #define R_ENTRY_MODE_SOLID_VERT 0x1038 |
81 | 81 | ||
82 | /* Reverse Flag */ | ||
83 | #define R_DISP_CONTROL_NORMAL 0x0004 | ||
84 | #define R_DISP_CONTROL_REV 0x0000 | ||
85 | static unsigned short r_disp_control_rev = R_DISP_CONTROL_NORMAL; | ||
86 | |||
87 | static inline void lcd_delay(int x) | 82 | static inline void lcd_delay(int x) |
88 | { | 83 | { |
89 | do { | 84 | do { |
@@ -148,12 +143,9 @@ void lcd_set_contrast(int val) | |||
148 | 143 | ||
149 | void lcd_set_invert_display(bool yesno) | 144 | void lcd_set_invert_display(bool yesno) |
150 | { | 145 | { |
151 | r_disp_control_rev = yesno ? R_DISP_CONTROL_REV : | ||
152 | R_DISP_CONTROL_NORMAL; | ||
153 | |||
154 | if (display_on) | 146 | if (display_on) |
155 | { | 147 | { |
156 | lcd_write_reg(R_DISP_CONTROL1, 0x0033 | r_disp_control_rev); | 148 | lcd_write_reg(R_DISP_CONTROL1, yesno ? 0x33 : 0x37); |
157 | } | 149 | } |
158 | 150 | ||
159 | } | 151 | } |
@@ -195,7 +187,7 @@ static void _display_on(void) | |||
195 | lcd_write_reg(R_COMPARE_REG2, 0); | 187 | lcd_write_reg(R_COMPARE_REG2, 0); |
196 | 188 | ||
197 | /* GON = 0, DTE = 0, D1-0 = 00b */ | 189 | /* GON = 0, DTE = 0, D1-0 = 00b */ |
198 | lcd_write_reg(R_DISP_CONTROL1, 0x0000 | r_disp_control_rev); | 190 | lcd_write_reg(R_DISP_CONTROL1, 0x0000); |
199 | 191 | ||
200 | /* Front porch lines: 2; Back porch lines: 2; */ | 192 | /* Front porch lines: 2; Back porch lines: 2; */ |
201 | lcd_write_reg(R_DISP_CONTROL2, 0x0203); | 193 | lcd_write_reg(R_DISP_CONTROL2, 0x0203); |
@@ -269,7 +261,7 @@ static void _display_on(void) | |||
269 | lcd_write_reg(R_1ST_SCR_DRV_POS, (LCD_HEIGHT-1) << 8); | 261 | lcd_write_reg(R_1ST_SCR_DRV_POS, (LCD_HEIGHT-1) << 8); |
270 | lcd_write_reg(R_2ND_SCR_DRV_POS, (LCD_HEIGHT-1) << 8); | 262 | lcd_write_reg(R_2ND_SCR_DRV_POS, (LCD_HEIGHT-1) << 8); |
271 | 263 | ||
272 | lcd_write_reg(R_DISP_CONTROL1, 0x0033 | r_disp_control_rev); | 264 | lcd_write_reg(R_DISP_CONTROL1, 0x0037); |
273 | 265 | ||
274 | display_on = true; /* must be done before calling lcd_update() */ | 266 | display_on = true; /* must be done before calling lcd_update() */ |
275 | lcd_update(); | 267 | lcd_update(); |