summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorMihail Zenkov <mihail.zenkov@gmail.com>2016-03-30 12:50:40 +0000
committerGerrit Rockbox <gerrit@rockbox.org>2016-04-04 11:19:51 +0200
commitce90c0481a6c7a5a455791e4e7366c589e52b68c (patch)
tree06ab06467d00e4742a7028699d36e81c80b96531 /firmware
parente599810ffaa6412326f61d026fc598c721b3a01c (diff)
downloadrockbox-ce90c0481a6c7a5a455791e4e7366c589e52b68c.tar.gz
rockbox-ce90c0481a6c7a5a455791e4e7366c589e52b68c.zip
Fix checking for CONFIG_CHARGING
Change-Id: I53b9a129679fd7b322770025106ef92033226d2a
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/ascodec.h2
-rw-r--r--firmware/export/powermgmt.h2
-rw-r--r--firmware/target/arm/as3525/ascodec-as3525.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/firmware/export/ascodec.h b/firmware/export/ascodec.h
index 94030a2b34..8697adb00d 100644
--- a/firmware/export/ascodec.h
+++ b/firmware/export/ascodec.h
@@ -45,7 +45,7 @@ int ascodec_readbytes(unsigned int index, unsigned int len, unsigned char *data)
45 45
46void ascodec_wait_adc_finished(void); 46void ascodec_wait_adc_finished(void);
47 47
48#ifdef CONFIG_CHARGING 48#if CONFIG_CHARGING
49bool ascodec_endofch(void); 49bool ascodec_endofch(void);
50bool ascodec_chg_status(void); 50bool ascodec_chg_status(void);
51void ascodec_monitor_endofch(void); 51void ascodec_monitor_endofch(void);
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h
index d79d560150..f6b71a864e 100644
--- a/firmware/export/powermgmt.h
+++ b/firmware/export/powermgmt.h
@@ -49,7 +49,7 @@ enum charge_state_type
49/* tells what the charger is doing */ 49/* tells what the charger is doing */
50extern enum charge_state_type charge_state; 50extern enum charge_state_type charge_state;
51 51
52#ifdef CONFIG_CHARGING 52#if CONFIG_CHARGING
53/* 53/*
54 * Flag that the charger has been plugged in/removed: this is set for exactly 54 * Flag that the charger has been plugged in/removed: this is set for exactly
55 * one time through the power loop when the charger has been plugged in. 55 * one time through the power loop when the charger has been plugged in.
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
534bool ascodec_endofch(void) 534bool ascodec_endofch(void)
535{ 535{
536 bool ret = ascodec_enrd0_shadow & CHG_ENDOFCH; 536 bool ret = ascodec_enrd0_shadow & CHG_ENDOFCH;