Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19071 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2008-11-10 18:15:52 +00:00
parent b25f903360
commit 1811858476
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
firmware/export/config-m200v4.h
View file

@ -66,9 +66,6 @@
#define CONFIG_RTC RTC_AS3525 #define CONFIG_RTC RTC_AS3525
#endif #endif
/* Hardware controlled charging */
#define CONFIG_CHARGING CHARGING_SIMPLE
/* define this if you have RTC RAM available for settings */ /* define this if you have RTC RAM available for settings */
//#define HAVE_RTC_RAM //#define HAVE_RTC_RAM

2
firmware/target/arm/as3525/power-as3525.c
View file

@ -37,6 +37,7 @@ void power_init(void)
{ {
} }
#if CONFIG_CHARGING
bool charger_inserted(void) bool charger_inserted(void)
{ {
if(ascodec_read(0x25) & (1<<5)) if(ascodec_read(0x25) & (1<<5))
@ -44,6 +45,7 @@ bool charger_inserted(void)
else else
return false; return false;
} }
#endif
void ide_power_enable(bool on) void ide_power_enable(bool on)
{ {

3
firmware/target/arm/as3525/usb-as3525.c
View file

@ -35,7 +35,6 @@ void usb_init_device(void)
int usb_detect(void) int usb_detect(void)
{ {
if (charger_inserted()) /* TODO: Implement USB detection */
return USB_INSERTED;
return USB_EXTRACTED; return USB_EXTRACTED;
} }