summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2023-03-09 11:56:09 -0800
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-03-10 23:28:21 +0000
commit9f148e8b1371f9bbe2d125692e2321f7b2b53ee2 (patch)
tree16a231369f7375748f39c9ef2d996cbf898e7d5b
parente68eabefb1381387298ce3e6ce1088f8cb4f7078 (diff)
downloadchrome-ec-9f148e8b1371f9bbe2d125692e2321f7b2b53ee2.tar.gz
USB-PD: Use macros for mv and ma in pd_find_pdo_index
No functionality changes. Increases the readability. BUG=None BRANCH=None TEST=None Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Change-Id: Ie49607b428d4ebeb6f9ce6beca555bb5e1a9fe33 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4324362 Reviewed-by: Ting Shen <phoenixshen@chromium.org>
-rw-r--r--common/usb_pd_dual_role.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/usb_pd_dual_role.c b/common/usb_pd_dual_role.c
index 44cd9c0853..a15b764cd2 100644
--- a/common/usb_pd_dual_role.c
+++ b/common/usb_pd_dual_role.c
@@ -95,7 +95,7 @@ int pd_find_pdo_index(uint32_t src_cap_cnt, const uint32_t *const src_caps,
if ((src_caps[i] & PDO_TYPE_MASK) == PDO_TYPE_AUGMENTED)
continue;
- mv = ((src_caps[i] >> 10) & 0x3FF) * 50;
+ mv = PDO_FIXED_GET_VOLT(src_caps[i]);
/* Skip invalid voltage */
if (!mv)
continue;
@@ -112,7 +112,7 @@ int pd_find_pdo_index(uint32_t src_cap_cnt, const uint32_t *const src_caps,
if ((src_caps[i] & PDO_TYPE_MASK) == PDO_TYPE_BATTERY) {
uw = 250000 * (src_caps[i] & 0x3FF);
} else {
- int ma = (src_caps[i] & 0x3FF) * 10;
+ int ma = PDO_FIXED_GET_CURR(src_caps[i]);
ma = MIN(ma, PD_MAX_CURRENT_MA);
uw = ma * mv;