* Don't touch the backlight(s) (and buttonlight) at backlight init in order to avoid a short flash when the lights are both disabled in the bootloader and in rockbox settings. * Properly reflect the backlight state set by the 1st/2nd gen bootloader.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14679 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 29 insertions, 7 deletions

diff --git a/firmware/backlight.c b/firmware/backlight.c
index 2143ece46a..ca8ffd1847 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -623,13 +623,9 @@ void backlight_init(void)
 # endif
     }
 #endif
-    backlight_on();
-#ifdef HAVE_REMOTE_LCD
-    remote_backlight_on();
-#endif
-#ifdef HAVE_BUTTON_LIGHT
-    button_backlight_on();
-#endif
+    /* Leave all lights as set by the bootloader here. The settings load will
+     * call the appropriate backlight_set_*() functions, only changing light
+     * status if necessary. */
 
     create_thread(backlight_thread, backlight_stack,
                   sizeof(backlight_stack), backlight_thread_name
diff --git a/firmware/target/arm/ipod/1g2g/backlight-target.h b/firmware/target/arm/ipod/1g2g/backlight-target.h
new file mode 100644
index 0000000000..a1a9785abc
--- /dev/null
+++ b/firmware/target/arm/ipod/1g2g/backlight-target.h
@@ -0,0 +1,26 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2006 by Barry Wardell
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef BACKLIGHT_TARGET_H
+#define BACKLIGHT_TARGET_H
+
+#define __backlight_init() false
+void __backlight_on(void);
+void __backlight_off(void);
+
+#endif