summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2010-08-28 10:17:19 +0000
committerBertrik Sikken <bertrik@sikken.nl>2010-08-28 10:17:19 +0000
commita290ce4222b401b0b4af5b3378a00b757bf63d2e (patch)
tree51500a53d4884678613cb9d626c1f110dc211930 /firmware
parent032502182b7ec69c8ea82246fad86148ddb042d8 (diff)
downloadrockbox-a290ce4222b401b0b4af5b3378a00b757bf63d2e.tar.gz
rockbox-a290ce4222b401b0b4af5b3378a00b757bf63d2e.tar.bz2
rockbox-a290ce4222b401b0b4af5b3378a00b757bf63d2e.zip
tcc77x targets: various minor cleanups
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27913 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/pcf50606.c2
-rw-r--r--firmware/drivers/rtc/rtc_tcc77x.c12
-rw-r--r--firmware/export/config/logikdax.h2
-rw-r--r--firmware/target/arm/tcc77x/debug-tcc77x.c1
-rw-r--r--firmware/target/arm/tcc77x/iaudio7/power-iaudio7.c1
-rw-r--r--firmware/target/arm/tcc77x/logikdax/audio-logikdax.c2
-rw-r--r--firmware/target/arm/tcc77x/logikdax/power-logikdax.c1
-rw-r--r--firmware/target/arm/tcc77x/system-tcc77x.c2
8 files changed, 18 insertions, 5 deletions
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)
#endif
}
+#if (defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2)) && !defined (SIMULATOR)
void pcf50606_reset_timeout(void)
{
int level = disable_irq_save();
pcf50606_write(PCF5060X_OOCC1, pcf50606_read(PCF5060X_OOCC1) | TOTRST);
restore_irq(level);
}
+#endif
void pcf50606_read_adc(int adc, short* res1, short* res2)
{
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)
{
}
-int rtc_read_datetime(unsigned char* buf)
+int rtc_read_datetime(struct tm *tm)
{
-
+ (void)tm;
+ return 0;
}
-int rtc_write_datetime(unsigned char* buf)
+int rtc_write_datetime(const struct tm *tm)
{
+ (void)tm;
return 1;
}
+#ifdef HAVE_RTC_ALARM
/**
* Checks to see if an alarm interrupt has triggered since last we checked.
*/
bool rtc_check_alarm_flag(void)
{
-
}
/**
@@ -74,4 +76,6 @@ void rtc_get_alarm(int *h, int *m)
// *m = ((buf[0] >> 4) & 0x7)*10 + (buf[0] & 0x0f);
// *h = ((buf[1] >> 4) & 0x3)*10 + (buf[1] & 0x0f);
}
+#endif /* HAVE_RTC_ALARM */
+
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 @@
#define HAVE_WM8731
/* Codec is slave on serial bus */
#define CODEC_SLAVE
+/* WM8731 has no tone controls, so we use the software ones */
+#define HAVE_SW_TONE_CONTROLS
/* Define this for LCD backlight available */
#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 @@
#include "cpu.h"
#include "system.h"
#include "string.h"
+#include <stdio.h>
#include <stdbool.h>
#include "button.h"
#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 @@
#include "kernel.h"
#include "system.h"
#include "power.h"
+#include "backlight-target.h"
#include "pcf50606.h"
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 @@
int audio_channels = 2;
int audio_output_source = AUDIO_SRC_PLAYBACK;
+#if INPUT_SRC_CAPS != 0
void audio_set_output_source(int source)
{
(void)source;
@@ -36,3 +37,4 @@ void audio_input_mux(int source, unsigned flags)
(void)source;
(void)flags;
}
+#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)
void ide_power_enable(bool on)
{
+ (void)on;
}
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
"mov r0, #0xa5 \n\t"
#elif defined(IAUDIO_7) || defined(SANSA_M200)
"mov r0, #0xa7 \n\t"
-#elif
+#else
#error NOT DEFINED FOR THIS TARGET!
#endif
"mcr p15, 0, r0, c2, c0, 0 \n\t"