diff options
| author | Bernard Shyu <bernard_shyu@bizlinktech.com> | 2014-12-05 13:30:25 +0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-12-10 02:00:20 +0000 |
| commit | 511a9f31e84863270ce66c1373dc10797687ba26 (patch) | |
| tree | 05ba2c3ef7c6f508dd7e1f0e73f59064db045fa7 | |
| parent | 6f010b635d48b0f77028e2d6ed11608ae6e8ce82 (diff) | |
| download | chrome-ec-511a9f31e84863270ce66c1373dc10797687ba26.tar.gz | |
usb_pd: protocol field extraction error for RDO
The RDO fields extraction for op_ma & max_ma are reversed in
pd_check_requested_voltage()
BUG=none
BRANCH=none
TEST=make buildall
Change-Id: Ifa55b94f43c848b383dc1ab59c857612238e8a63
Reviewed-on: https://chromium-review.googlesource.com/233371
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Commit-Queue: Bernard Shyu <bernard_shyu@bizlinktech.com>
Tested-by: Bernard Shyu <bernard_shyu@bizlinktech.com>
| -rw-r--r-- | board/fruitpie/usb_pd_policy.c | 4 | ||||
| -rw-r--r-- | board/host/usb_pd_policy.c | 4 | ||||
| -rw-r--r-- | board/plankton/usb_pd_policy.c | 4 | ||||
| -rw-r--r-- | board/ryu/usb_pd_policy.c | 4 | ||||
| -rw-r--r-- | board/ryu_p1/usb_pd_policy.c | 4 | ||||
| -rw-r--r-- | board/samus_pd/usb_pd_policy.c | 4 | ||||
| -rw-r--r-- | board/twinkie/usb_pd_policy.c | 4 | ||||
| -rw-r--r-- | board/zinger/usb_pd_policy.c | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/board/fruitpie/usb_pd_policy.c b/board/fruitpie/usb_pd_policy.c index 0958781422..976c43edc2 100644 --- a/board/fruitpie/usb_pd_policy.c +++ b/board/fruitpie/usb_pd_policy.c @@ -100,8 +100,8 @@ void pd_set_max_voltage(unsigned mv) int pd_check_requested_voltage(uint32_t rdo) { - int op_ma = rdo & 0x3FF; - int max_ma = (rdo >> 10) & 0x3FF; + int max_ma = rdo & 0x3FF; + int op_ma = (rdo >> 10) & 0x3FF; int idx = rdo >> 28; uint32_t pdo; uint32_t pdo_ma; diff --git a/board/host/usb_pd_policy.c b/board/host/usb_pd_policy.c index 423add3543..7b7a931d86 100644 --- a/board/host/usb_pd_policy.c +++ b/board/host/usb_pd_policy.c @@ -99,8 +99,8 @@ void pd_set_max_voltage(unsigned mv) int pd_check_requested_voltage(uint32_t rdo) { - int op_ma = rdo & 0x3FF; - int max_ma = (rdo >> 10) & 0x3FF; + int max_ma = rdo & 0x3FF; + int op_ma = (rdo >> 10) & 0x3FF; int idx = rdo >> 28; uint32_t pdo; uint32_t pdo_ma; diff --git a/board/plankton/usb_pd_policy.c b/board/plankton/usb_pd_policy.c index 500687a739..08d2dd4df3 100644 --- a/board/plankton/usb_pd_policy.c +++ b/board/plankton/usb_pd_policy.c @@ -118,8 +118,8 @@ void pd_set_max_voltage(unsigned mv) int pd_check_requested_voltage(uint32_t rdo) { - int op_ma = rdo & 0x3FF; - int max_ma = (rdo >> 10) & 0x3FF; + int max_ma = rdo & 0x3FF; + int op_ma = (rdo >> 10) & 0x3FF; int idx = rdo >> 28; uint32_t pdo; uint32_t pdo_ma; diff --git a/board/ryu/usb_pd_policy.c b/board/ryu/usb_pd_policy.c index cc8979e6f8..9bafd2435f 100644 --- a/board/ryu/usb_pd_policy.c +++ b/board/ryu/usb_pd_policy.c @@ -115,8 +115,8 @@ void pd_set_max_voltage(unsigned mv) int pd_check_requested_voltage(uint32_t rdo) { - int op_ma = rdo & 0x3FF; - int max_ma = (rdo >> 10) & 0x3FF; + int max_ma = rdo & 0x3FF; + int op_ma = (rdo >> 10) & 0x3FF; int idx = rdo >> 28; uint32_t pdo; uint32_t pdo_ma; diff --git a/board/ryu_p1/usb_pd_policy.c b/board/ryu_p1/usb_pd_policy.c index 918e4305c6..45cf597a11 100644 --- a/board/ryu_p1/usb_pd_policy.c +++ b/board/ryu_p1/usb_pd_policy.c @@ -115,8 +115,8 @@ void pd_set_max_voltage(unsigned mv) int pd_check_requested_voltage(uint32_t rdo) { - int op_ma = rdo & 0x3FF; - int max_ma = (rdo >> 10) & 0x3FF; + int max_ma = rdo & 0x3FF; + int op_ma = (rdo >> 10) & 0x3FF; int idx = rdo >> 28; uint32_t pdo; uint32_t pdo_ma; diff --git a/board/samus_pd/usb_pd_policy.c b/board/samus_pd/usb_pd_policy.c index 95af500e69..0831209ac1 100644 --- a/board/samus_pd/usb_pd_policy.c +++ b/board/samus_pd/usb_pd_policy.c @@ -134,8 +134,8 @@ void pd_set_max_voltage(unsigned mv) int pd_check_requested_voltage(uint32_t rdo) { - int op_ma = rdo & 0x3FF; - int max_ma = (rdo >> 10) & 0x3FF; + int max_ma = rdo & 0x3FF; + int op_ma = (rdo >> 10) & 0x3FF; int idx = rdo >> 28; uint32_t pdo; uint32_t pdo_ma; diff --git a/board/twinkie/usb_pd_policy.c b/board/twinkie/usb_pd_policy.c index 31856c907c..2ba6a21538 100644 --- a/board/twinkie/usb_pd_policy.c +++ b/board/twinkie/usb_pd_policy.c @@ -118,8 +118,8 @@ void pd_set_max_voltage(unsigned mv) int pd_check_requested_voltage(uint32_t rdo) { - int op_ma = rdo & 0x3FF; - int max_ma = (rdo >> 10) & 0x3FF; + int max_ma = rdo & 0x3FF; + int op_ma = (rdo >> 10) & 0x3FF; int idx = rdo >> 28; uint32_t pdo; uint32_t pdo_ma; diff --git a/board/zinger/usb_pd_policy.c b/board/zinger/usb_pd_policy.c index 8442f689d6..c1b24b4b08 100644 --- a/board/zinger/usb_pd_policy.c +++ b/board/zinger/usb_pd_policy.c @@ -181,8 +181,8 @@ int vbus_amp; int pd_check_requested_voltage(uint32_t rdo) { - int op_ma = rdo & 0x3FF; - int max_ma = (rdo >> 10) & 0x3FF; + int max_ma = rdo & 0x3FF; + int op_ma = (rdo >> 10) & 0x3FF; int idx = rdo >> 28; uint32_t pdo; uint32_t pdo_ma; |