diff options
| author | suryaprakash.konduru <suryaprakash.konduru@nxp.com> | 2023-08-01 12:02:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-01 12:02:51 +0000 |
| commit | c74aa509103c059b73e3c06cf13b123383771fa0 (patch) | |
| tree | 245e29234b4bb18272c8944988c09dc5776e9385 | |
| parent | 1f468511112391fb94eb85de31dd90dc90b1e00d (diff) | |
| parent | 8fb921434e6f58d3a11ee12418184a168b381257 (diff) | |
| download | weaver-c74aa509103c059b73e3c06cf13b123383771fa0.tar.gz | |
Fix for incorrect timeout value for large timeouts am: 8fb921434e
Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/weaver/+/2683226
Change-Id: Ic7e53f0d451d713b985b45cebb34893ab95b6c15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libese_weaver/src/weaver-parser-impl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libese_weaver/src/weaver-parser-impl.cpp b/libese_weaver/src/weaver-parser-impl.cpp index e00542c..229a349 100644 --- a/libese_weaver/src/weaver-parser-impl.cpp +++ b/libese_weaver/src/weaver-parser-impl.cpp @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright 2020, 2022 NXP + * Copyright 2020, 2022-2023 NXP * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -342,9 +342,9 @@ Status_Weaver WeaverParserImpl::ParseGetDataInfo(std::vector<uint8_t> response, /* datasize value should be 6 as 4 bytes for time out + 2 bytes for failure count */ if (*readOffset++ == (sizeof(getDataInfo.timeout) + sizeof(getDataInfo.failure_count))) { - getDataInfo.timeout = *readOffset++ << BYTE3_MSB_POS; + getDataInfo.timeout = *readOffset++ << BYTE1_MSB_POS; getDataInfo.timeout |= *readOffset++ << BYTE2_MSB_POS; - getDataInfo.timeout |= *readOffset++ << BYTE1_MSB_POS; + getDataInfo.timeout |= *readOffset++ << BYTE3_MSB_POS; getDataInfo.timeout |= *readOffset++; getDataInfo.failure_count = *readOffset++ << BYTE3_MSB_POS; getDataInfo.failure_count |= *readOffset; |