diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-12-03 20:43:10 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-12-03 20:43:10 +0000 |
commit | add677fca8b9d42dfa013915db5c5f8bda5ca92b (patch) | |
tree | 368cbb6ec2920b16265f85f04a0fed2f45c40e90 | |
parent | 58eb784a5d1f0ac800e656d5dfa3a1bff8fb2657 (diff) | |
download | rockbox-add677fca8b9d42dfa013915db5c5f8bda5ca92b.tar.gz rockbox-add677fca8b9d42dfa013915db5c5f8bda5ca92b.zip |
Fix some red. The stubs in bootloaders are giving some trouble.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19316 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/power-creativezvm.c | 2 | ||||
-rw-r--r-- | uisimulator/common/stubs.c | 39 |
2 files changed, 24 insertions, 17 deletions
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/power-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/power-creativezvm.c index 9c0f9c3cb7..90c30d326c 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/power-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/power-creativezvm.c | |||
@@ -35,6 +35,7 @@ void power_init(void) | |||
35 | /* Charger detect */ | 35 | /* Charger detect */ |
36 | } | 36 | } |
37 | 37 | ||
38 | #if CONFIG_CHARGING | ||
38 | unsigned int power_input_status(void) | 39 | unsigned int power_input_status(void) |
39 | { | 40 | { |
40 | return POWER_INPUT_NONE; | 41 | return POWER_INPUT_NONE; |
@@ -45,6 +46,7 @@ bool charging_state(void) | |||
45 | { | 46 | { |
46 | return false; | 47 | return false; |
47 | } | 48 | } |
49 | #endif | ||
48 | 50 | ||
49 | void power_off(void) | 51 | void power_off(void) |
50 | { | 52 | { |
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c index 8991bd73ca..31278371ee 100644 --- a/uisimulator/common/stubs.c +++ b/uisimulator/common/stubs.c | |||
@@ -209,20 +209,6 @@ bool lcd_enabled(void) | |||
209 | } | 209 | } |
210 | #endif | 210 | #endif |
211 | 211 | ||
212 | bool charging_state(void) | ||
213 | { | ||
214 | return false; | ||
215 | } | ||
216 | |||
217 | unsigned int power_input_status(void) | ||
218 | { | ||
219 | #ifdef HAVE_BATTERY_SWITCH | ||
220 | return POWER_INPUT_BATTERY; | ||
221 | #else | ||
222 | return POWER_INPUT_NONE; | ||
223 | #endif | ||
224 | } | ||
225 | |||
226 | #ifdef HAVE_SPDIF_POWER | 212 | #ifdef HAVE_SPDIF_POWER |
227 | void spdif_power_enable(bool on) | 213 | void spdif_power_enable(bool on) |
228 | { | 214 | { |
@@ -246,19 +232,38 @@ bool usb_powered(void) | |||
246 | return false; | 232 | return false; |
247 | } | 233 | } |
248 | 234 | ||
235 | bool usb_charging_enable(bool on) | ||
236 | { | ||
237 | (void)on; | ||
238 | return false; | ||
239 | } | ||
240 | #endif | ||
241 | |||
249 | #if CONFIG_CHARGING | 242 | #if CONFIG_CHARGING |
250 | bool charger_inserted(void) | 243 | bool charger_inserted(void) |
251 | { | 244 | { |
252 | return false; | 245 | return false; |
253 | } | 246 | } |
254 | 247 | ||
255 | bool usb_charging_enable(bool on) | 248 | bool power_input_present(void) |
256 | { | 249 | { |
257 | (void)on; | ||
258 | return false; | 250 | return false; |
259 | } | 251 | } |
252 | |||
253 | unsigned int power_input_status(void) | ||
254 | { | ||
255 | #ifdef HAVE_BATTERY_SWITCH | ||
256 | return POWER_INPUT_BATTERY; | ||
257 | #else | ||
258 | return POWER_INPUT_NONE; | ||
260 | #endif | 259 | #endif |
261 | #endif | 260 | } |
261 | |||
262 | bool charging_state(void) | ||
263 | { | ||
264 | return false; | ||
265 | } | ||
266 | #endif /* CONFIG_CHARGING */ | ||
262 | 267 | ||
263 | bool usb_inserted(void) | 268 | bool usb_inserted(void) |
264 | { | 269 | { |