summaryrefslogtreecommitdiff
path: root/firmware/drivers
diff options
context:
space:
mode:
authorBrandon Low <lostlogic@rockbox.org>2006-03-16 17:34:37 +0000
committerBrandon Low <lostlogic@rockbox.org>2006-03-16 17:34:37 +0000
commit4b68f1e2a3e0f57e723ad5fdab4f8970bcf66719 (patch)
tree2b2fe9eb89edff9810aa7e8e927e149b23e4c277 /firmware/drivers
parentd4f9ebe2c3025339e414b5b139027f19fc9a6b14 (diff)
downloadrockbox-4b68f1e2a3e0f57e723ad5fdab4f8970bcf66719.zip
rockbox-4b68f1e2a3e0f57e723ad5fdab4f8970bcf66719.tar.gz
rockbox-4b68f1e2a3e0f57e723ad5fdab4f8970bcf66719.tar.bz2
rockbox-4b68f1e2a3e0f57e723ad5fdab4f8970bcf66719.tar.xz
Proper charger input, usb and charger activity detection/reporting for ipod video
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9061 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers')
-rw-r--r--firmware/drivers/power.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c
index 3df8460..676e7c2 100644
--- a/firmware/drivers/power.c
+++ b/firmware/drivers/power.c
@@ -123,8 +123,11 @@ bool charger_inserted(void)
return (adc_read(ADC_CHARGE_REGULATOR) < 0x1FF);
#elif defined(TOSHIBA_GIGABEAT_F)
return false;
-#elif defined(IPOD_ARCH)
+#elif defined(APPLE_IPODVIDEO)
/* We need to get this value a faster way than i2c */
+ return (GPIOA_INPUT_VAL & 0x10)?true:false;
+#elif defined(IPOD_ARCH)
+ /* This needs filling in for other ipods. */
return false;
#else
/* Player */
@@ -154,8 +157,10 @@ void charger_enable(bool on)
bool charging_state(void) {
#if defined(IRIVER_H100_SERIES)
return charger_inserted();
-#else /* Iriver H300 */
+#elif defined(IRIVER_H300_SERIES)
return (GPIO_READ & 0x00800000)?true:false;
+#elif defined(APPLE_IPODVIDEO)
+ return (GPIOB_INPUT_VAL & 0x01)?false:true;
#endif
}
#endif