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

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 @@
 #include "system.h"
 #include "cpu.h"
 
-void lcd_hw_init(int *offset)
+int lcd_hw_init(void)
 {
     bitset32(&CGU_PERI, CGU_SSP_CLOCK_ENABLE);
 
@@ -41,7 +41,7 @@ void lcd_hw_init(int *offset)
     GPIOB_PIN(7) = 0;
     GPIOA_PIN(5) = (1<<5);
 
-    *offset = GPIOB_PIN(3) ? 0 : 2;
+    return GPIOB_PIN(3) ? 1 : 0;
 }
 
 void lcd_write_command(int byte)
@@ -68,3 +68,9 @@ void lcd_write_data(const fb_data* p_bytes, int count)
         SSP_DATA = *p_bytes++;
     }
 }
+
+void lcd_enable_power(bool onoff)
+{
+    (void) onoff;
+}
+
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 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2008-2009 Rafaël Carré
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#include "config.h"
-
-void lcd_hw_init(int *offset) INIT_ATTR;
-static inline void lcd_enable_power(bool onoff)
-{
-    (void) onoff;
-}