summaryrefslogtreecommitdiffstats
path: root/firmware/target/coldfire/iaudio/x5
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2008-12-03 19:54:25 +0000
committerMichael Sevakis <jethead71@rockbox.org>2008-12-03 19:54:25 +0000
commit58eb784a5d1f0ac800e656d5dfa3a1bff8fb2657 (patch)
tree084c7b7c5d374fbfef2f8cddb3673a3b2a26a7df /firmware/target/coldfire/iaudio/x5
parent0d0cc039f88ced4f6db5c4468b19913f52cd08c8 (diff)
downloadrockbox-58eb784a5d1f0ac800e656d5dfa3a1bff8fb2657.tar.gz
rockbox-58eb784a5d1f0ac800e656d5dfa3a1bff8fb2657.zip
Straighten out some powermanagement stuff. Give target complete control over how power inputs are sensed. Clean SIMULATOR stuff out of target files. Get rid of USB charging option on targets that don't support it or don't implement it yet. Menu string remains to avoid language incompatibility but should be removed on next cleanup for targets not using it (notice in english.lang). global_settings becomes incompatible for some builds and so plugin API version is incremented.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19315 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/coldfire/iaudio/x5')
-rw-r--r--firmware/target/coldfire/iaudio/x5/power-x5.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/firmware/target/coldfire/iaudio/x5/power-x5.c b/firmware/target/coldfire/iaudio/x5/power-x5.c
index 22f56961bf..4feb9c15d0 100644
--- a/firmware/target/coldfire/iaudio/x5/power-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/power-x5.c
@@ -27,8 +27,6 @@
#include "pcf50606.h"
#include "lcd-remote-target.h"
-#ifndef SIMULATOR
-
void power_init(void)
{
/* Charger detect */
@@ -38,9 +36,10 @@ void power_init(void)
pcf50606_init();
}
-bool charger_inserted(void)
-{
- return (GPIO1_READ & 0x01000000) != 0;
+unsigned int power_input_status(void)
+{
+ return (GPIO1_READ & 0x01000000) ?
+ POWER_INPUT_MAIN_CHARGER : POWER_INPUT_NONE;
}
void ide_power_enable(bool on)
@@ -67,8 +66,6 @@ void power_off(void)
asm("halt");
}
-#endif /* SIMULATOR */
-
bool tuner_power(bool status)
{
(void)status;