diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2010-07-22 15:31:24 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2010-07-22 15:31:24 +0000 |
commit | 55a4520f076ffa5190aac1f24f584e759ffc62cf (patch) | |
tree | a7a78f2192dfd05082d8909608be6c029e6627a4 /firmware/target/arm/as3525/sansa-clipplus | |
parent | 10e79de27c6c71360bfe4e740098cb7e6ff64c2a (diff) | |
download | rockbox-55a4520f076ffa5190aac1f24f584e759ffc62cf.tar.gz rockbox-55a4520f076ffa5190aac1f24f584e759ffc62cf.zip |
Sansa clip+: fix display brightness for players with newer OLED controller type (and reorganise the variant detection a bit in the process)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27522 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/as3525/sansa-clipplus')
-rw-r--r-- | firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c | 10 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h | 28 |
2 files changed, 8 insertions, 30 deletions
diff --git a/firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c b/firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c index 3faa92da31..ac7b77d772 100644 --- a/firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c +++ b/firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "system.h" | 26 | #include "system.h" |
27 | #include "cpu.h" | 27 | #include "cpu.h" |
28 | 28 | ||
29 | void lcd_hw_init(int *offset) | 29 | int lcd_hw_init(void) |
30 | { | 30 | { |
31 | bitset32(&CGU_PERI, CGU_SSP_CLOCK_ENABLE); | 31 | bitset32(&CGU_PERI, CGU_SSP_CLOCK_ENABLE); |
32 | 32 | ||
@@ -41,7 +41,7 @@ void lcd_hw_init(int *offset) | |||
41 | GPIOB_PIN(7) = 0; | 41 | GPIOB_PIN(7) = 0; |
42 | GPIOA_PIN(5) = (1<<5); | 42 | GPIOA_PIN(5) = (1<<5); |
43 | 43 | ||
44 | *offset = GPIOB_PIN(3) ? 0 : 2; | 44 | return GPIOB_PIN(3) ? 1 : 0; |
45 | } | 45 | } |
46 | 46 | ||
47 | void lcd_write_command(int byte) | 47 | void lcd_write_command(int byte) |
@@ -68,3 +68,9 @@ void lcd_write_data(const fb_data* p_bytes, int count) | |||
68 | SSP_DATA = *p_bytes++; | 68 | SSP_DATA = *p_bytes++; |
69 | } | 69 | } |
70 | } | 70 | } |
71 | |||
72 | void lcd_enable_power(bool onoff) | ||
73 | { | ||
74 | (void) onoff; | ||
75 | } | ||
76 | |||
diff --git a/firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h b/firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h deleted file mode 100644 index 70bafe4212..0000000000 --- a/firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2008-2009 Rafaël Carré | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | |||
22 | #include "config.h" | ||
23 | |||
24 | void lcd_hw_init(int *offset) INIT_ATTR; | ||
25 | static inline void lcd_enable_power(bool onoff) | ||
26 | { | ||
27 | (void) onoff; | ||
28 | } | ||