From 58825f6e7391a237be85e63bee08f7a0bb66dc38 Mon Sep 17 00:00:00 2001
From: Michael Sevakis <jethead71@rockbox.org>
Date: Fri, 10 Nov 2006 18:47:41 +0000
Subject: Coldfire targets: Got the rest of the coldfire code out of
 backlight.c. Straightened up related items in configs and split
 backlight_set_brightness between the normal and boot/sim builds like the
 other functions. Should really have done all that in the first place.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11502 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/target/coldfire/iaudio/x5/backlight-target.h | 2 ++
 firmware/target/coldfire/iaudio/x5/backlight-x5.c     | 7 +++++++
 firmware/target/coldfire/iaudio/x5/pcf50606-x5.c      | 9 ---------
 firmware/target/coldfire/iriver/backlight-target.h    | 2 ++
 firmware/target/coldfire/iriver/h100/backlight-h100.c | 7 +++++++
 firmware/target/coldfire/iriver/h300/backlight-h300.c | 7 +++++++
 6 files changed, 25 insertions(+), 9 deletions(-)

(limited to 'firmware/target/coldfire')

diff --git a/firmware/target/coldfire/iaudio/x5/backlight-target.h b/firmware/target/coldfire/iaudio/x5/backlight-target.h
index e982e656d6..e6feb8bc0c 100755
--- a/firmware/target/coldfire/iaudio/x5/backlight-target.h
+++ b/firmware/target/coldfire/iaudio/x5/backlight-target.h
@@ -19,6 +19,8 @@
 #ifndef BACKLIGHT_TARGET_H
 #define BACKLIGHT_TARGET_H
 
+#define __BACKLIGHT_INIT
+void __backlight_init(void);
 void __backlight_on(void);
 void __backlight_off(void);
 void __backlight_set_brightness(int val);
diff --git a/firmware/target/coldfire/iaudio/x5/backlight-x5.c b/firmware/target/coldfire/iaudio/x5/backlight-x5.c
index 9d02c35988..9b50993d90 100755
--- a/firmware/target/coldfire/iaudio/x5/backlight-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/backlight-x5.c
@@ -20,9 +20,16 @@
 #include "cpu.h"
 #include "system.h"
 #include "backlight.h"
+#include "backlight-target.h"
 #include "pcf50606.h"
 #include "lcd.h"
 
+void __backlight_init(void)
+{
+    __backlight_set_brightness(DEFAULT_BRIGHTNESS_SETTING);
+    __backlight_on();
+}
+
 void __backlight_on(void)
 {
     int level;
diff --git a/firmware/target/coldfire/iaudio/x5/pcf50606-x5.c b/firmware/target/coldfire/iaudio/x5/pcf50606-x5.c
index 59140667ef..b8128617c2 100644
--- a/firmware/target/coldfire/iaudio/x5/pcf50606-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/pcf50606-x5.c
@@ -81,15 +81,6 @@ void pcf50606_init(void)
     pcf50606_write(0x39, 0x00); /* GPOOD0 = green led OFF */
     pcf50606_write(0x3a, 0x00); /* GPOOD1 = red led OFF */
 
-    pcf50606_write(0x35, 0x11); /* Backlight PWM = 512Hz, 8/16, Active */
-#ifdef BOOTLOADER
-    /* Backlight starts OFF in bootloader */
-    pcf50606_write(0x38, 0x80); /* Backlight OFF, GPO1INV=1, GPO1ACT=011 */
-#else
-    /* Keep backlight on when changing to firmware */
-    pcf50606_write(0x38, 0xb0); /* Backlight ON, GPO1INV=1, GPO1ACT=011 */
-#endif
-
     /* Accessory detect */
     pcf50606_write(0x33, 0x8e); /* ACDAPE=1, THRSHLD=2.40V */
 
diff --git a/firmware/target/coldfire/iriver/backlight-target.h b/firmware/target/coldfire/iriver/backlight-target.h
index 086ab02761..ac146eac83 100644
--- a/firmware/target/coldfire/iriver/backlight-target.h
+++ b/firmware/target/coldfire/iriver/backlight-target.h
@@ -19,6 +19,8 @@
 #ifndef BACKLIGHT_TARGET_H
 #define BACKLIGHT_TARGET_H
 
+#define __BACKLIGHT_INIT
+void __backlight_init(void);
 void __backlight_on(void);
 void __backlight_off(void);
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
diff --git a/firmware/target/coldfire/iriver/h100/backlight-h100.c b/firmware/target/coldfire/iriver/h100/backlight-h100.c
index 8ceac8a6ff..62c24dc861 100644
--- a/firmware/target/coldfire/iriver/h100/backlight-h100.c
+++ b/firmware/target/coldfire/iriver/h100/backlight-h100.c
@@ -24,6 +24,13 @@
 #include "backlight.h"
 #include "lcd.h"
 
+void __backlight_init(void)
+{
+    or_l(0x00020000, &GPIO1_ENABLE);
+    or_l(0x00020000, &GPIO1_FUNCTION);
+    and_l(~0x00020000, &GPIO1_OUT);  /* Start with the backlight ON */
+}
+
 void __backlight_on(void)
 {
     and_l(~0x00020000, &GPIO1_OUT);
diff --git a/firmware/target/coldfire/iriver/h300/backlight-h300.c b/firmware/target/coldfire/iriver/h300/backlight-h300.c
index 50bd757612..ef1d6d344d 100644
--- a/firmware/target/coldfire/iriver/h300/backlight-h300.c
+++ b/firmware/target/coldfire/iriver/h300/backlight-h300.c
@@ -25,6 +25,13 @@
 #include "pcf50606.h"
 #include "lcd.h"
 
+void __backlight_init(void)
+{
+    or_l(0x00020000, &GPIO1_ENABLE);
+    or_l(0x00020000, &GPIO1_FUNCTION);
+    or_l(0x00020000, &GPIO1_OUT);  /* Start with the backlight ON */
+}
+
 void __backlight_on(void)
 {
     lcd_enable(true);
-- 
cgit v1.2.3