diff options
-rw-r--r-- | apps/gui/color_picker.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8985.c | 2 | ||||
-rw-r--r-- | firmware/export/sound.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/ata-nand-tcc780x.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/cowond2/usb-cowond2.c | 5 | ||||
-rw-r--r-- | 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, | |||
329 | } | 329 | } |
330 | 330 | ||
331 | #ifdef HAVE_TOUCHPAD | 331 | #ifdef HAVE_TOUCHPAD |
332 | int touchpad_slider(struct rgb_pick *rgb, int *selected_slider) | 332 | static int touchpad_slider(struct rgb_pick *rgb, int *selected_slider) |
333 | { | 333 | { |
334 | short x,y; | 334 | short x,y; |
335 | int text_top,i,x1; | 335 | 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) | |||
276 | wmcodec_write(SRATECTRL, (0 << 1)); | 276 | wmcodec_write(SRATECTRL, (0 << 1)); |
277 | } | 277 | } |
278 | 278 | ||
279 | #ifdef HAVE_RECORDING | ||
279 | void audiohw_enable_recording(bool source_mic) | 280 | void audiohw_enable_recording(bool source_mic) |
280 | { | 281 | { |
281 | (void)source_mic; /* We only have a line-in (I think) */ | 282 | (void)source_mic; /* We only have a line-in (I think) */ |
@@ -345,3 +346,4 @@ void audiohw_set_monitor(bool enable) { | |||
345 | 346 | ||
346 | (void)enable; | 347 | (void)enable; |
347 | } | 348 | } |
349 | #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); | |||
39 | void sound_set_treble(int value); | 39 | void sound_set_treble(int value); |
40 | void sound_set_channels(int value); | 40 | void sound_set_channels(int value); |
41 | void sound_set_stereo_width(int value); | 41 | void sound_set_stereo_width(int value); |
42 | #ifdef HAVE_WM8758 | 42 | #if defined(HAVE_WM8758) || defined(HAVE_WM8985) |
43 | void sound_set_bass_cutoff(int value); | 43 | void sound_set_bass_cutoff(int value); |
44 | void sound_set_treble_cutoff(int value); | 44 | void sound_set_treble_cutoff(int value); |
45 | #endif | 45 | #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) | |||
689 | 689 | ||
690 | /* API Functions */ | 690 | /* API Functions */ |
691 | 691 | ||
692 | void ata_led(bool onoff) | 692 | static void ata_led(bool onoff) |
693 | { | 693 | { |
694 | led(onoff); | 694 | led(onoff); |
695 | } | 695 | } |
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 @@ | |||
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "config.h" | 20 | #include "config.h" |
21 | #include "cpu.h" | 21 | #include <stdbool.h> |
22 | #include "system.h" | ||
23 | #include "kernel.h" | ||
24 | #include "ata.h" | ||
25 | 22 | ||
26 | /* USB detect is currently unknown */ | 23 | /* USB detect is currently unknown */ |
27 | inline bool usb_detect(void) | 24 | 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 @@ | |||
27 | #include "system.h" | 27 | #include "system.h" |
28 | #include "audiohw.h" | 28 | #include "audiohw.h" |
29 | #include "i2c.h" | 29 | #include "i2c.h" |
30 | #include "wmcodec.h" | ||
30 | 31 | ||
31 | #if defined(COWON_D2) | 32 | #if defined(COWON_D2) |
32 | /* The D2's audio codec uses an I2C address of 0x34 */ | 33 | /* The D2's audio codec uses an I2C address of 0x34 */ |