diff options
Diffstat (limited to 'firmware/target/arm/ipod')
-rw-r--r-- | firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/1g2g/adc-target.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/ipod/1g2g/backlight-1g2g.c | 3 | ||||
-rw-r--r-- | firmware/target/arm/ipod/3g/backlight-3g.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/ipod/backlight-4g_color.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/ipod/backlight-mini1g_mini2g.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/ipod/backlight-nano_video.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/ipod/button-target.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/ipod/lcd-gray.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/power-ipod.c | 2 |
10 files changed, 14 insertions, 1 deletions
diff --git a/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c b/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c index 1a5379be89..cfeb78d198 100644 --- a/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c +++ b/firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c | |||
@@ -23,6 +23,8 @@ | |||
23 | #include "cpu.h" | 23 | #include "cpu.h" |
24 | #include "hwcompat.h" | 24 | #include "hwcompat.h" |
25 | #include "kernel.h" | 25 | #include "kernel.h" |
26 | #include "adc.h" | ||
27 | #include "adc-target.h" | ||
26 | 28 | ||
27 | static struct mutex adc_mtx SHAREDBSS_ATTR; | 29 | static struct mutex adc_mtx SHAREDBSS_ATTR; |
28 | 30 | ||
diff --git a/firmware/target/arm/ipod/1g2g/adc-target.h b/firmware/target/arm/ipod/1g2g/adc-target.h index c9e9417614..5b0ce4b4ae 100644 --- a/firmware/target/arm/ipod/1g2g/adc-target.h +++ b/firmware/target/arm/ipod/1g2g/adc-target.h | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | /* Force a scan now */ | 30 | /* Force a scan now */ |
31 | unsigned short adc_scan(int channel); | 31 | unsigned short adc_scan(int channel); |
32 | void ipod_2g_adc_int(void); | ||
32 | static inline unsigned short adc_read(int channel) | 33 | static inline unsigned short adc_read(int channel) |
33 | { | 34 | { |
34 | return adc_scan(channel); | 35 | return adc_scan(channel); |
diff --git a/firmware/target/arm/ipod/1g2g/backlight-1g2g.c b/firmware/target/arm/ipod/1g2g/backlight-1g2g.c index 0e208b2312..b7797813ec 100644 --- a/firmware/target/arm/ipod/1g2g/backlight-1g2g.c +++ b/firmware/target/arm/ipod/1g2g/backlight-1g2g.c | |||
@@ -20,8 +20,9 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #include "config.h" | 21 | #include "config.h" |
22 | #include "system.h" | 22 | #include "system.h" |
23 | #include "backlight.h" | ||
24 | #include "lcd.h" | 23 | #include "lcd.h" |
24 | #include "backlight.h" | ||
25 | #include "backlight-target.h" | ||
25 | 26 | ||
26 | void _backlight_on(void) | 27 | void _backlight_on(void) |
27 | { | 28 | { |
diff --git a/firmware/target/arm/ipod/3g/backlight-3g.c b/firmware/target/arm/ipod/3g/backlight-3g.c index 00070c739b..77088e32ec 100644 --- a/firmware/target/arm/ipod/3g/backlight-3g.c +++ b/firmware/target/arm/ipod/3g/backlight-3g.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include "config.h" | 21 | #include "config.h" |
22 | #include "system.h" | 22 | #include "system.h" |
23 | #include "backlight.h" | 23 | #include "backlight.h" |
24 | #include "backlight-target.h" | ||
24 | 25 | ||
25 | void _backlight_on(void) | 26 | void _backlight_on(void) |
26 | { | 27 | { |
diff --git a/firmware/target/arm/ipod/backlight-4g_color.c b/firmware/target/arm/ipod/backlight-4g_color.c index 4103e5bb57..656bef0e17 100644 --- a/firmware/target/arm/ipod/backlight-4g_color.c +++ b/firmware/target/arm/ipod/backlight-4g_color.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include "button.h" | 32 | #include "button.h" |
33 | #include "timer.h" | 33 | #include "timer.h" |
34 | #include "backlight.h" | 34 | #include "backlight.h" |
35 | #include "backlight-target.h" | ||
35 | 36 | ||
36 | void _backlight_on(void) | 37 | void _backlight_on(void) |
37 | { | 38 | { |
diff --git a/firmware/target/arm/ipod/backlight-mini1g_mini2g.c b/firmware/target/arm/ipod/backlight-mini1g_mini2g.c index 2c070c14ad..1d57b7742e 100644 --- a/firmware/target/arm/ipod/backlight-mini1g_mini2g.c +++ b/firmware/target/arm/ipod/backlight-mini1g_mini2g.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include "button.h" | 32 | #include "button.h" |
33 | #include "timer.h" | 33 | #include "timer.h" |
34 | #include "backlight.h" | 34 | #include "backlight.h" |
35 | #include "backlight-target.h" | ||
35 | 36 | ||
36 | void _backlight_hw_on(void) | 37 | void _backlight_hw_on(void) |
37 | { | 38 | { |
diff --git a/firmware/target/arm/ipod/backlight-nano_video.c b/firmware/target/arm/ipod/backlight-nano_video.c index a064e4e330..5eb5198b73 100644 --- a/firmware/target/arm/ipod/backlight-nano_video.c +++ b/firmware/target/arm/ipod/backlight-nano_video.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include "button.h" | 32 | #include "button.h" |
33 | #include "timer.h" | 33 | #include "timer.h" |
34 | #include "backlight.h" | 34 | #include "backlight.h" |
35 | #include "backlight-target.h" | ||
35 | 36 | ||
36 | static int brightness = 1; /* 1 to 32 */ | 37 | static int brightness = 1; /* 1 to 32 */ |
37 | static int current_dim = 16; /* default after enabling the backlight dimmer */ | 38 | static int current_dim = 16; /* default after enabling the backlight dimmer */ |
diff --git a/firmware/target/arm/ipod/button-target.h b/firmware/target/arm/ipod/button-target.h index c42c9fbe93..a0ac372839 100644 --- a/firmware/target/arm/ipod/button-target.h +++ b/firmware/target/arm/ipod/button-target.h | |||
@@ -31,6 +31,7 @@ void button_init_device(void); | |||
31 | int button_read_device(void); | 31 | int button_read_device(void); |
32 | 32 | ||
33 | void ipod_mini_button_int(void); | 33 | void ipod_mini_button_int(void); |
34 | void ipod_3g_button_int(void); | ||
34 | void ipod_4g_button_int(void); | 35 | void ipod_4g_button_int(void); |
35 | 36 | ||
36 | /* iPod specific button codes */ | 37 | /* iPod specific button codes */ |
diff --git a/firmware/target/arm/ipod/lcd-gray.c b/firmware/target/arm/ipod/lcd-gray.c index 70355920b6..811e64e96b 100644 --- a/firmware/target/arm/ipod/lcd-gray.c +++ b/firmware/target/arm/ipod/lcd-gray.c | |||
@@ -239,6 +239,7 @@ void lcd_set_flip(bool yesno) | |||
239 | #endif | 239 | #endif |
240 | } | 240 | } |
241 | 241 | ||
242 | #ifdef HAVE_LCD_ENABLE | ||
242 | void lcd_enable(bool on) | 243 | void lcd_enable(bool on) |
243 | { | 244 | { |
244 | if (on) | 245 | if (on) |
@@ -257,6 +258,7 @@ void lcd_enable(bool on) | |||
257 | /* enter standby mode */ | 258 | /* enter standby mode */ |
258 | } | 259 | } |
259 | } | 260 | } |
261 | #endif /* HAVE_LCD_ENABLE */ | ||
260 | 262 | ||
261 | /*** update functions ***/ | 263 | /*** update functions ***/ |
262 | 264 | ||
diff --git a/firmware/target/arm/ipod/power-ipod.c b/firmware/target/arm/ipod/power-ipod.c index 76c9fdf5ff..af1ac9fc87 100644 --- a/firmware/target/arm/ipod/power-ipod.c +++ b/firmware/target/arm/ipod/power-ipod.c | |||
@@ -42,6 +42,7 @@ void power_init(void) | |||
42 | #endif | 42 | #endif |
43 | } | 43 | } |
44 | 44 | ||
45 | #if CONFIG_CHARGING | ||
45 | bool charger_inserted(void) | 46 | bool charger_inserted(void) |
46 | { | 47 | { |
47 | #if defined(IPOD_VIDEO) | 48 | #if defined(IPOD_VIDEO) |
@@ -60,6 +61,7 @@ bool charger_inserted(void) | |||
60 | bool charging_state(void) { | 61 | bool charging_state(void) { |
61 | return (GPIOB_INPUT_VAL & 0x01)?false:true; | 62 | return (GPIOB_INPUT_VAL & 0x01)?false:true; |
62 | } | 63 | } |
64 | #endif /* CONFIG_CHARGING */ | ||
63 | 65 | ||
64 | 66 | ||
65 | void ide_power_enable(bool on) | 67 | void ide_power_enable(bool on) |