diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2004-02-05 13:44:04 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2004-02-05 13:44:04 +0000 |
| commit | a258fe1887bf3213bffa07e96f1ec3871fbb9c31 (patch) | |
| tree | de789c550e65cdcda9b90225f9394bd044734e04 /firmware/drivers/power.c | |
| parent | 0579667f37bbf0acefe42c9a8fe70f2f555edce0 (diff) | |
| download | rockbox-a258fe1887bf3213bffa07e96f1ec3871fbb9c31.tar.gz rockbox-a258fe1887bf3213bffa07e96f1ec3871fbb9c31.zip | |
Better charging feedback for FM/V2 devices
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4296 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/power.c')
| -rw-r--r-- | firmware/drivers/power.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c index 83300fe1d4..563ff3e25c 100644 --- a/firmware/drivers/power.c +++ b/firmware/drivers/power.c | |||
| @@ -45,8 +45,9 @@ bool charger_inserted(void) | |||
| 45 | return adc_read(ADC_EXT_POWER) > 0x100; | 45 | return adc_read(ADC_EXT_POWER) > 0x100; |
| 46 | #else | 46 | #else |
| 47 | #ifdef HAVE_FMADC | 47 | #ifdef HAVE_FMADC |
| 48 | /* FM */ | 48 | /* FM or V2, can also charge from the USB port */ |
| 49 | return adc_read(ADC_CHARGE_REGULATOR) < 0x1FF; | 49 | return (adc_read(ADC_CHARGE_REGULATOR) < 0x1FF) || |
| 50 | (adc_read(ADC_USB_POWER) < 0x1FF); | ||
| 50 | #else | 51 | #else |
| 51 | /* Player */ | 52 | /* Player */ |
| 52 | return (PADR & 1) == 0; | 53 | return (PADR & 1) == 0; |