diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2007-10-21 11:02:51 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2007-10-21 11:02:51 +0000 |
commit | 47cdc8955271f7c2bd0e73c8b5ed0436c9003a8a (patch) | |
tree | d9e527718ba2398422233520fa24a404f6b327bb | |
parent | 11251f4555ceb4f7a3714676ad547174eae0a8f1 (diff) | |
download | rockbox-47cdc8955271f7c2bd0e73c8b5ed0436c9003a8a.tar.gz 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.c | 10 | ||||
-rw-r--r-- | firmware/system.c | 6 |
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] = | |||
118 | .backlight_on=&backlight_on, | 118 | .backlight_on=&backlight_on, |
119 | .backlight_off=&backlight_off, | 119 | .backlight_off=&backlight_off, |
120 | .is_backlight_on=&is_backlight_on, | 120 | .is_backlight_on=&is_backlight_on, |
121 | .backlight_set_timeout=&backlight_set_timeout | 121 | .backlight_set_timeout=&backlight_set_timeout, |
122 | #ifdef HAS_BUTTONBAR | 122 | #ifdef HAS_BUTTONBAR |
123 | ,.has_buttonbar=false | 123 | .has_buttonbar=false |
124 | #endif | 124 | #endif |
125 | } | 125 | }, |
126 | #ifdef HAVE_REMOTE_LCD | 126 | #if NB_SCREENS == 2 |
127 | ,{ | 127 | { |
128 | .screen_type=SCREEN_REMOTE, | 128 | .screen_type=SCREEN_REMOTE, |
129 | .width=LCD_REMOTE_WIDTH, | 129 | .width=LCD_REMOTE_WIDTH, |
130 | .height=LCD_REMOTE_HEIGHT, | 130 | .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) | |||
75 | #if NUM_CORES > 1 | 75 | #if NUM_CORES > 1 |
76 | spinlock_unlock(&boostctrl_spin); | 76 | spinlock_unlock(&boostctrl_spin); |
77 | #endif | 77 | #endif |
78 | |||
79 | return first; | ||
78 | } | 80 | } |
81 | |||
79 | char * cpu_boost_log_getlog_next(void) | 82 | char * cpu_boost_log_getlog_next(void) |
80 | { | 83 | { |
81 | int message; | 84 | int message; |
@@ -97,7 +100,10 @@ char * cpu_boost_log_getlog_next(void) | |||
97 | #if NUM_CORES > 1 | 100 | #if NUM_CORES > 1 |
98 | spinlock_unlock(&boostctrl_spin); | 101 | spinlock_unlock(&boostctrl_spin); |
99 | #endif | 102 | #endif |
103 | |||
104 | return next; | ||
100 | } | 105 | } |
106 | |||
101 | void cpu_boost_(bool on_off, char* location, int line) | 107 | void cpu_boost_(bool on_off, char* location, int line) |
102 | { | 108 | { |
103 | #if NUM_CORES > 1 | 109 | #if NUM_CORES > 1 |