summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/ipod
diff options
context:
space:
mode:
authorMarcin Bukat <marcin.bukat@gmail.com>2015-01-12 12:02:24 +0100
committerMarcin Bukat <marcin.bukat@gmail.com>2015-01-12 12:02:24 +0100
commit9ffd9327e339ee9028654000497525b62e826652 (patch)
tree2ec951353c3d5b7c927b97a448a55e8d7e9ae521 /firmware/target/arm/ipod
parentbbd7d1dba39ab1a89b4cc0c18352e35349e66faa (diff)
downloadrockbox-9ffd9327e339ee9028654000497525b62e826652.tar.gz
rockbox-9ffd9327e339ee9028654000497525b62e826652.tar.bz2
rockbox-9ffd9327e339ee9028654000497525b62e826652.zip
Fix red/yellow
Change-Id: Ie01251af2cd843979b5fdefcfa541ba377d13bd7
Diffstat (limited to 'firmware/target/arm/ipod')
-rw-r--r--firmware/target/arm/ipod/backlight-mini1g_mini2g.c4
-rw-r--r--firmware/target/arm/ipod/backlight-target.h25
2 files changed, 13 insertions, 16 deletions
diff --git a/firmware/target/arm/ipod/backlight-mini1g_mini2g.c b/firmware/target/arm/ipod/backlight-mini1g_mini2g.c
index 1d57b7742e..8dd7ef87bd 100644
--- a/firmware/target/arm/ipod/backlight-mini1g_mini2g.c
+++ b/firmware/target/arm/ipod/backlight-mini1g_mini2g.c
@@ -34,12 +34,12 @@
#include "backlight.h"
#include "backlight-target.h"
-void _backlight_hw_on(void)
+void backlight_hw_on(void)
{
GPIO_SET_BITWISE(GPIOB_OUTPUT_VAL, 0x08);
}
-void _backlight_hw_off(void)
+void backlight_hw_off(void)
{
GPIO_CLEAR_BITWISE(GPIOB_OUTPUT_VAL, 0x08);
}
diff --git a/firmware/target/arm/ipod/backlight-target.h b/firmware/target/arm/ipod/backlight-target.h
index fef7ee8ce0..299a1cb6e7 100644
--- a/firmware/target/arm/ipod/backlight-target.h
+++ b/firmware/target/arm/ipod/backlight-target.h
@@ -39,11 +39,11 @@ void lcd_awake(void);
#define backlight_hw_off() do { _backlight_led_off(); \
_backlight_hw_enable(false); } while(0)
#else /* !BOOTLOADER */
-#define backlight_hw_on_isr() _backlight_led_on()
-#define backlight_hw_off_isr() _backlight_led_off()
-#define backlight_hw_on_normal() do { _backlight_hw_enable(true); \
+#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_hw_off_normal() do { _backlight_led_off(); \
+#define _backlight_off_normal() do { _backlight_led_off(); \
_backlight_hw_enable(false); } while(0)
#define _BACKLIGHT_FADE_ENABLE
#endif /* !BOOTLOADER */
@@ -58,17 +58,14 @@ void backlight_hw_brightness(int val);
#elif defined(IPOD_MINI) || defined(IPOD_MINI2G)
#define backlight_hw_init() true
-void _backlight_hw_on(void);
-void _backlight_hw_off(void);
+void backlight_hw_on(void);
+void backlight_hw_off(void);
-#ifdef BOOTLOADER
-#define backlight_hw_on() _backlight_hw_on()
-#define backlight_hw_off() _backlight_hw_off()
-#else
-#define backlight_hw_on_isr() _backlight_hw_on()
-#define backlight_hw_off_isr() _backlight_hw_off()
-#define backlight_hw_on_normal() _backlight_hw_on()
-#define backlight_hw_off_normal() _backlight_hw_off()
+#ifndef BOOTLOADER
+#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()
#endif
#elif defined(IPOD_1G2G) || defined(IPOD_3G)