From 9f148e8b1371f9bbe2d125692e2321f7b2b53ee2 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Thu, 9 Mar 2023 11:56:09 -0800 Subject: 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 Change-Id: Ie49607b428d4ebeb6f9ce6beca555bb5e1a9fe33 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4324362 Reviewed-by: Ting Shen --- common/usb_pd_dual_role.c | 4 ++-- 1 file 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; -- cgit v1.2.1