7 files changed, 128 insertions, 25 deletions

diff --git a/firmware/target/arm/ipod/1g2g/backlight-1g2g.c b/firmware/target/arm/ipod/1g2g/backlight-1g2g.c
index 88d638f4e3..688fc2a213 100644
--- a/firmware/target/arm/ipod/1g2g/backlight-1g2g.c
+++ b/firmware/target/arm/ipod/1g2g/backlight-1g2g.c
@@ -21,13 +21,13 @@
 #include "backlight.h"
 #include "lcd.h"
 
-void __backlight_on(void)
+void _backlight_on(void)
 {
     outl(inl(0xc0001000) | 0x02, 0xc0001000);
     lcd_set_backlight_inversion(true);
 }
 
-void __backlight_off(void)
+void _backlight_off(void)
 {
     outl(inl(0xc0001000) & ~0x02, 0xc0001000);
     lcd_set_backlight_inversion(false);
diff --git a/firmware/target/arm/ipod/1g2g/backlight-target.h b/firmware/target/arm/ipod/1g2g/backlight-target.h
index a1a9785abc..31a21a4d27 100644
--- a/firmware/target/arm/ipod/1g2g/backlight-target.h
+++ b/firmware/target/arm/ipod/1g2g/backlight-target.h
@@ -19,8 +19,8 @@
 #ifndef BACKLIGHT_TARGET_H
 #define BACKLIGHT_TARGET_H
 
-#define __backlight_init() false
-void __backlight_on(void);
-void __backlight_off(void);
+#define _backlight_init() false
+void _backlight_on(void);
+void _backlight_off(void);
 
 #endif
diff --git a/firmware/target/arm/ipod/3g/backlight-3g.c b/firmware/target/arm/ipod/3g/backlight-3g.c
index 251c722dae..41f8ba37cb 100644
--- a/firmware/target/arm/ipod/3g/backlight-3g.c
+++ b/firmware/target/arm/ipod/3g/backlight-3g.c
@@ -20,12 +20,12 @@
 #include "system.h"
 #include "backlight.h"
 
-inline void __backlight_on(void)
+void _backlight_on(void)
 {
     outl(inl(0xc0001000) | 0x02, 0xc0001000);
 }
 
-inline void __backlight_off(void)
+void _backlight_off(void)
 {
     outl(inl(0xc0001000) & ~0x02, 0xc0001000);
 }
diff --git a/firmware/target/arm/ipod/backlight-4g_color.c b/firmware/target/arm/ipod/backlight-4g_color.c
index 3097d8690b..28deba46b5 100644
--- a/firmware/target/arm/ipod/backlight-4g_color.c
+++ b/firmware/target/arm/ipod/backlight-4g_color.c
@@ -31,16 +31,16 @@
 #include "timer.h"
 #include "backlight.h"
 
-inline void __backlight_on(void)
+void _backlight_on(void)
 {
     /* brightness full */
     outl(0x80000000 | (0xff << 16), 0x7000a010);
 
     /* set port b bit 3 on */
-    outl(((0x100 | 1) << 3), 0x6000d824);
+    GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 0x08);
 }
 
-inline void __backlight_off(void)
+void _backlight_off(void)
 {
    /* fades backlight off on 4g */
    GPO32_ENABLE &= ~0x2000000;
diff --git a/firmware/target/arm/ipod/backlight-mini1g_mini2g.c b/firmware/target/arm/ipod/backlight-mini1g_mini2g.c
index 6cfa8f889c..e513c27349 100644
--- a/firmware/target/arm/ipod/backlight-mini1g_mini2g.c
+++ b/firmware/target/arm/ipod/backlight-mini1g_mini2g.c
@@ -31,14 +31,12 @@
 #include "timer.h"
 #include "backlight.h"
 
-inline void __backlight_on(void)
+void _backlight_hw_on(void)
 {
-    /* set port B03 on */
-    outl(((0x100 | 1) << 3), 0x6000d824);
+    GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 0x08);
 }
 
-inline void __backlight_off(void)
+void _backlight_hw_off(void)
 {
-    /* set port B03 off */
-    outl(((0x100 | 0) << 3), 0x6000d824);
+    GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL, 0x08);
 }
diff --git a/firmware/target/arm/ipod/backlight-nano_video.c b/firmware/target/arm/ipod/backlight-nano_video.c
index 92a54225d0..6d77e2bd03 100644
--- a/firmware/target/arm/ipod/backlight-nano_video.c
+++ b/firmware/target/arm/ipod/backlight-nano_video.c
@@ -31,14 +31,89 @@
 #include "timer.h"
 #include "backlight.h"
 
-inline void __backlight_on(void)
+static int brightness = 1;   /* 1 to 32 */
+static int current_dim = 16; /* default after enabling the backlight dimmer */
+static bool enabled = false;
+
+void _backlight_set_brightness(int val)
+{
+    int oldlevel;
+
+    if (current_dim < val)
+    {
+        do
+        {
+            oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
+            GPIO_CLEAR_BITWISE(GPIOD_OUTPUT_VAL, 0x80);
+            udelay(10);
+            GPIO_SET_BITWISE(GPIOD_OUTPUT_VAL, 0x80);
+            set_irq_level(oldlevel);
+            udelay(10);
+        }
+        while (++current_dim < val);
+    }
+    else if (current_dim > val)
+    {
+        do
+        {
+            oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
+            GPIO_CLEAR_BITWISE(GPIOD_OUTPUT_VAL, 0x80);
+            udelay(200);
+            GPIO_SET_BITWISE(GPIOD_OUTPUT_VAL, 0x80);
+            set_irq_level(oldlevel);
+            udelay(10);
+        }
+        while (--current_dim > val);
+    }
+    brightness = val;
+}
+
+void _backlight_hw_enable(bool on)
+{
+    if (on == enabled)
+        return;
+        
+    if (on)
+    {
+        GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 0x08);
+        GPIO_SET_BITWISE(GPIOD_OUTPUT_VAL, 0x80);
+        sleep(HZ/100);
+        current_dim = 16;
+        _backlight_set_brightness(brightness);
+    }
+    else
+    {
+        GPIO_CLEAR_BITWISE(GPIOD_OUTPUT_VAL, 0x80);
+        GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL, 0x08);
+        sleep(HZ/20);
+    }
+    enabled = on;
+}
+
+/* Switch the backlight on. Works only if the backlight circuit is enabled.
+ * Called in ISR context for fading, so it must be fast. */
+void _backlight_led_on(void)
+{
+    GPIO_SET_BITWISE(GPIOL_OUTPUT_VAL, 0x80);
+}
+
+/* Switch the backlight off. Keeps the backlight circuit enabled.
+ * Called in ISR context for fading, so it must be fast. */
+void _backlight_led_off(void)
 {
-    GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 1<<3);
-    GPIO_SET_BITWISE(GPIOL_OUTPUT_VAL, 1<<7);
+    GPIO_CLEAR_BITWISE(GPIOL_OUTPUT_VAL, 0x80);
 }
 
-inline void __backlight_off(void)
+bool _backlight_init(void)
 {
-    GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL, 1<<3);
-    GPIO_CLEAR_BITWISE(GPIOL_OUTPUT_VAL, 1<<7);
+    GPIO_SET_BITWISE(GPIOB_ENABLE, 0x08);
+    GPIO_SET_BITWISE(GPIOB_OUTPUT_EN, 0x08);
+    GPIO_SET_BITWISE(GPIOD_ENABLE, 0x80);
+    GPIO_SET_BITWISE(GPIOD_OUTPUT_EN, 0x80);
+    _backlight_hw_enable(true);
+    GPIO_SET_BITWISE(GPIOL_ENABLE, 0x80);
+    GPIO_SET_BITWISE(GPIOL_OUTPUT_EN, 0x80);
+    GPIO_SET_BITWISE(GPIOL_OUTPUT_VAL, 0x80);
+
+    return true;
 }
diff --git a/firmware/target/arm/ipod/backlight-target.h b/firmware/target/arm/ipod/backlight-target.h
index f4e34cb53a..1a23ecf8be 100644
--- a/firmware/target/arm/ipod/backlight-target.h
+++ b/firmware/target/arm/ipod/backlight-target.h
@@ -19,8 +19,38 @@
 #ifndef BACKLIGHT_TARGET_H
 #define BACKLIGHT_TARGET_H
 
-#define __backlight_init() true
-void __backlight_on(void);
-void __backlight_off(void);
+#if defined(IPOD_VIDEO) || defined(IPOD_NANO)
+
+bool _backlight_init(void);
+void _backlight_set_brightness(int val);
+void _backlight_led_on(void);
+void _backlight_led_off(void);
+void _backlight_hw_enable(bool on);
+
+#define _backlight_on_isr() _backlight_led_on()
+#define _backlight_off_isr() _backlight_led_off()
+#define _backlight_on_normal()  do { _backlight_hw_enable(true); \
+                                     _backlight_led_on(); } while(0)
+#define _backlight_off_normal() do { _backlight_led_off(); \
+                                     _backlight_hw_enable(false); } while(0)
+#define _BACKLIGHT_FADE_ENABLE
+
+#elif defined HAVE_BACKLIGHT_PWM_FADING
+
+#define _backlight_init() true
+void _backlight_hw_on(void);
+void _backlight_hw_off(void);
+
+#define _backlight_on_isr() _backlight_hw_on()
+#define _backlight_off_isr() _backlight_hw_off()
+#define _backlight_on_normal() _backlight_hw_on()
+#define _backlight_off_normal() _backlight_hw_off()
+
+#else
+
+#define _backlight_init() true
+void _backlight_on(void);
+void _backlight_off(void);
+#endif
 
 #endif