summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-03-29 12:43:50 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-03-29 12:43:50 +0000
commitcc1f6033de4ea103cfa5be7cc2ea268ed9c8343d (patch)
treeb1175d0e9e4563822b38f8c79c2c00969441a745
parent60cfc1ddff64055d037db5388b4942b3de96f52d (diff)
downloadrockbox-cc1f6033de4ea103cfa5be7cc2ea268ed9c8343d.tar.gz
rockbox-cc1f6033de4ea103cfa5be7cc2ea268ed9c8343d.zip
Clipv2/Clip+ : turn off backlight in 0x1b register
Rename clipv2 file git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25378 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/SOURCES2
-rw-r--r--firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c6
-rw-r--r--firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c (renamed from firmware/target/arm/as3525/sansa-clipv2/backlight-clip.c)4
3 files changed, 7 insertions, 5 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 5ecad19bba..0d845f2b3c 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1226,7 +1226,7 @@ target/arm/as3525/lcd-ssd1303.c
1226target/arm/as3525/sansa-clipv2/lcd-clipv2.c 1226target/arm/as3525/sansa-clipv2/lcd-clipv2.c
1227target/arm/as3525/sansa-clip/lcd-as-clip.S /* TODO for clipv2 */ 1227target/arm/as3525/sansa-clip/lcd-as-clip.S /* TODO for clipv2 */
1228target/arm/as3525/sansa-clipv2/button-clip.c 1228target/arm/as3525/sansa-clipv2/button-clip.c
1229target/arm/as3525/sansa-clipv2/backlight-clip.c 1229target/arm/as3525/sansa-clipv2/backlight-clipv2.c
1230#ifndef BOOTLOADER 1230#ifndef BOOTLOADER
1231target/arm/powermgmt-ascodec.c 1231target/arm/powermgmt-ascodec.c
1232target/arm/as3525/sansa-clip/powermgmt-clip.c 1232target/arm/as3525/sansa-clip/powermgmt-clip.c
diff --git a/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c b/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c
index 26d562f829..5f5662f787 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c
+++ b/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c
@@ -24,8 +24,6 @@
24#include "as3525v2.h" 24#include "as3525v2.h"
25#include "ascodec-target.h" 25#include "ascodec-target.h"
26 26
27/* FIXME : this is clipv2 code, not sure if it works the same on clip+ */
28
29void _backlight_on(void) 27void _backlight_on(void)
30{ 28{
31 ascodec_write(0x25, ascodec_read(0x25) | 2); /* lcd power */ 29 ascodec_write(0x25, ascodec_read(0x25) | 2); /* lcd power */
@@ -36,6 +34,8 @@ void _backlight_on(void)
36 34
37void _backlight_off(void) 35void _backlight_off(void)
38{ 36{
39 ascodec_write(0x25, ascodec_read(0x25) & ~2); /* lcd power */
40 lcd_enable(false); 37 lcd_enable(false);
38 ascodec_write(0x25, ascodec_read(0x25) & ~2); /* lcd power */
39 ascodec_write(0x1c, 8|1);
40 ascodec_write(0x1b, 0x00);
41} 41}
diff --git a/firmware/target/arm/as3525/sansa-clipv2/backlight-clip.c b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
index dc36b5237f..fad9e6acff 100644
--- a/firmware/target/arm/as3525/sansa-clipv2/backlight-clip.c
+++ b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
@@ -34,8 +34,10 @@ void _backlight_on(void)
34 34
35void _backlight_off(void) 35void _backlight_off(void)
36{ 36{
37 ascodec_write(0x25, ascodec_read(0x25) & ~2); /* lcd power */
38 lcd_enable(false); 37 lcd_enable(false);
38 ascodec_write(0x25, ascodec_read(0x25) & ~2); /* lcd power */
39 ascodec_write(0x1c, 8|1);
40 ascodec_write(0x1b, 0);
39} 41}
40 42
41void _buttonlight_on(void) 43void _buttonlight_on(void)