forked from len0rd/rockbox
Fix FS#7631 : Archos V2 and FM Recorder charging screen problems
ATA power is off in the charging screen to avoid problems when the battery is deeply discharged. Without ATA power, Archos FM and V2 Recorders measure battery voltage as 0V, leading to an unwanted low battery shutdown. This change delays powermgmt_init() on those targets until after ATA power is turned on by storage_init(). The charging screen displays input current, so there is some visible feedback on charging progress. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31484 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
a5e44591c2
commit
5cd8aec39a
2 changed files with 23 additions and 4 deletions
11
apps/main.c
11
apps/main.c
|
|
@ -506,7 +506,12 @@ static void init(void)
|
|||
|
||||
button_init();
|
||||
|
||||
/* Don't initialize power management here if it could incorrectly
|
||||
* measure battery voltage, and it's not needed for charging. */
|
||||
#if !defined(NEED_ATA_POWER_BATT_MEASURE) || \
|
||||
(CONFIG_CHARGING > CHARGING_MONITOR)
|
||||
powermgmt_init();
|
||||
#endif
|
||||
|
||||
#if CONFIG_TUNER
|
||||
radio_init();
|
||||
|
|
@ -567,6 +572,12 @@ static void init(void)
|
|||
panicf("ata: %d", rc);
|
||||
}
|
||||
|
||||
#if defined(NEED_ATA_POWER_BATT_MEASURE) && \
|
||||
(CONFIG_CHARGING <= CHARGING_MONITOR)
|
||||
/* After storage_init(), ATA power must be on, so battery voltage
|
||||
* can be measured. Initialize power management if it was delayed. */
|
||||
powermgmt_init();
|
||||
#endif
|
||||
#ifdef HAVE_EEPROM_SETTINGS
|
||||
CHART(">eeprom_settings_init");
|
||||
eeprom_settings_init();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue