From d94ed695bdbf41f736733cc205fdcf41a2dede9e Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Wed, 13 Sep 2017 12:10:18 -0700 Subject: [PATCH] Add USB_CHG_TYPE_DEDICATED This patch adds USB_CHG_TYPE_DEDICATED to enum usb_chg_type. It's for dedicated AC adapters like a barrel jack adapter used for Fizz. BUG=b:65591971 BRANCH=none TEST=make buildall Change-Id: Ib883c97eb5e468753c73453d7dedd228547ae025 Signed-off-by: Daisuke Nojiri Reviewed-on: https://chromium-review.googlesource.com/665327 Reviewed-by: Shawn N --- common/charge_manager.c | 6 +++++- include/ec_commands.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common/charge_manager.c b/common/charge_manager.c index 5d68aeda91..a36b4e8aa4 100644 --- a/common/charge_manager.c +++ b/common/charge_manager.c @@ -267,7 +267,6 @@ static void charge_manager_fill_power_info(int port, const int use_ramp_current = 0; #endif - /* TODO: Handle CHARGE_SUPPLIER_DEDICATED */ switch (sup) { case CHARGE_SUPPLIER_PD: r->type = USB_CHG_TYPE_PD; @@ -290,6 +289,11 @@ static void charge_manager_fill_power_info(int port, case CHARGE_SUPPLIER_VBUS: r->type = USB_CHG_TYPE_VBUS; break; +#if CONFIG_DEDICATED_CHARGE_PORT_COUNT > 0 + case CHARGE_SUPPLIER_DEDICATED: + r->type = USB_CHG_TYPE_DEDICATED; + break; +#endif default: r->type = USB_CHG_TYPE_OTHER; } diff --git a/include/ec_commands.h b/include/ec_commands.h index 3eab0a8354..2e806d4913 100644 --- a/include/ec_commands.h +++ b/include/ec_commands.h @@ -4026,6 +4026,7 @@ enum usb_chg_type { USB_CHG_TYPE_OTHER, USB_CHG_TYPE_VBUS, USB_CHG_TYPE_UNKNOWN, + USB_CHG_TYPE_DEDICATED, }; enum usb_power_roles { USB_PD_PORT_POWER_DISCONNECTED,