8 files changed, 25 insertions, 21 deletions

diff --git a/firmware/backlight.c b/firmware/backlight.c
index d621aa42d1..99da3df0a8 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -116,7 +116,7 @@ static struct event_queue backlight_queue;
 
 static int backlight_timer;
 static int backlight_timeout = 5*HZ;
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
 static int backlight_timeout_plugged = 5*HZ;
 #endif
 #ifdef HAS_BUTTON_HOLD
@@ -126,7 +126,7 @@ static int backlight_on_button_hold = 0;
 #ifdef HAVE_REMOTE_LCD
 static int remote_backlight_timer;
 static int remote_backlight_timeout = 5*HZ;
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
 static int remote_backlight_timeout_plugged = 5*HZ;
 #endif
 #ifdef HAS_REMOTE_BUTTON_HOLD
@@ -347,7 +347,7 @@ static void __remote_backlight_off(void)
 /* Update state of backlight according to timeout setting */
 static void backlight_update_state(void)
 {
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
     if (charger_inserted()
 #ifdef HAVE_USB_POWER
             || usb_powered()
@@ -386,7 +386,7 @@ static void backlight_update_state(void)
 /* Update state of remote backlight according to timeout setting */
 static void remote_backlight_update_state(void)
 {
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
     if (charger_inserted()
 #ifdef HAVE_USB_POWER
             || usb_powered()
@@ -503,7 +503,7 @@ void backlight_thread(void)
 
 static void backlight_tick(void)
 {
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
     static bool charger_was_inserted = false;
     bool charger_is_inserted = charger_inserted()
 #ifdef HAVE_USB_POWER
@@ -622,7 +622,7 @@ bool is_backlight_on(void)
 /* return value in ticks; 0 means always on, <0 means always off */
 int backlight_get_current_timeout(void)
 {
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
     if (charger_inserted()
 #ifdef HAVE_USB_POWER
             || usb_powered()
@@ -645,7 +645,7 @@ void backlight_set_timeout(int index)
     backlight_update_state();
 }
 
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
 void backlight_set_timeout_plugged(int index)
 {
     if((unsigned)index >= sizeof(backlight_timeout_value))
@@ -724,7 +724,7 @@ void remote_backlight_set_timeout(int index)
     remote_backlight_update_state();
 }
 
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
 void remote_backlight_set_timeout_plugged(int index)
 {
     if((unsigned)index >= sizeof(backlight_timeout_value))
@@ -766,7 +766,7 @@ void remote_backlight_set_on_button_hold(int index)
 /* return value in ticks; 0 means always on, <0 means always off */
 int remote_backlight_get_current_timeout(void)
 {
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
     if (charger_inserted()
 #ifdef HAVE_USB_POWER
             || usb_powered()
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index cab62f950c..5a40bdfde0 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -164,7 +164,7 @@ static void button_tick(void)
                                     || btn == RC_POWEROFF_BUTTON
 #endif
                                     ) &&
-#if defined(CONFIG_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING)
+#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
                                 !charger_inserted() &&
 #endif
                                 repeat_count > POWEROFF_COUNT)
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c
index 872e8b0657..78e70f7466 100644
--- a/firmware/drivers/power.c
+++ b/firmware/drivers/power.c
@@ -83,7 +83,7 @@ void power_init(void)
 }
 
 
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
 bool charger_inserted(void)
 {     
 #if CONFIG_CHARGING == CHARGING_CONTROL
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 0a59c0bf89..8283b37fc8 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -230,6 +230,10 @@
 #define CONFIG_LED 0
 #endif
 
+#ifndef CONFIG_CHARGING
+#define CONFIG_CHARGING 0
+#endif
+
 /* Enable the directory cache and tagcache in RAM if we have
  * plenty of RAM. Both features can be enabled independently. */
 #if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8) && \
diff --git a/firmware/export/power.h b/firmware/export/power.h
index 911ae1dd29..9eed1929fe 100644
--- a/firmware/export/power.h
+++ b/firmware/export/power.h
@@ -24,7 +24,7 @@ extern bool charger_enabled;
 void charger_enable(bool on);
 #endif
 
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
 bool charger_inserted(void);
 #endif
 
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 88fc5e8e33..a31acbcf0b 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -266,7 +266,7 @@ static const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
 #endif
 };
 
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
 charger_input_state_type charger_input_state IDATA_ATTR;
 
 
@@ -545,7 +545,7 @@ static void battery_status_update(void)
                                       / 100 / (CURRENT_MAX_CHG - runcurrent());
     }
     else
-#elif defined(CONFIG_CHARGING) && CONFIG_BATTERY == BATT_LIPOL1300
+#elif CONFIG_CHARGING && CONFIG_BATTERY == BATT_LIPOL1300
     if (charger_inserted()) {
 #ifdef IRIVER_H300_SERIES
         /* H300_SERIES use CURRENT_MAX_CHG for basic charge time (80%)
@@ -612,7 +612,7 @@ static void handle_auto_poweroff(void)
     long timeout = poweroff_idle_timeout_value[poweroff_timeout]*60*HZ;
     int  audio_stat = audio_status();
 
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
     /*
      * Inhibit shutdown as long as the charger is plugged in.  If it is
      * unplugged, wait for a timeout period and then shut down.
@@ -656,7 +656,7 @@ static void handle_auto_poweroff(void)
             if(TIME_AFTER(current_tick, sleeptimer_endtick))
             {
                 audio_stop();
-#if defined(CONFIG_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING)
+#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
                 if((charger_input_state == CHARGER) ||
                    (charger_input_state == CHARGER_PLUGGED))
                 {
@@ -751,7 +751,7 @@ static void power_thread_sleep(int ticks)
 
     while (ticks > 0) {
 
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
         /*
          * Detect charger plugged/unplugged transitions.  On a plugged or
          * unplugged event, we return immediately, run once through the main
@@ -761,7 +761,7 @@ static void power_thread_sleep(int ticks)
         if(charger_inserted()
 #ifdef HAVE_USB_POWER /* USB powered or USB inserted both provide power */
                 || usb_powered()
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
                 || (usb_inserted() && usb_charging_enabled())
 #endif
 #endif
@@ -924,7 +924,7 @@ static void power_thread(void)
     avgbat = avgbat * BATT_AVE_SAMPLES;
     battery_centivolts = avgbat / BATT_AVE_SAMPLES / 10000;
 
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
     if(charger_inserted()) {
         battery_percent  = voltage_to_percent(battery_centivolts,
                            percent_to_volt_charge);
diff --git a/firmware/target/coldfire/iriver/h300/power-h300.c b/firmware/target/coldfire/iriver/h300/power-h300.c
index 7c95aaf200..3d726d0714 100644
--- a/firmware/target/coldfire/iriver/h300/power-h300.c
+++ b/firmware/target/coldfire/iriver/h300/power-h300.c
@@ -61,7 +61,7 @@ void power_init(void)
 }
 
 
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
 bool charger_inserted(void)
 {     
     return (GPIO1_READ & 0x00400000)?true:false;
diff --git a/firmware/usb.c b/firmware/usb.c
index 0a329ad624..ee08b04caa 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -492,7 +492,7 @@ bool usb_powered(void)
     return usb_state == USB_POWERED;
 }
 
-#ifdef CONFIG_CHARGING
+#if CONFIG_CHARGING
 bool usb_charging_enable(bool on)
 {
     bool rc = false;