diff options
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 2 | ||||
-rw-r--r-- | firmware/drivers/pcf50606.c | 2 | ||||
-rw-r--r-- | firmware/drivers/rtc/rtc_tcc77x.c | 12 | ||||
-rw-r--r-- | firmware/export/config/logikdax.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/debug-tcc77x.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/iaudio7/power-iaudio7.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/logikdax/audio-logikdax.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/logikdax/power-logikdax.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/system-tcc77x.c | 2 |
9 files changed, 19 insertions, 6 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 36ad056410..3de6630a51 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -193,7 +193,7 @@ const char *get_cuesheetid3_token(struct wps_token *token, struct mp3entry *id3, | |||
193 | return NULL; | 193 | return NULL; |
194 | } | 194 | } |
195 | 195 | ||
196 | const char* get_filename_token(struct wps_token *token, char* filename, | 196 | static const char* get_filename_token(struct wps_token *token, char* filename, |
197 | char *buf, int buf_size) | 197 | char *buf, int buf_size) |
198 | { | 198 | { |
199 | if (filename) | 199 | if (filename) |
diff --git a/firmware/drivers/pcf50606.c b/firmware/drivers/pcf50606.c index d44718c58b..fb89c827e5 100644 --- a/firmware/drivers/pcf50606.c +++ b/firmware/drivers/pcf50606.c | |||
@@ -72,12 +72,14 @@ void pcf50606_init(void) | |||
72 | #endif | 72 | #endif |
73 | } | 73 | } |
74 | 74 | ||
75 | #if (defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2)) && !defined (SIMULATOR) | ||
75 | void pcf50606_reset_timeout(void) | 76 | void pcf50606_reset_timeout(void) |
76 | { | 77 | { |
77 | int level = disable_irq_save(); | 78 | int level = disable_irq_save(); |
78 | pcf50606_write(PCF5060X_OOCC1, pcf50606_read(PCF5060X_OOCC1) | TOTRST); | 79 | pcf50606_write(PCF5060X_OOCC1, pcf50606_read(PCF5060X_OOCC1) | TOTRST); |
79 | restore_irq(level); | 80 | restore_irq(level); |
80 | } | 81 | } |
82 | #endif | ||
81 | 83 | ||
82 | void pcf50606_read_adc(int adc, short* res1, short* res2) | 84 | void pcf50606_read_adc(int adc, short* res1, short* res2) |
83 | { | 85 | { |
diff --git a/firmware/drivers/rtc/rtc_tcc77x.c b/firmware/drivers/rtc/rtc_tcc77x.c index 0ae4059f8a..a85c93d65a 100644 --- a/firmware/drivers/rtc/rtc_tcc77x.c +++ b/firmware/drivers/rtc/rtc_tcc77x.c | |||
@@ -27,22 +27,24 @@ void rtc_init(void) | |||
27 | { | 27 | { |
28 | } | 28 | } |
29 | 29 | ||
30 | int rtc_read_datetime(unsigned char* buf) | 30 | int rtc_read_datetime(struct tm *tm) |
31 | { | 31 | { |
32 | 32 | (void)tm; | |
33 | return 0; | ||
33 | } | 34 | } |
34 | 35 | ||
35 | int rtc_write_datetime(unsigned char* buf) | 36 | int rtc_write_datetime(const struct tm *tm) |
36 | { | 37 | { |
38 | (void)tm; | ||
37 | return 1; | 39 | return 1; |
38 | } | 40 | } |
39 | 41 | ||
42 | #ifdef HAVE_RTC_ALARM | ||
40 | /** | 43 | /** |
41 | * Checks to see if an alarm interrupt has triggered since last we checked. | 44 | * Checks to see if an alarm interrupt has triggered since last we checked. |
42 | */ | 45 | */ |
43 | bool rtc_check_alarm_flag(void) | 46 | bool rtc_check_alarm_flag(void) |
44 | { | 47 | { |
45 | |||
46 | } | 48 | } |
47 | 49 | ||
48 | /** | 50 | /** |
@@ -74,4 +76,6 @@ void rtc_get_alarm(int *h, int *m) | |||
74 | // *m = ((buf[0] >> 4) & 0x7)*10 + (buf[0] & 0x0f); | 76 | // *m = ((buf[0] >> 4) & 0x7)*10 + (buf[0] & 0x0f); |
75 | // *h = ((buf[1] >> 4) & 0x3)*10 + (buf[1] & 0x0f); | 77 | // *h = ((buf[1] >> 4) & 0x3)*10 + (buf[1] & 0x0f); |
76 | } | 78 | } |
79 | #endif /* HAVE_RTC_ALARM */ | ||
80 | |||
77 | 81 | ||
diff --git a/firmware/export/config/logikdax.h b/firmware/export/config/logikdax.h index 05f24daed1..45f5651a43 100644 --- a/firmware/export/config/logikdax.h +++ b/firmware/export/config/logikdax.h | |||
@@ -88,6 +88,8 @@ | |||
88 | #define HAVE_WM8731 | 88 | #define HAVE_WM8731 |
89 | /* Codec is slave on serial bus */ | 89 | /* Codec is slave on serial bus */ |
90 | #define CODEC_SLAVE | 90 | #define CODEC_SLAVE |
91 | /* WM8731 has no tone controls, so we use the software ones */ | ||
92 | #define HAVE_SW_TONE_CONTROLS | ||
91 | 93 | ||
92 | /* Define this for LCD backlight available */ | 94 | /* Define this for LCD backlight available */ |
93 | #define HAVE_BACKLIGHT | 95 | #define HAVE_BACKLIGHT |
diff --git a/firmware/target/arm/tcc77x/debug-tcc77x.c b/firmware/target/arm/tcc77x/debug-tcc77x.c index bf322f5675..cf98451329 100644 --- a/firmware/target/arm/tcc77x/debug-tcc77x.c +++ b/firmware/target/arm/tcc77x/debug-tcc77x.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include "cpu.h" | 23 | #include "cpu.h" |
24 | #include "system.h" | 24 | #include "system.h" |
25 | #include "string.h" | 25 | #include "string.h" |
26 | #include <stdio.h> | ||
26 | #include <stdbool.h> | 27 | #include <stdbool.h> |
27 | #include "button.h" | 28 | #include "button.h" |
28 | #include "lcd.h" | 29 | #include "lcd.h" |
diff --git a/firmware/target/arm/tcc77x/iaudio7/power-iaudio7.c b/firmware/target/arm/tcc77x/iaudio7/power-iaudio7.c index 0501ba272c..baf93b73aa 100644 --- a/firmware/target/arm/tcc77x/iaudio7/power-iaudio7.c +++ b/firmware/target/arm/tcc77x/iaudio7/power-iaudio7.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include "kernel.h" | 25 | #include "kernel.h" |
26 | #include "system.h" | 26 | #include "system.h" |
27 | #include "power.h" | 27 | #include "power.h" |
28 | #include "backlight-target.h" | ||
28 | 29 | ||
29 | #include "pcf50606.h" | 30 | #include "pcf50606.h" |
30 | 31 | ||
diff --git a/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c b/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c index 107b2743ae..90c9a68827 100644 --- a/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c +++ b/firmware/target/arm/tcc77x/logikdax/audio-logikdax.c | |||
@@ -26,6 +26,7 @@ | |||
26 | int audio_channels = 2; | 26 | int audio_channels = 2; |
27 | int audio_output_source = AUDIO_SRC_PLAYBACK; | 27 | int audio_output_source = AUDIO_SRC_PLAYBACK; |
28 | 28 | ||
29 | #if INPUT_SRC_CAPS != 0 | ||
29 | void audio_set_output_source(int source) | 30 | void audio_set_output_source(int source) |
30 | { | 31 | { |
31 | (void)source; | 32 | (void)source; |
@@ -36,3 +37,4 @@ void audio_input_mux(int source, unsigned flags) | |||
36 | (void)source; | 37 | (void)source; |
37 | (void)flags; | 38 | (void)flags; |
38 | } | 39 | } |
40 | #endif | ||
diff --git a/firmware/target/arm/tcc77x/logikdax/power-logikdax.c b/firmware/target/arm/tcc77x/logikdax/power-logikdax.c index e84ff1c852..840b02a2a5 100644 --- a/firmware/target/arm/tcc77x/logikdax/power-logikdax.c +++ b/firmware/target/arm/tcc77x/logikdax/power-logikdax.c | |||
@@ -31,6 +31,7 @@ void power_init(void) | |||
31 | 31 | ||
32 | void ide_power_enable(bool on) | 32 | void ide_power_enable(bool on) |
33 | { | 33 | { |
34 | (void)on; | ||
34 | } | 35 | } |
35 | 36 | ||
36 | bool ide_powered(void) | 37 | bool ide_powered(void) |
diff --git a/firmware/target/arm/tcc77x/system-tcc77x.c b/firmware/target/arm/tcc77x/system-tcc77x.c index afcbf9861f..cffb4deba4 100644 --- a/firmware/target/arm/tcc77x/system-tcc77x.c +++ b/firmware/target/arm/tcc77x/system-tcc77x.c | |||
@@ -272,7 +272,7 @@ http://infocenter.arm.com/help/topic/com.arm.doc.ddi0201d/DDI0201D_arm946es_r1p1 | |||
272 | "mov r0, #0xa5 \n\t" | 272 | "mov r0, #0xa5 \n\t" |
273 | #elif defined(IAUDIO_7) || defined(SANSA_M200) | 273 | #elif defined(IAUDIO_7) || defined(SANSA_M200) |
274 | "mov r0, #0xa7 \n\t" | 274 | "mov r0, #0xa7 \n\t" |
275 | #elif | 275 | #else |
276 | #error NOT DEFINED FOR THIS TARGET! | 276 | #error NOT DEFINED FOR THIS TARGET! |
277 | #endif | 277 | #endif |
278 | "mcr p15, 0, r0, c2, c0, 0 \n\t" | 278 | "mcr p15, 0, r0, c2, c0, 0 \n\t" |