summaryrefslogtreecommitdiff
path: root/common/charge_manager.c
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2019-04-12 18:41:28 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-18 03:27:59 -0700
commit81464c37bd43944ebc1bc5a73d03fa306637025c (patch)
treebf9becd70292079c84150b56c9c096fe74ae39b4 /common/charge_manager.c
parentd361522205dd30c9aecab31c5a426cef019bfbd1 (diff)
downloadchrome-ec-81464c37bd43944ebc1bc5a73d03fa306637025c.tar.gz
charge_manager: Move source_port_bitmap definition where it's used
This patch moves the definition of source_port_bitmap to the location where it's referenced to increase the readability. There is no functionality change. Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> BUG=none BRANCH=none TEST=buildall Change-Id: I9dcdc3ec10c2f71b9f95c271f86ba31e436e697c Reviewed-on: https://chromium-review.googlesource.com/1566481 Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org> Tested-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'common/charge_manager.c')
-rw-r--r--common/charge_manager.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/common/charge_manager.c b/common/charge_manager.c
index dcb819ee3a..804376f528 100644
--- a/common/charge_manager.c
+++ b/common/charge_manager.c
@@ -81,11 +81,6 @@ static int override_port = OVERRIDE_OFF;
static int delayed_override_port = OVERRIDE_OFF;
static timestamp_t delayed_override_deadline;
-#ifdef CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT
-/* Bitmap of ports used as power source */
-static volatile uint32_t source_port_bitmap;
-BUILD_ASSERT(sizeof(source_port_bitmap)*8 >= CONFIG_USB_PD_PORT_COUNT);
-#endif
static uint8_t source_port_rp[CONFIG_USB_PD_PORT_COUNT];
#ifdef CONFIG_USB_PD_MAX_TOTAL_SOURCE_CURRENT
@@ -1048,6 +1043,10 @@ int charge_manager_get_power_limit_uw(void)
#ifdef CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT
+/* Bitmap of ports used as power source */
+static volatile uint32_t source_port_bitmap;
+BUILD_ASSERT(sizeof(source_port_bitmap)*8 >= CONFIG_USB_PD_PORT_COUNT);
+
static inline int has_other_active_source(int port)
{
return source_port_bitmap & ~BIT(port);