From 6a0340fc213d120643c6c73050be4cbd10171b6b Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Sat, 3 May 2008 23:18:56 +0000 Subject: More static / header file cleanup. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17341 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/color_picker.c | 2 +- firmware/drivers/audio/wm8985.c | 2 ++ firmware/export/sound.h | 2 +- firmware/target/arm/tcc780x/ata-nand-tcc780x.c | 2 +- firmware/target/arm/tcc780x/cowond2/usb-cowond2.c | 5 +---- firmware/target/arm/wmcodec-telechips.c | 1 + 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c index a788cbade2..0614fb74eb 100644 --- a/apps/gui/color_picker.c +++ b/apps/gui/color_picker.c @@ -329,7 +329,7 @@ static void draw_screen(struct screen *display, char *title, } #ifdef HAVE_TOUCHPAD -int touchpad_slider(struct rgb_pick *rgb, int *selected_slider) +static int touchpad_slider(struct rgb_pick *rgb, int *selected_slider) { short x,y; int text_top,i,x1; diff --git a/firmware/drivers/audio/wm8985.c b/firmware/drivers/audio/wm8985.c index 163e9079be..95afbd97c9 100644 --- a/firmware/drivers/audio/wm8985.c +++ b/firmware/drivers/audio/wm8985.c @@ -276,6 +276,7 @@ void audiohw_set_sample_rate(int sampling_control) wmcodec_write(SRATECTRL, (0 << 1)); } +#ifdef HAVE_RECORDING void audiohw_enable_recording(bool source_mic) { (void)source_mic; /* We only have a line-in (I think) */ @@ -345,3 +346,4 @@ void audiohw_set_monitor(bool enable) { (void)enable; } +#endif /* HAVE_RECORDING */ diff --git a/firmware/export/sound.h b/firmware/export/sound.h index f243e75633..c7637a999c 100644 --- a/firmware/export/sound.h +++ b/firmware/export/sound.h @@ -39,7 +39,7 @@ void sound_set_bass(int value); void sound_set_treble(int value); void sound_set_channels(int value); void sound_set_stereo_width(int value); -#ifdef HAVE_WM8758 +#if defined(HAVE_WM8758) || defined(HAVE_WM8985) void sound_set_bass_cutoff(int value); void sound_set_treble_cutoff(int value); #endif diff --git a/firmware/target/arm/tcc780x/ata-nand-tcc780x.c b/firmware/target/arm/tcc780x/ata-nand-tcc780x.c index 4cf55c0c3c..4d116576cf 100644 --- a/firmware/target/arm/tcc780x/ata-nand-tcc780x.c +++ b/firmware/target/arm/tcc780x/ata-nand-tcc780x.c @@ -689,7 +689,7 @@ static void nand_test(void) /* API Functions */ -void ata_led(bool onoff) +static void ata_led(bool onoff) { led(onoff); } diff --git a/firmware/target/arm/tcc780x/cowond2/usb-cowond2.c b/firmware/target/arm/tcc780x/cowond2/usb-cowond2.c index 5d27f9c912..3519bf9200 100644 --- a/firmware/target/arm/tcc780x/cowond2/usb-cowond2.c +++ b/firmware/target/arm/tcc780x/cowond2/usb-cowond2.c @@ -18,10 +18,7 @@ ****************************************************************************/ #include "config.h" -#include "cpu.h" -#include "system.h" -#include "kernel.h" -#include "ata.h" +#include /* USB detect is currently unknown */ inline bool usb_detect(void) diff --git a/firmware/target/arm/wmcodec-telechips.c b/firmware/target/arm/wmcodec-telechips.c index 0e42df9c20..c305080db2 100644 --- a/firmware/target/arm/wmcodec-telechips.c +++ b/firmware/target/arm/wmcodec-telechips.c @@ -27,6 +27,7 @@ #include "system.h" #include "audiohw.h" #include "i2c.h" +#include "wmcodec.h" #if defined(COWON_D2) /* The D2's audio codec uses an I2C address of 0x34 */ -- cgit v1.2.3