commit fffca2c696e5bb73c62c643e43886ad5eaf770dc
author Simon Wilson <simonwilson@google.com> Mon Jan 18 19:42:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 18 19:42:10 2016 +0000
tree c93f5789e8ec00ae63cbe1b28201a37965784896
parent 362c99ad8ca13fb63f10d007270d6596163956cc
parent 0dbfccba3428009b917f3cd63b961aa78f08c5c3

bmi160: prevent multiple time syncs
am: 0dbfccba34

* commit '0dbfccba3428009b917f3cd63b961aa78f08c5c3':
  bmi160: prevent multiple time syncs

firmware/src/drivers/bosch_bmi160_bmm150/bosch_bmi160_bmm150.c

diff --git a/firmware/src/drivers/bosch_bmi160_bmm150/bosch_bmi160_bmm150.c b/firmware/src/drivers/bosch_bmi160_bmm150/bosch_bmi160_bmm150.c
index c57a9a1..0a9d370 100644
--- a/firmware/src/drivers/bosch_bmi160_bmm150/bosch_bmi160_bmm150.c
+++ b/firmware/src/drivers/bosch_bmi160_bmm150/bosch_bmi160_bmm150.c
@@ -2154,7 +2154,7 @@
     case SENSOR_POWERING_UP:
         mSensor = (struct BMI160Sensor *)evtData;
         if (mSensor->idx <= MAG) {
-            if (!(mTask.fifo_enabled[0] || mTask.fifo_enabled[1] || mTask.fifo_enabled[2])) {
+            if (mTask.active_data_sensor_cnt++ == 0) {
                 // if this is the first data sensor to enable, we need to
                 // sync the sensor time and rtc time
                 invalidate_sensortime_to_rtc_time();
@@ -2358,6 +2358,7 @@
     mTask.Int2_EN = false;
     mTask.pending_int[0] = false;
     mTask.pending_int[1] = false;
+    mTask.active_data_sensor_cnt = 0;
 
     mTask.mode.speed = BMI160_SPI_SPEED_HZ;
     mTask.mode.bitsPerWord = 8;