diff options
| author | Namyoon Woo <namyoon@chromium.org> | 2018-10-10 10:59:33 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-10-11 13:25:51 -0700 |
| commit | 873e7cd05bd379c4a082a2a99ad8690fa415e172 (patch) | |
| tree | 272698869385ee554c964844519b0690eedc2167 /extra | |
| parent | 125ca6432b09156967bdfa62aa5af6f91ab2cc6c (diff) | |
| download | chrome-ec-873e7cd05bd379c4a082a2a99ad8690fa415e172.tar.gz | |
cr50: minor code revision with macros regarding CCD capabilities.
Defined "Number of bits in CCD cap expression", "Bitmask for a
CCD cap expression", and "Number of CCD cap expressions in a
Byte," and replaced constant uses with macros in CR50 and gsctool
codes.
No binary size changes in either CR50 or gsctool.
BRANCH=cr50_ccd
BUG=none
TEST=manually tested with gsctool -I and CR50 console command 'ccd'.
Signed-off-by: Namyoon Woo <namyoon@chromium.org>
Change-Id: If91305090444395b6a938f920f4e47e2acbba886
Reviewed-on: https://chromium-review.googlesource.com/1274007
Commit-Ready: Namyoon Woo <namyoon@chromium.org>
Tested-by: Namyoon Woo <namyoon@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/usb_updater/gsctool.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/extra/usb_updater/gsctool.c b/extra/usb_updater/gsctool.c index 1f53adde16..66b859f675 100644 --- a/extra/usb_updater/gsctool.c +++ b/extra/usb_updater/gsctool.c @@ -1532,11 +1532,13 @@ static void print_ccd_info(void *response, size_t response_size) int cap_current; int cap_default; - index = i / (32/2); - shift = (i % (32/2)) * 2; + index = i / (32 / CCD_CAP_BITS); + shift = (i % (32 / CCD_CAP_BITS)) * CCD_CAP_BITS; - cap_current = (ccd_info.ccd_caps_current[index] >> shift) & 3; - cap_default = (ccd_info.ccd_caps_defaults[index] >> shift) & 3; + cap_current = (ccd_info.ccd_caps_current[index] >> shift) + & CCD_CAP_BITMASK; + cap_default = (ccd_info.ccd_caps_defaults[index] >> shift) + & CCD_CAP_BITMASK; if (ccd_info.ccd_force_disabled) { is_enabled = 0; |