diff options
author | Dave Chapman <dave@dchapman.com> | 2008-11-10 18:15:52 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2008-11-10 18:15:52 +0000 |
commit | 18118584769e8e1ecbf56bf4f3ff06922eabcfa7 (patch) | |
tree | e9f9d4c38027bb58ae1147976026b24cf52286bc /firmware/target/arm/as3525 | |
parent | b25f9033602cca2b772375d10e878e242d123fb2 (diff) | |
download | rockbox-18118584769e8e1ecbf56bf4f3ff06922eabcfa7.tar.gz rockbox-18118584769e8e1ecbf56bf4f3ff06922eabcfa7.zip |
Revert r19069 - the m200s can't charge. Also, don't use charger_inserted() as a method for detecting USB (this gives a false positive with USB wall chargers), and protect the definition of charger_inserted() with #if CONFIG_CHARGING.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19071 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/as3525')
-rw-r--r-- | firmware/target/arm/as3525/power-as3525.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/as3525/usb-as3525.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/firmware/target/arm/as3525/power-as3525.c b/firmware/target/arm/as3525/power-as3525.c index 3d191ec3b5..53b95e354d 100644 --- a/firmware/target/arm/as3525/power-as3525.c +++ b/firmware/target/arm/as3525/power-as3525.c | |||
@@ -37,6 +37,7 @@ void power_init(void) | |||
37 | { | 37 | { |
38 | } | 38 | } |
39 | 39 | ||
40 | #if CONFIG_CHARGING | ||
40 | bool charger_inserted(void) | 41 | bool charger_inserted(void) |
41 | { | 42 | { |
42 | if(ascodec_read(0x25) & (1<<5)) | 43 | if(ascodec_read(0x25) & (1<<5)) |
@@ -44,6 +45,7 @@ bool charger_inserted(void) | |||
44 | else | 45 | else |
45 | return false; | 46 | return false; |
46 | } | 47 | } |
48 | #endif | ||
47 | 49 | ||
48 | void ide_power_enable(bool on) | 50 | void ide_power_enable(bool on) |
49 | { | 51 | { |
diff --git a/firmware/target/arm/as3525/usb-as3525.c b/firmware/target/arm/as3525/usb-as3525.c index c9a6381b38..b151d5061a 100644 --- a/firmware/target/arm/as3525/usb-as3525.c +++ b/firmware/target/arm/as3525/usb-as3525.c | |||
@@ -35,7 +35,6 @@ void usb_init_device(void) | |||
35 | 35 | ||
36 | int usb_detect(void) | 36 | int usb_detect(void) |
37 | { | 37 | { |
38 | if (charger_inserted()) | 38 | /* TODO: Implement USB detection */ |
39 | return USB_INSERTED; | ||
40 | return USB_EXTRACTED; | 39 | return USB_EXTRACTED; |
41 | } | 40 | } |