diff options
| author | Ayushee <ayushee.shah@intel.com> | 2019-03-26 16:25:23 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-29 07:23:43 -0700 |
| commit | 77bab9c3c6b79ba6678e1a12bc38fc639affc557 (patch) | |
| tree | 3d9bd37f6bb907f039ead860a4a5247364e440d8 /util | |
| parent | f40e99d76a8d511eabf6746520f95ac155dab8df (diff) | |
| download | chrome-ec-77bab9c3c6b79ba6678e1a12bc38fc639affc557.tar.gz | |
ectool: Updating EC_CMD_USB_PD_CONTROL command versions
BUG=None
BRANCH=None
TEST=Manually tested on Dragonegg, able to get correct supported version
for the usb_pd_control command
Change-Id: I53f3e6cf6458bac27ffbc9f73e8f74674b92dd50
Signed-off-by: Ayushee <ayushee.shah@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/1540461
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Ayushee Shah <ayushee.shah@intel.com>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/ectool.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/util/ectool.c b/util/ectool.c index 42646923c5..a44613c1f3 100644 --- a/util/ectool.c +++ b/util/ectool.c @@ -5085,7 +5085,7 @@ int cmd_usb_pd(int argc, char *argv[]) int rv, i, j; int option_ok; char *e; - int cmdver = 2; + int cmdver; BUILD_ASSERT(ARRAY_SIZE(role_str) == USB_PD_CTRL_ROLE_COUNT); BUILD_ASSERT(ARRAY_SIZE(mux_str) == USB_PD_CTRL_MUX_COUNT); @@ -5094,9 +5094,6 @@ int cmd_usb_pd(int argc, char *argv[]) p.mux = USB_PD_CTRL_MUX_NO_CHANGE; p.swap = USB_PD_CTRL_SWAP_NONE; - if (!ec_cmd_version_supported(EC_CMD_USB_PD_CONTROL, cmdver)) - cmdver = 0; - if (argc < 2) { fprintf(stderr, "No port specified.\n"); return -1; @@ -5171,6 +5168,13 @@ int cmd_usb_pd(int argc, char *argv[]) } } + if (ec_cmd_version_supported(EC_CMD_USB_PD_CONTROL, 2)) + cmdver = 2; + else if (ec_cmd_version_supported(EC_CMD_USB_PD_CONTROL, 1)) + cmdver = 1; + else + cmdver = 0; + rv = ec_command(EC_CMD_USB_PD_CONTROL, cmdver, &p, sizeof(p), ec_inbuf, ec_max_insize); @@ -5248,7 +5252,7 @@ int cmd_usb_pd(int argc, char *argv[]) (r_v1->role & PD_CTRL_RESP_ROLE_EXT_POWERED) ? " Externally powered\n" : ""); } - return (rv < 0 ? rv : 0); + return 0; } static void print_pd_power_info(struct ec_response_usb_pd_power_info *r) |