diff options
| author | Mihail Zenkov <mihail.zenkov@gmail.com> | 2016-03-30 12:50:40 +0000 |
|---|---|---|
| committer | Gerrit Rockbox <gerrit@rockbox.org> | 2016-04-04 11:19:51 +0200 |
| commit | ce90c0481a6c7a5a455791e4e7366c589e52b68c (patch) | |
| tree | 06ab06467d00e4742a7028699d36e81c80b96531 /firmware/target/arm | |
| parent | e599810ffaa6412326f61d026fc598c721b3a01c (diff) | |
| download | rockbox-ce90c0481a6c7a5a455791e4e7366c589e52b68c.tar.gz rockbox-ce90c0481a6c7a5a455791e4e7366c589e52b68c.zip | |
Fix checking for CONFIG_CHARGING
Change-Id: I53b9a129679fd7b322770025106ef92033226d2a
Diffstat (limited to 'firmware/target/arm')
| -rw-r--r-- | firmware/target/arm/as3525/ascodec-as3525.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/as3525/ascodec-as3525.c b/firmware/target/arm/as3525/ascodec-as3525.c index 634648afe4..d930d266a6 100644 --- a/firmware/target/arm/as3525/ascodec-as3525.c +++ b/firmware/target/arm/as3525/ascodec-as3525.c | |||
| @@ -297,7 +297,7 @@ void ascodec_init(void) | |||
| 297 | 297 | ||
| 298 | /* Generate irq for usb+charge status change */ | 298 | /* Generate irq for usb+charge status change */ |
| 299 | ascodec_write(AS3514_IRQ_ENRD0, | 299 | ascodec_write(AS3514_IRQ_ENRD0, |
| 300 | #ifdef CONFIG_CHARGING /* m200v4 can't charge */ | 300 | #if CONFIG_CHARGING /* m200v4 can't charge */ |
| 301 | IRQ_CHGSTAT | IRQ_ENDOFCH | | 301 | IRQ_CHGSTAT | IRQ_ENDOFCH | |
| 302 | #endif | 302 | #endif |
| 303 | IRQ_USBSTAT); | 303 | IRQ_USBSTAT); |
| @@ -530,7 +530,7 @@ void ascodec_wait_adc_finished(void) | |||
| 530 | semaphore_wait(&adc_done_sem, TIMEOUT_BLOCK); | 530 | semaphore_wait(&adc_done_sem, TIMEOUT_BLOCK); |
| 531 | } | 531 | } |
| 532 | 532 | ||
| 533 | #ifdef CONFIG_CHARGING | 533 | #if CONFIG_CHARGING |
| 534 | bool ascodec_endofch(void) | 534 | bool ascodec_endofch(void) |
| 535 | { | 535 | { |
| 536 | bool ret = ascodec_enrd0_shadow & CHG_ENDOFCH; | 536 | bool ret = ascodec_enrd0_shadow & CHG_ENDOFCH; |