diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2017-09-13 10:47:37 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-09-28 11:18:54 -0700 |
| commit | c781609bfd19b16737bec5482da5c1a021a6afa6 (patch) | |
| tree | b01c4a40ff2c11432df17ebe029b6fd3a4ec3770 /common/charge_manager.c | |
| parent | 86d5eb9b0a4c60fd47db2956b80d92b2fa922160 (diff) | |
| download | chrome-ec-c781609bfd19b16737bec5482da5c1a021a6afa6.tar.gz | |
charge_manager: Support no-BC1.2 configuration
If BC1.2 isn't supported, don't waste space + time checking for inputs
that don't exist.
BUG=chromium:759880
BRANCH=None
TEST=`make buildall -j`
Change-Id: I47e81451abd79a67a666d1859faf2610ee5c941a
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/663838
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'common/charge_manager.c')
| -rw-r--r-- | common/charge_manager.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/common/charge_manager.c b/common/charge_manager.c index a36b4e8aa4..71169fe97f 100644 --- a/common/charge_manager.c +++ b/common/charge_manager.c @@ -35,12 +35,14 @@ test_mockable const int supplier_priority[] = { [CHARGE_SUPPLIER_DEDICATED] = 0, #endif [CHARGE_SUPPLIER_TYPEC] = 1, +#ifdef CHARGE_MANAGER_BC12 [CHARGE_SUPPLIER_PROPRIETARY] = 1, [CHARGE_SUPPLIER_BC12_DCP] = 2, [CHARGE_SUPPLIER_BC12_CDP] = 3, [CHARGE_SUPPLIER_BC12_SDP] = 4, [CHARGE_SUPPLIER_OTHER] = 5, [CHARGE_SUPPLIER_VBUS] = 6 +#endif }; BUILD_ASSERT(ARRAY_SIZE(supplier_priority) == CHARGE_SUPPLIER_COUNT); @@ -274,6 +276,7 @@ static void charge_manager_fill_power_info(int port, case CHARGE_SUPPLIER_TYPEC: r->type = USB_CHG_TYPE_C; break; +#ifdef CHARGE_MANAGER_BC12 case CHARGE_SUPPLIER_PROPRIETARY: r->type = USB_CHG_TYPE_PROPRIETARY; break; @@ -289,6 +292,7 @@ static void charge_manager_fill_power_info(int port, case CHARGE_SUPPLIER_VBUS: r->type = USB_CHG_TYPE_VBUS; break; +#endif #if CONFIG_DEDICATED_CHARGE_PORT_COUNT > 0 case CHARGE_SUPPLIER_DEDICATED: r->type = USB_CHG_TYPE_DEDICATED; |