diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2008-07-16 11:02:14 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2008-07-16 11:02:14 +0000 |
commit | a12894c6dc53156ac6af2d270f1ce31f45a2aa17 (patch) | |
tree | 137c44085ed515db43cdfa6348453e34fcf6f509 | |
parent | eb66b559e1566ffaf9ee7af6d19f7ea9b55fd2e5 (diff) | |
download | rockbox-a12894c6dc53156ac6af2d270f1ce31f45a2aa17.tar.gz rockbox-a12894c6dc53156ac6af2d270f1ce31f45a2aa17.zip |
Ensure consistency between header file and implementation for iPod drivers, by #including the appropriate header file and #ifdef'fing out unused code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18066 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/drivers/audio/wm8731.c | 4 | ||||
-rw-r--r-- | firmware/drivers/pcf50605.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/audio-pp.c | 5 | ||||
-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 | ||||
-rw-r--r-- | firmware/target/arm/system-pp5002.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/wmcodec-pp.c | 1 |
15 files changed, 25 insertions, 6 deletions
diff --git a/firmware/drivers/audio/wm8731.c b/firmware/drivers/audio/wm8731.c index b9de5d4cf0..66bdfe014c 100644 --- a/firmware/drivers/audio/wm8731.c +++ b/firmware/drivers/audio/wm8731.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include "wmcodec.h" | 34 | #include "wmcodec.h" |
35 | #include "audiohw.h" | 35 | #include "audiohw.h" |
36 | #include "i2s.h" | 36 | #include "i2s.h" |
37 | #include "sound.h" | ||
37 | 38 | ||
38 | const struct sound_settings_info audiohw_settings[] = { | 39 | const struct sound_settings_info audiohw_settings[] = { |
39 | [SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25}, | 40 | [SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25}, |
@@ -236,6 +237,7 @@ void audiohw_set_sample_rate(int sampling_control) | |||
236 | codec_set_active(true); | 237 | codec_set_active(true); |
237 | } | 238 | } |
238 | 239 | ||
240 | #ifdef HAVE_RECORDING | ||
239 | void audiohw_enable_recording(bool source_mic) | 241 | void audiohw_enable_recording(bool source_mic) |
240 | { | 242 | { |
241 | codec_set_active(false); | 243 | codec_set_active(false); |
@@ -331,3 +333,5 @@ void audiohw_set_monitor(bool enable) | |||
331 | wm8731_write_or(PDCTRL, PDCTRL_LINEINPD); | 333 | wm8731_write_or(PDCTRL, PDCTRL_LINEINPD); |
332 | } | 334 | } |
333 | } | 335 | } |
336 | #endif /* HAVE_RECORDING */ | ||
337 | |||
diff --git a/firmware/drivers/pcf50605.c b/firmware/drivers/pcf50605.c index 9192ec11b5..a76c1dbc3c 100644 --- a/firmware/drivers/pcf50605.c +++ b/firmware/drivers/pcf50605.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #endif | 32 | #endif |
33 | #include "rtc.h" | 33 | #include "rtc.h" |
34 | #include "pcf5060x.h" | 34 | #include "pcf5060x.h" |
35 | #include "pcf50605.h" | ||
35 | 36 | ||
36 | unsigned char pcf50605_wakeup_flags = 0; | 37 | unsigned char pcf50605_wakeup_flags = 0; |
37 | 38 | ||
diff --git a/firmware/target/arm/audio-pp.c b/firmware/target/arm/audio-pp.c index 3c4a3a8cae..ba52118e0f 100644 --- a/firmware/target/arm/audio-pp.c +++ b/firmware/target/arm/audio-pp.c | |||
@@ -23,11 +23,10 @@ | |||
23 | #include "audio.h" | 23 | #include "audio.h" |
24 | #include "sound.h" | 24 | #include "sound.h" |
25 | 25 | ||
26 | #if INPUT_SRC_CAPS != 0 | ||
26 | void audio_set_output_source(int source) | 27 | void audio_set_output_source(int source) |
27 | { | 28 | { |
28 | #if INPUT_SRC_CAPS != 0 | ||
29 | if ((unsigned)source >= AUDIO_NUM_SOURCES) | 29 | if ((unsigned)source >= AUDIO_NUM_SOURCES) |
30 | #endif | ||
31 | source = AUDIO_SRC_PLAYBACK; | 30 | source = AUDIO_SRC_PLAYBACK; |
32 | } /* audio_set_output_source */ | 31 | } /* audio_set_output_source */ |
33 | 32 | ||
@@ -109,5 +108,5 @@ void audio_input_mux(int source, unsigned flags) | |||
109 | 108 | ||
110 | last_source = source; | 109 | last_source = source; |
111 | } /* audio_input_mux */ | 110 | } /* audio_input_mux */ |
112 | 111 | #endif /* INPUT_SRC_CAPS != 0 */ | |
113 | 112 | ||
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) |
diff --git a/firmware/target/arm/system-pp5002.c b/firmware/target/arm/system-pp5002.c index fc69d37131..b9a937c6e8 100644 --- a/firmware/target/arm/system-pp5002.c +++ b/firmware/target/arm/system-pp5002.c | |||
@@ -21,10 +21,11 @@ | |||
21 | #include "system.h" | 21 | #include "system.h" |
22 | 22 | ||
23 | #ifndef BOOTLOADER | 23 | #ifndef BOOTLOADER |
24 | #include "adc-target.h" | ||
25 | #include "button-target.h" | ||
26 | |||
24 | extern void TIMER1(void); | 27 | extern void TIMER1(void); |
25 | extern void TIMER2(void); | 28 | extern void TIMER2(void); |
26 | extern void ipod_3g_button_int(void); | ||
27 | extern void ipod_2g_adc_int(void); | ||
28 | 29 | ||
29 | void irq(void) | 30 | void irq(void) |
30 | { | 31 | { |
diff --git a/firmware/target/arm/wmcodec-pp.c b/firmware/target/arm/wmcodec-pp.c index 217bcd3603..efa80f02b2 100644 --- a/firmware/target/arm/wmcodec-pp.c +++ b/firmware/target/arm/wmcodec-pp.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include "system.h" | 29 | #include "system.h" |
30 | #include "audiohw.h" | 30 | #include "audiohw.h" |
31 | #include "i2c-pp.h" | 31 | #include "i2c-pp.h" |
32 | #include "wmcodec.h" | ||
32 | 33 | ||
33 | #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || defined(MROBE_100) | 34 | #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || defined(MROBE_100) |
34 | /* The H10's audio codec uses an I2C address of 0x1b */ | 35 | /* The H10's audio codec uses an I2C address of 0x1b */ |