diff options
author | Zhengyin Qian <qianzy@google.com> | 2016-07-13 23:35:43 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-13 23:35:43 +0000 |
commit | aa2bfdd2e6c7f72e8620f919bcce1b2ca96e8672 (patch) | |
tree | 0e4b25ef0c6cc0727013d265874d12747e5233ea /firmware/os/drivers/bosch_bmi160/bosch_bmi160.c | |
parent | 0f687179ea11991a410430ca3d6f8f768e7b6891 (diff) | |
parent | d12335c4b47408fe33c9695922fff6b11e7764e0 (diff) | |
download | contexthub-aa2bfdd2e6c7f72e8620f919bcce1b2ca96e8672.tar.gz |
Merge \\"nanohub: bmi160: restore retry count at the correct place.\\" into nyc-mr1-dev am: 4800fdd15f
am: d12335c4b4
Change-Id: Icecc59a0701b5c9b6e8de029f7fd5b2cd5ff7eeb
Diffstat (limited to 'firmware/os/drivers/bosch_bmi160/bosch_bmi160.c')
-rw-r--r-- | firmware/os/drivers/bosch_bmi160/bosch_bmi160.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/os/drivers/bosch_bmi160/bosch_bmi160.c b/firmware/os/drivers/bosch_bmi160/bosch_bmi160.c index 605d55a6..a9b5866a 100644 --- a/firmware/os/drivers/bosch_bmi160/bosch_bmi160.c +++ b/firmware/os/drivers/bosch_bmi160/bosch_bmi160.c @@ -3236,7 +3236,6 @@ static void handleSpiDoneEvt(const void* evtData) switch (GET_STATE()) { case SENSOR_BOOT: - T(mRetryLeft) = RETRY_CNT_ID; SET_STATE(SENSOR_VERIFY_ID); // dummy reads after boot, wait 100us SPI_READ(BMI160_REG_MAGIC, 1, &mTask.statusBuffer, 100); @@ -3413,6 +3412,7 @@ static void handleEvent(uint32_t evtType, const void* evtData) switch (evtType) { case EVT_APP_START: SET_STATE(SENSOR_BOOT); + T(mRetryLeft) = RETRY_CNT_ID; osEventUnsubscribe(mTask.tid, EVT_APP_START); // wait 100ms for sensor to boot |