Peppy ectool led command

Glue between the existing ectool led command and the
led control logic.

BUG=chrome-os-partner:20776
BRANCH=peppy
TEST=Manual. Run "ectool led" commands:

Should pass:
ectool led power blue|yellow|off|auto|blue=1 yellow=1
ectool led battery blue|yellow|off|auto|blue=1 yellow=1

Should fail:
ectool led adapter <color>
ectool led power|battery red|green|white

Signed-off-by: Dave Parker <dparker@chromium.org>
Change-Id: I2540940baa553866760dd9ae62278b6b845793ef
Reviewed-on: https://gerrit.chromium.org/gerrit/64627

3 files changed, 164 insertions, 23 deletions

diff --git a/common/build.mk b/common/build.mk
index c6c7577153..c617611a43 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -14,7 +14,7 @@ common-$(BOARD_bolt)+=battery_link.o
 common-$(BOARD_daisy)+=extpower_snow.o
 common-$(BOARD_falco)+=battery_falco.o led_falco.o
 common-$(BOARD_link)+=battery_link.o
-common-$(BOARD_peppy)+=battery_peppy.o led_peppy.o
+common-$(BOARD_peppy)+=battery_peppy.o led_common.o led_peppy.o
 common-$(BOARD_slippy)+=battery_slippy.o led_slippy.o
 common-$(BOARD_snow)+=extpower_snow.o
 common-$(BOARD_spring)+=battery_spring.o
diff --git a/common/led_common.c b/common/led_common.c
new file mode 100644
index 0000000000..88abd841f6
--- /dev/null
+++ b/common/led_common.c
@@ -0,0 +1,70 @@
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ *
+ * Common functions for blinking LEDs.
+ */
+
+#include "console.h"
+#include "ec_commands.h"
+#include "hooks.h"
+#include "host_command.h"
+#include "led_common.h"
+#include "util.h"
+
+#define LED_AUTO_CONTROL_FLAG(id) (1 << (id))
+
+static uint32_t led_auto_control_flags = ~0x00;
+
+static int led_is_supported(enum ec_led_id led_id)
+{
+	int i;
+
+	for (i = 0; i < supported_led_ids_count; i++)
+		if (led_id == supported_led_ids[i])
+			return 1;
+
+	return 0;
+}
+
+void led_auto_control(enum ec_led_id led_id, int enable)
+{
+	if (enable)
+		led_auto_control_flags |= LED_AUTO_CONTROL_FLAG(led_id);
+	else
+		led_auto_control_flags &= ~LED_AUTO_CONTROL_FLAG(led_id);
+}
+
+int led_auto_control_is_enabled(enum ec_led_id led_id)
+{
+	return (led_auto_control_flags & LED_AUTO_CONTROL_FLAG(led_id)) != 0;
+}
+
+static int led_command_control(struct host_cmd_handler_args *args)
+{
+	const struct ec_params_led_control *p = args->params;
+	struct ec_response_led_control *r = args->response;
+	int i;
+
+	args->response_size = sizeof(*r);
+	memset(r->brightness_range, 0, sizeof(r->brightness_range));
+
+	if (!led_is_supported(p->led_id))
+		return EC_RES_INVALID_PARAM;
+
+	led_get_brightness_range(p->led_id, r->brightness_range);
+	if (p->flags & EC_LED_FLAGS_QUERY)
+		return EC_RES_SUCCESS;
+
+	for (i = 0; i < EC_LED_COLOR_COUNT; i++)
+		if (r->brightness_range[i] == 0 && p->brightness[i] != 0)
+			return EC_RES_INVALID_PARAM;
+
+	if (p->flags & EC_LED_FLAGS_AUTO)
+		led_auto_control(p->led_id, 1);
+	else if (led_set_brightness(p->led_id, p->brightness) != EC_SUCCESS)
+		return EC_RES_INVALID_PARAM;
+
+	return EC_RES_SUCCESS;
+}
+DECLARE_HOST_COMMAND(EC_CMD_LED_CONTROL, led_command_control, EC_VER_MASK(1));
diff --git a/common/led_peppy.c b/common/led_peppy.c
index aed913cb72..50a851b8ee 100644
--- a/common/led_peppy.c
+++ b/common/led_peppy.c
@@ -8,8 +8,12 @@
 #include "battery.h"
 #include "charge_state.h"
 #include "chipset.h"
+#include "ec_commands.h"
 #include "gpio.h"
 #include "hooks.h"
+#include "host_command.h"
+#include "led_common.h"
+#include "util.h"
 
 #define LED_TOTAL_TICKS 16
 #define LED_ON_TICKS 4
@@ -18,11 +22,19 @@ enum led_color {
 	LED_OFF = 0,
 	LED_BLUE,
 	LED_AMBER,
+	LED_PINK,
+
 	LED_COLOR_COUNT  /* Number of colors, not a color itself */
 };
 
-static int led_set_color(enum led_color color, enum gpio_signal gpio_led_blue_l,
-			 enum gpio_signal gpio_led_amber_l)
+const enum ec_led_id supported_led_ids[] = {
+	EC_LED_ID_POWER_LED, EC_LED_ID_BATTERY_LED};
+
+const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
+
+static int peppy_led_set_gpio(enum led_color color,
+			      enum gpio_signal gpio_led_blue_l,
+			      enum gpio_signal gpio_led_amber_l)
 {
 	switch (color) {
 	case LED_OFF:
@@ -37,62 +49,121 @@ static int led_set_color(enum led_color color, enum gpio_signal gpio_led_blue_l,
 		gpio_set_level(gpio_led_blue_l,  1);
 		gpio_set_level(gpio_led_amber_l, 0);
 		break;
+	case LED_PINK:
+		gpio_set_level(gpio_led_blue_l,  0);
+		gpio_set_level(gpio_led_amber_l, 0);
+		break;
 	default:
 		return EC_ERROR_UNKNOWN;
 	}
 	return EC_SUCCESS;
 }
 
-static int bat_led_set_color(enum led_color color)
+static int peppy_led_set_color_battery(enum led_color color)
 {
-	return led_set_color(color, GPIO_BAT_LED0_L, GPIO_BAT_LED1_L);
+	return peppy_led_set_gpio(color, GPIO_BAT_LED0_L, GPIO_BAT_LED1_L);
 }
 
-static int pwr_led_set_color(enum led_color color)
+static int peppy_led_set_color_power(enum led_color color)
 {
-	return led_set_color(color, GPIO_PWR_LED0_L, GPIO_PWR_LED1_L);
+	return peppy_led_set_gpio(color, GPIO_PWR_LED0_L, GPIO_PWR_LED1_L);
 }
 
-/* Called by hook task every 250mSec */
-static void led_tick(void)
+static int peppy_led_set_color(enum ec_led_id led_id, enum led_color color)
 {
-	static int ticks;
-	uint32_t chflags = charge_get_flags();
+	int rv;
 
-	ticks++;
+	led_auto_control(led_id, 0);
+	switch (led_id) {
+	case EC_LED_ID_BATTERY_LED:
+		rv = peppy_led_set_color_battery(color);
+		break;
+	case EC_LED_ID_POWER_LED:
+		rv = peppy_led_set_color_power(color);
+		break;
+	default:
+		return EC_ERROR_UNKNOWN;
+	}
+	return rv;
+}
+
+int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
+{
+	if (brightness[EC_LED_COLOR_BLUE] != 0 &&
+	    brightness[EC_LED_COLOR_YELLOW] != 0)
+		peppy_led_set_color(led_id, LED_PINK);
+	else if (brightness[EC_LED_COLOR_BLUE] != 0)
+		peppy_led_set_color(led_id, LED_BLUE);
+	else if (brightness[EC_LED_COLOR_YELLOW] != 0)
+		peppy_led_set_color(led_id, LED_AMBER);
+	else
+		peppy_led_set_color(led_id, LED_OFF);
 
+	return EC_SUCCESS;
+}
+
+void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
+{
+	/* Ignoring led_id as both leds support the same colors */
+	brightness_range[EC_LED_COLOR_BLUE] = 1;
+	brightness_range[EC_LED_COLOR_YELLOW] = 1;
+}
+
+static void peppy_led_set_power(int ticks)
+{
 	if (chipset_in_state(CHIPSET_STATE_ANY_OFF))
-		pwr_led_set_color(LED_OFF);
+		peppy_led_set_color_power(LED_OFF);
 	else if (chipset_in_state(CHIPSET_STATE_ON))
-		pwr_led_set_color(LED_BLUE);
+		peppy_led_set_color_power(LED_BLUE);
 	else if (chipset_in_state(CHIPSET_STATE_SUSPEND))
 		/* Blink once every four seconds. */
-		pwr_led_set_color((ticks % LED_TOTAL_TICKS < LED_ON_TICKS) ?
+		peppy_led_set_color_power(
+			(ticks % LED_TOTAL_TICKS < LED_ON_TICKS) ?
 			LED_AMBER : LED_OFF);
+}
+
+static void peppy_led_set_battery(int ticks)
+{
+	uint32_t chflags = charge_get_flags();
 
 	switch (charge_get_state()) {
 	case PWR_STATE_CHARGE:
-		bat_led_set_color(LED_AMBER);
+		peppy_led_set_color_battery(LED_AMBER);
 		break;
 	case PWR_STATE_CHARGE_NEAR_FULL:
-		bat_led_set_color(LED_BLUE);
+		peppy_led_set_color_battery(LED_BLUE);
 		break;
 	case PWR_STATE_DISCHARGE:
-		bat_led_set_color(LED_OFF);
+		peppy_led_set_color_battery(LED_OFF);
 		break;
 	case PWR_STATE_ERROR:
-		bat_led_set_color((ticks & 0x2) ? LED_AMBER : LED_OFF);
+		peppy_led_set_color_battery(
+			(ticks & 0x2) ? LED_AMBER : LED_OFF);
 		break;
-	case PWR_STATE_IDLE: /* External power connected in IDLE state. */
+	case PWR_STATE_IDLE: /* External power connected in IDLE. */
 		if (chflags & CHARGE_FLAG_FORCE_IDLE)
-			bat_led_set_color((ticks & 0x4) ? LED_BLUE : LED_OFF);
+			peppy_led_set_color_battery(
+				(ticks & 0x4) ? LED_BLUE : LED_OFF);
 		else
-			bat_led_set_color(LED_BLUE);
+			peppy_led_set_color_battery(LED_BLUE);
 		break;
 	default:
 		/* Other states don't alter LED behavior */
 		break;
 	}
 }
-DECLARE_HOOK(HOOK_TICK, led_tick, HOOK_PRIO_DEFAULT);
 
+/* Called by hook task every 250mSec */
+static void led_tick(void)
+{
+	static int ticks;
+
+	ticks++;
+
+	if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED))
+		peppy_led_set_power(ticks);
+
+	if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED))
+		peppy_led_set_battery(ticks);
+}
+DECLARE_HOOK(HOOK_TICK, led_tick, HOOK_PRIO_DEFAULT);