Clip+ LCD: support devices with a different controller

The new controller framebuffer (different from what is in clipv1/clipv2 and some clip+) has 128 columns, the old has 132 columns and is centered on the screen.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27257 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 5 insertions, 2 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 7be0199df1..3faa92da31 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 @@
 #include "system.h"
 #include "cpu.h"
 
-void lcd_hw_init(void)
+void lcd_hw_init(int *offset)
 {
     bitset32(&CGU_PERI, CGU_SSP_CLOCK_ENABLE);
 
@@ -37,8 +37,11 @@ void lcd_hw_init(void)
 
     GPIOA_DIR |= (1<<5);
     GPIOB_DIR |= (1<<2) | (1<<7);
+    GPIOB_DIR &= ~(1<<3);
     GPIOB_PIN(7) = 0;
     GPIOA_PIN(5) = (1<<5);
+
+    *offset = GPIOB_PIN(3) ? 0 : 2;
 }
 
 void lcd_write_command(int byte)
diff --git a/firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h b/firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h
index ae0309a949..70bafe4212 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h
+++ b/firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-void lcd_hw_init(void) INIT_ATTR;
+void lcd_hw_init(int *offset) INIT_ATTR;
 static inline void lcd_enable_power(bool onoff)
 {
     (void) onoff;