summaryrefslogtreecommitdiff
path: root/firmware/target/arm/as3525/sansa-clipv2
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2010-07-22 15:31:24 +0000
committerBertrik Sikken <bertrik@sikken.nl>2010-07-22 15:31:24 +0000
commit55a4520f076ffa5190aac1f24f584e759ffc62cf (patch)
treea7a78f2192dfd05082d8909608be6c029e6627a4 /firmware/target/arm/as3525/sansa-clipv2
parent10e79de27c6c71360bfe4e740098cb7e6ff64c2a (diff)
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-clipv2')
-rw-r--r--firmware/target/arm/as3525/sansa-clipv2/lcd-clip.h28
-rw-r--r--firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c14
2 files changed, 10 insertions, 32 deletions
diff --git a/firmware/target/arm/as3525/sansa-clipv2/lcd-clip.h b/firmware/target/arm/as3525/sansa-clipv2/lcd-clip.h
deleted file mode 100644
index 70bafe4212..0000000000
--- a/firmware/target/arm/as3525/sansa-clipv2/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;
-}
diff --git a/firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c b/firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c
index 14c8b77aec..d7266f72a0 100644
--- a/firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c
+++ b/firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c
@@ -26,7 +26,9 @@
#include "system.h"
#include "cpu.h"
-void lcd_hw_init(int *offset)
+#define LCD_DELAY 10
+
+int lcd_hw_init(void)
{
/* DBOP initialisation, do what OF does */
bitset32(&CCU_IO, 1<<12); /* ?? */
@@ -39,11 +41,9 @@ void lcd_hw_init(int *offset)
GPIOB_DIR |= (1<<2)|(1<<5);
GPIOB_PIN(5) = (1<<5);
- *offset = 2;
+ return 0;
}
-#define LCD_DELAY 10
-
void lcd_write_command(int byte)
{
volatile int i = 0;
@@ -84,3 +84,9 @@ void lcd_write_data(const fb_data* p_bytes, int count)
/* While push fifo is not empty */
while ((DBOP_STAT & (1<<10)) == 0);
}
+
+void lcd_enable_power(bool onoff)
+{
+ (void) onoff;
+}
+