diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-11-12 19:19:38 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-11-12 19:19:38 +0000 |
commit | f4c5c6aa62a5362f91b4b445b6df71774cf4e75c (patch) | |
tree | f4e5538aa8b3c88b0b668760ac2d4fd7ef1dcf1c /firmware/target/arm | |
parent | ef12b3b5c678e4fa44d60061b0c1bc312e589ba1 (diff) | |
download | rockbox-f4c5c6aa62a5362f91b4b445b6df71774cf4e75c.tar.gz rockbox-f4c5c6aa62a5362f91b4b445b6df71774cf4e75c.zip |
Fix bootloaders, and the backlight-modded Ondio build.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15600 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/ipod/backlight-target.h | 12 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/backlight-c200_e200.c | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/firmware/target/arm/ipod/backlight-target.h b/firmware/target/arm/ipod/backlight-target.h index 1a23ecf8be..4190739474 100644 --- a/firmware/target/arm/ipod/backlight-target.h +++ b/firmware/target/arm/ipod/backlight-target.h | |||
@@ -27,6 +27,12 @@ void _backlight_led_on(void); | |||
27 | void _backlight_led_off(void); | 27 | void _backlight_led_off(void); |
28 | void _backlight_hw_enable(bool on); | 28 | void _backlight_hw_enable(bool on); |
29 | 29 | ||
30 | #ifdef BOOTLOADER | ||
31 | #define _backlight_on() do { _backlight_hw_enable(true); \ | ||
32 | _backlight_led_on(); } while(0) | ||
33 | #define _backlight_off() do { _backlight_led_off(); \ | ||
34 | _backlight_hw_enable(false); } while(0) | ||
35 | #else /* !BOOTLOADER */ | ||
30 | #define _backlight_on_isr() _backlight_led_on() | 36 | #define _backlight_on_isr() _backlight_led_on() |
31 | #define _backlight_off_isr() _backlight_led_off() | 37 | #define _backlight_off_isr() _backlight_led_off() |
32 | #define _backlight_on_normal() do { _backlight_hw_enable(true); \ | 38 | #define _backlight_on_normal() do { _backlight_hw_enable(true); \ |
@@ -34,6 +40,7 @@ void _backlight_hw_enable(bool on); | |||
34 | #define _backlight_off_normal() do { _backlight_led_off(); \ | 40 | #define _backlight_off_normal() do { _backlight_led_off(); \ |
35 | _backlight_hw_enable(false); } while(0) | 41 | _backlight_hw_enable(false); } while(0) |
36 | #define _BACKLIGHT_FADE_ENABLE | 42 | #define _BACKLIGHT_FADE_ENABLE |
43 | #endif /* !BOOTLOADER */ | ||
37 | 44 | ||
38 | #elif defined HAVE_BACKLIGHT_PWM_FADING | 45 | #elif defined HAVE_BACKLIGHT_PWM_FADING |
39 | 46 | ||
@@ -41,10 +48,15 @@ void _backlight_hw_enable(bool on); | |||
41 | void _backlight_hw_on(void); | 48 | void _backlight_hw_on(void); |
42 | void _backlight_hw_off(void); | 49 | void _backlight_hw_off(void); |
43 | 50 | ||
51 | #ifdef BOOTLOADER | ||
52 | #define _backlight_on() _backlight_hw_on() | ||
53 | #define _backlight_off() _backlight_hw_off() | ||
54 | #else | ||
44 | #define _backlight_on_isr() _backlight_hw_on() | 55 | #define _backlight_on_isr() _backlight_hw_on() |
45 | #define _backlight_off_isr() _backlight_hw_off() | 56 | #define _backlight_off_isr() _backlight_hw_off() |
46 | #define _backlight_on_normal() _backlight_hw_on() | 57 | #define _backlight_on_normal() _backlight_hw_on() |
47 | #define _backlight_off_normal() _backlight_hw_off() | 58 | #define _backlight_off_normal() _backlight_hw_off() |
59 | #endif | ||
48 | 60 | ||
49 | #else | 61 | #else |
50 | 62 | ||
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c index ee8801f99b..645f3c1e09 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | |||
@@ -377,9 +377,11 @@ void _buttonlight_on(void) | |||
377 | 377 | ||
378 | void _buttonlight_off(void) | 378 | void _buttonlight_off(void) |
379 | { | 379 | { |
380 | #ifndef BOOTLOADER | ||
380 | if(_buttonlight_timeout>0) | 381 | if(_buttonlight_timeout>0) |
381 | __buttonlight_dim(true); | 382 | __buttonlight_dim(true); |
382 | else | 383 | else |
384 | #endif | ||
383 | __buttonlight_off(); | 385 | __buttonlight_off(); |
384 | } | 386 | } |
385 | 387 | ||
diff --git a/firmware/target/arm/sandisk/backlight-c200_e200.c b/firmware/target/arm/sandisk/backlight-c200_e200.c index fad1018d38..9eeb05072e 100644 --- a/firmware/target/arm/sandisk/backlight-c200_e200.c +++ b/firmware/target/arm/sandisk/backlight-c200_e200.c | |||
@@ -41,7 +41,7 @@ void _backlight_on(void) | |||
41 | #ifdef HAVE_LCD_ENABLE | 41 | #ifdef HAVE_LCD_ENABLE |
42 | lcd_enable(true); /* power on lcd */ | 42 | lcd_enable(true); /* power on lcd */ |
43 | #endif | 43 | #endif |
44 | #ifdef HAVE_LCD_SLEEP | 44 | #if defined(HAVE_LCD_SLEEP) && !defined(BOOTLOADER) |
45 | _lcd_sleep_timer = 0; /* LCD should be awake already */ | 45 | _lcd_sleep_timer = 0; /* LCD should be awake already */ |
46 | #endif | 46 | #endif |
47 | pp_i2c_send(AS3514_I2C_ADDR, DCDC15, backlight_brightness); | 47 | pp_i2c_send(AS3514_I2C_ADDR, DCDC15, backlight_brightness); |
@@ -53,7 +53,7 @@ void _backlight_off(void) | |||
53 | #ifdef HAVE_LCD_ENABLE | 53 | #ifdef HAVE_LCD_ENABLE |
54 | lcd_enable(false); /* power off lcd */ | 54 | lcd_enable(false); /* power off lcd */ |
55 | #endif | 55 | #endif |
56 | #ifdef HAVE_LCD_SLEEP | 56 | #if defined(HAVE_LCD_SLEEP) && !defined(BOOTLOADER) |
57 | /* Start LCD sleep countdown */ | 57 | /* Start LCD sleep countdown */ |
58 | if (_lcd_sleep_timeout < 0) | 58 | if (_lcd_sleep_timeout < 0) |
59 | { | 59 | { |