From a12894c6dc53156ac6af2d270f1ce31f45a2aa17 Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Wed, 16 Jul 2008 11:02:14 +0000 Subject: 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 --- firmware/drivers/audio/wm8731.c | 4 ++++ firmware/drivers/pcf50605.c | 1 + firmware/target/arm/audio-pp.c | 5 ++--- firmware/target/arm/ipod/1g2g/adc-ipod-1g2g.c | 2 ++ firmware/target/arm/ipod/1g2g/adc-target.h | 1 + firmware/target/arm/ipod/1g2g/backlight-1g2g.c | 3 ++- firmware/target/arm/ipod/3g/backlight-3g.c | 1 + firmware/target/arm/ipod/backlight-4g_color.c | 1 + firmware/target/arm/ipod/backlight-mini1g_mini2g.c | 1 + firmware/target/arm/ipod/backlight-nano_video.c | 1 + firmware/target/arm/ipod/button-target.h | 1 + firmware/target/arm/ipod/lcd-gray.c | 2 ++ firmware/target/arm/ipod/power-ipod.c | 2 ++ firmware/target/arm/system-pp5002.c | 5 +++-- 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 @@ #include "wmcodec.h" #include "audiohw.h" #include "i2s.h" +#include "sound.h" const struct sound_settings_info audiohw_settings[] = { [SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25}, @@ -236,6 +237,7 @@ void audiohw_set_sample_rate(int sampling_control) codec_set_active(true); } +#ifdef HAVE_RECORDING void audiohw_enable_recording(bool source_mic) { codec_set_active(false); @@ -331,3 +333,5 @@ void audiohw_set_monitor(bool enable) wm8731_write_or(PDCTRL, PDCTRL_LINEINPD); } } +#endif /* HAVE_RECORDING */ + 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 @@ #endif #include "rtc.h" #include "pcf5060x.h" +#include "pcf50605.h" unsigned char pcf50605_wakeup_flags = 0; 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 @@ #include "audio.h" #include "sound.h" +#if INPUT_SRC_CAPS != 0 void audio_set_output_source(int source) { -#if INPUT_SRC_CAPS != 0 if ((unsigned)source >= AUDIO_NUM_SOURCES) -#endif source = AUDIO_SRC_PLAYBACK; } /* audio_set_output_source */ @@ -109,5 +108,5 @@ void audio_input_mux(int source, unsigned flags) last_source = source; } /* audio_input_mux */ - +#endif /* INPUT_SRC_CAPS != 0 */ 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 @@ #include "cpu.h" #include "hwcompat.h" #include "kernel.h" +#include "adc.h" +#include "adc-target.h" static struct mutex adc_mtx SHAREDBSS_ATTR; 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 @@ /* Force a scan now */ unsigned short adc_scan(int channel); +void ipod_2g_adc_int(void); static inline unsigned short adc_read(int channel) { 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 @@ ****************************************************************************/ #include "config.h" #include "system.h" -#include "backlight.h" #include "lcd.h" +#include "backlight.h" +#include "backlight-target.h" void _backlight_on(void) { 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 @@ #include "config.h" #include "system.h" #include "backlight.h" +#include "backlight-target.h" void _backlight_on(void) { 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 @@ #include "button.h" #include "timer.h" #include "backlight.h" +#include "backlight-target.h" void _backlight_on(void) { 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 @@ #include "button.h" #include "timer.h" #include "backlight.h" +#include "backlight-target.h" void _backlight_hw_on(void) { 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 @@ #include "button.h" #include "timer.h" #include "backlight.h" +#include "backlight-target.h" static int brightness = 1; /* 1 to 32 */ 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); int button_read_device(void); void ipod_mini_button_int(void); +void ipod_3g_button_int(void); void ipod_4g_button_int(void); /* 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) #endif } +#ifdef HAVE_LCD_ENABLE void lcd_enable(bool on) { if (on) @@ -257,6 +258,7 @@ void lcd_enable(bool on) /* enter standby mode */ } } +#endif /* HAVE_LCD_ENABLE */ /*** update functions ***/ 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) #endif } +#if CONFIG_CHARGING bool charger_inserted(void) { #if defined(IPOD_VIDEO) @@ -60,6 +61,7 @@ bool charger_inserted(void) bool charging_state(void) { return (GPIOB_INPUT_VAL & 0x01)?false:true; } +#endif /* CONFIG_CHARGING */ 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 @@ #include "system.h" #ifndef BOOTLOADER +#include "adc-target.h" +#include "button-target.h" + extern void TIMER1(void); extern void TIMER2(void); -extern void ipod_3g_button_int(void); -extern void ipod_2g_adc_int(void); void irq(void) { 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 @@ #include "system.h" #include "audiohw.h" #include "i2c-pp.h" +#include "wmcodec.h" #if defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || defined(MROBE_100) /* The H10's audio codec uses an I2C address of 0x1b */ -- cgit