From 18118584769e8e1ecbf56bf4f3ff06922eabcfa7 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Mon, 10 Nov 2008 18:15:52 +0000 Subject: 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 --- firmware/export/config-m200v4.h | 3 --- firmware/target/arm/as3525/power-as3525.c | 2 ++ firmware/target/arm/as3525/usb-as3525.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'firmware') diff --git a/firmware/export/config-m200v4.h b/firmware/export/config-m200v4.h index dc127a7df9..75ac137ffd 100644 --- a/firmware/export/config-m200v4.h +++ b/firmware/export/config-m200v4.h @@ -66,9 +66,6 @@ #define CONFIG_RTC RTC_AS3525 #endif -/* Hardware controlled charging */ -#define CONFIG_CHARGING CHARGING_SIMPLE - /* define this if you have RTC RAM available for settings */ //#define HAVE_RTC_RAM 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) { } +#if CONFIG_CHARGING bool charger_inserted(void) { if(ascodec_read(0x25) & (1<<5)) @@ -44,6 +45,7 @@ bool charger_inserted(void) else return false; } +#endif void ide_power_enable(bool on) { 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) int usb_detect(void) { - if (charger_inserted()) - return USB_INSERTED; + /* TODO: Implement USB detection */ return USB_EXTRACTED; } -- cgit v1.2.3