From cc1f6033de4ea103cfa5be7cc2ea268ed9c8343d Mon Sep 17 00:00:00 2001
From: Rafaël Carré <rafael.carre@gmail.com>
Date: Mon, 29 Mar 2010 12:43:50 +0000
Subject: 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
---
 .../arm/as3525/sansa-clipplus/backlight-clip.c     |  6 +--
 .../arm/as3525/sansa-clipv2/backlight-clip.c       | 51 ---------------------
 .../arm/as3525/sansa-clipv2/backlight-clipv2.c     | 53 ++++++++++++++++++++++
 3 files changed, 56 insertions(+), 54 deletions(-)
 delete mode 100644 firmware/target/arm/as3525/sansa-clipv2/backlight-clip.c
 create mode 100644 firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c

(limited to 'firmware/target')

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 @@
 #include "as3525v2.h"
 #include "ascodec-target.h"
 
-/* FIXME : this is clipv2 code, not sure if it works the same on clip+ */
-
 void _backlight_on(void)
 {
     ascodec_write(0x25, ascodec_read(0x25) | 2);    /* lcd power */
@@ -36,6 +34,8 @@ void _backlight_on(void)
 
 void _backlight_off(void)
 {
-    ascodec_write(0x25, ascodec_read(0x25) & ~2);    /* lcd power */
     lcd_enable(false);
+    ascodec_write(0x25, ascodec_read(0x25) & ~2);    /* lcd power */
+    ascodec_write(0x1c, 8|1);
+    ascodec_write(0x1b, 0x00);
 }
diff --git a/firmware/target/arm/as3525/sansa-clipv2/backlight-clip.c b/firmware/target/arm/as3525/sansa-clipv2/backlight-clip.c
deleted file mode 100644
index dc36b5237f..0000000000
--- a/firmware/target/arm/as3525/sansa-clipv2/backlight-clip.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright © 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 "backlight-target.h"
-#include "lcd.h"
-#include "as3525v2.h"
-#include "ascodec-target.h"
-
-void _backlight_on(void)
-{
-    ascodec_write(0x25, ascodec_read(0x25) | 2);    /* lcd power */
-    ascodec_write(0x1c, 8|1);
-    ascodec_write(0x1b, 0x90);
-    lcd_enable(true);
-}
-
-void _backlight_off(void)
-{
-    ascodec_write(0x25, ascodec_read(0x25) & ~2);    /* lcd power */
-    lcd_enable(false);
-}
-
-void _buttonlight_on(void)
-{
-    GPIOA_DIR |= (1<<5);
-    GPIOA_PIN(5) = (1<<5);  /* set pin a5 high */
-}
-
-void _buttonlight_off(void)
-{
-    GPIOA_DIR |= (1<<5);
-    GPIOA_PIN(5) = 0;       /* set pin a5 low */
-}
diff --git a/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
new file mode 100644
index 0000000000..fad9e6acff
--- /dev/null
+++ b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
@@ -0,0 +1,53 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright © 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 "backlight-target.h"
+#include "lcd.h"
+#include "as3525v2.h"
+#include "ascodec-target.h"
+
+void _backlight_on(void)
+{
+    ascodec_write(0x25, ascodec_read(0x25) | 2);    /* lcd power */
+    ascodec_write(0x1c, 8|1);
+    ascodec_write(0x1b, 0x90);
+    lcd_enable(true);
+}
+
+void _backlight_off(void)
+{
+    lcd_enable(false);
+    ascodec_write(0x25, ascodec_read(0x25) & ~2);    /* lcd power */
+    ascodec_write(0x1c, 8|1);
+    ascodec_write(0x1b, 0);
+}
+
+void _buttonlight_on(void)
+{
+    GPIOA_DIR |= (1<<5);
+    GPIOA_PIN(5) = (1<<5);  /* set pin a5 high */
+}
+
+void _buttonlight_off(void)
+{
+    GPIOA_DIR |= (1<<5);
+    GPIOA_PIN(5) = 0;       /* set pin a5 low */
+}
-- 
cgit v1.2.3