summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2007-10-21 11:02:51 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2007-10-21 11:02:51 +0000
commit47cdc8955271f7c2bd0e73c8b5ed0436c9003a8a (patch)
treed9e527718ba2398422233520fa24a404f6b327bb
parent11251f4555ceb4f7a3714676ad547174eae0a8f1 (diff)
downloadrockbox-47cdc8955271f7c2bd0e73c8b5ed0436c9003a8a.tar.gz
rockbox-47cdc8955271f7c2bd0e73c8b5ed0436c9003a8a.tar.bz2
rockbox-47cdc8955271f7c2bd0e73c8b5ed0436c9003a8a.zip
Fixed warnings when logf is enabled.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15243 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/screen_access.c10
-rw-r--r--firmware/system.c6
2 files changed, 11 insertions, 5 deletions
diff --git a/apps/screen_access.c b/apps/screen_access.c
index 9017cda787..0d7017984e 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -118,13 +118,13 @@ struct screen screens[NB_SCREENS] =
.backlight_on=&backlight_on,
.backlight_off=&backlight_off,
.is_backlight_on=&is_backlight_on,
- .backlight_set_timeout=&backlight_set_timeout
+ .backlight_set_timeout=&backlight_set_timeout,
#ifdef HAS_BUTTONBAR
- ,.has_buttonbar=false
+ .has_buttonbar=false
#endif
- }
-#ifdef HAVE_REMOTE_LCD
- ,{
+ },
+#if NB_SCREENS == 2
+ {
.screen_type=SCREEN_REMOTE,
.width=LCD_REMOTE_WIDTH,
.height=LCD_REMOTE_HEIGHT,
diff --git a/firmware/system.c b/firmware/system.c
index 0b5ae1719e..c186163cf6 100644
--- a/firmware/system.c
+++ b/firmware/system.c
@@ -75,7 +75,10 @@ char * cpu_boost_log_getlog_first(void)
#if NUM_CORES > 1
spinlock_unlock(&boostctrl_spin);
#endif
+
+ return first;
}
+
char * cpu_boost_log_getlog_next(void)
{
int message;
@@ -97,7 +100,10 @@ char * cpu_boost_log_getlog_next(void)
#if NUM_CORES > 1
spinlock_unlock(&boostctrl_spin);
#endif
+
+ return next;
}
+
void cpu_boost_(bool on_off, char* location, int line)
{
#if NUM_CORES > 1