Replace generated CONFIG_TASK_ macros with HAS_TASK_

CONFIG_ macros should be set directly. Expanding the task names in the same
way made it difficult to tell what was a configuration choice and what was
due to changes in ec.tasklist

BUG=chrome-os-partner:18343
TEST=build all, run link
BRANCH=none

Change-Id: Ib82e34f974238ee2dd216f33b701b6f4c6a4f1f1
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/49098
Reviewed-by: Randall Spangler <rspangler@chromium.org>

6 files changed, 9 insertions, 9 deletions

diff --git a/include/charge_state.h b/include/charge_state.h
index 68ae1d08b4..d9816a7a9d 100644
--- a/include/charge_state.h
+++ b/include/charge_state.h
@@ -146,7 +146,7 @@ int charge_get_percent(void);
 /**
  * Return non-zero if discharging and battery so low we should shut down.
  */
-#ifdef CONFIG_TASK_CHARGER
+#ifdef HAS_TASK_CHARGER
 int charge_want_shutdown(void);
 #else
 static inline int charge_want_shutdown(void) { return 0; }
diff --git a/include/chipset.h b/include/chipset.h
index fff954032a..03f5ef4318 100644
--- a/include/chipset.h
+++ b/include/chipset.h
@@ -34,7 +34,7 @@ enum chipset_state_mask {
 				 CHIPSET_STATE_SOFT_OFF),  /* Any off state */
 };
 
-#ifdef CONFIG_TASK_CHIPSET
+#ifdef HAS_TASK_CHIPSET
 /**
  * Check if chipset is in a given state.
  *
@@ -51,7 +51,7 @@ static inline int chipset_in_state(int state_mask)
 }
 #endif
 
-#ifdef CONFIG_TASK_CHIPSET
+#ifdef HAS_TASK_CHIPSET
 /**
  * Ask the chipset to exit the hard off state.
  *
diff --git a/include/keyboard_raw.h b/include/keyboard_raw.h
index 339b5344cb..9bdd1cce8f 100644
--- a/include/keyboard_raw.h
+++ b/include/keyboard_raw.h
@@ -60,7 +60,7 @@ int keyboard_raw_read_rows(void);
  */
 void keyboard_raw_enable_interrupt(int enable);
 
-#ifdef CONFIG_TASK_KEYSCAN
+#ifdef HAS_TASK_KEYSCAN
 
 /**
  * GPIO interrupt for raw keyboard input
diff --git a/include/keyboard_scan.h b/include/keyboard_scan.h
index 5ce76cfd1f..bc956cc685 100644
--- a/include/keyboard_scan.h
+++ b/include/keyboard_scan.h
@@ -55,7 +55,7 @@ enum boot_key {
 	BOOT_KEY_OTHER = -1,  /* None of the above */
 };
 
-#ifdef CONFIG_TASK_KEYSCAN
+#ifdef HAS_TASK_KEYSCAN
 /**
  * Return the key held down at boot time in addition to the keyboard-controlled
  * reset keys.  Returns BOOT_KEY_OTHER if none of the keys specifically checked
@@ -75,7 +75,7 @@ static inline enum boot_key keyboard_scan_get_boot_key(void)
  */
 const uint8_t *keyboard_scan_get_state(void);
 
-#ifdef CONFIG_TASK_KEYSCAN
+#ifdef HAS_TASK_KEYSCAN
 /**
  * Enables/disables keyboard matrix scan.
  */
diff --git a/include/power_led.h b/include/power_led.h
index 12ab532bef..2871e73207 100644
--- a/include/power_led.h
+++ b/include/power_led.h
@@ -17,7 +17,7 @@ enum powerled_state {
 	POWERLED_STATE_COUNT
 };
 
-#ifdef CONFIG_TASK_POWERLED
+#ifdef HAS_TASK_POWERLED
 
 /**
  * Set the power LED
diff --git a/include/switch.h b/include/switch.h
index e86711ca49..2cd732774e 100644
--- a/include/switch.h
+++ b/include/switch.h
@@ -11,7 +11,7 @@
 #include "common.h"
 #include "gpio.h"
 
-#ifdef CONFIG_TASK_SWITCH
+#ifdef HAS_TASK_SWITCH
 /**
  * Interrupt handler for switch inputs.
  *
@@ -20,7 +20,7 @@
 void switch_interrupt(enum gpio_signal signal);
 #else
 #define switch_interrupt NULL
-#endif  /* CONFIG_TASK_SWITCH */
+#endif  /* HAS_TASK_SWITCH */
 
 /**
  * Return non-zero if write protect signal is asserted.