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.zip
rockbox-ce90c0481a6c7a5a455791e4e7366c589e52b68c.tar.gz
rockbox-ce90c0481a6c7a5a455791e4e7366c589e52b68c.tar.bz2
rockbox-ce90c0481a6c7a5a455791e4e7366c589e52b68c.tar.xz
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 94030a2..8697adb 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)
void ascodec_wait_adc_finished(void);
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
bool ascodec_endofch(void);
bool ascodec_chg_status(void);
void ascodec_monitor_endofch(void);
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h
index d79d560..f6b71a8 100644
--- a/firmware/export/powermgmt.h
+++ b/firmware/export/powermgmt.h
@@ -49,7 +49,7 @@ enum charge_state_type
/* tells what the charger is doing */
extern enum charge_state_type charge_state;
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
/*
* Flag that the charger has been plugged in/removed: this is set for exactly
* 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 634648a..d930d26 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)
/* Generate irq for usb+charge status change */
ascodec_write(AS3514_IRQ_ENRD0,
-#ifdef CONFIG_CHARGING /* m200v4 can't charge */
+#if CONFIG_CHARGING /* m200v4 can't charge */
IRQ_CHGSTAT | IRQ_ENDOFCH |
#endif
IRQ_USBSTAT);
@@ -530,7 +530,7 @@ void ascodec_wait_adc_finished(void)
semaphore_wait(&adc_done_sem, TIMEOUT_BLOCK);
}
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
bool ascodec_endofch(void)
{
bool ret = ascodec_enrd0_shadow & CHG_ENDOFCH;