diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-19 18:01:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-19 18:01:40 +0000 |
| commit | ef16898a3991f5257b072e5edfff437be8523439 (patch) | |
| tree | 65ec98fea40c862f56bd20aaadda8d56f93c8983 | |
| parent | 14953c08ee5e52ee9ac7f46508fb309a30aaa970 (diff) | |
| parent | f712a2da13a1963558cfbec388dc5d397272bc0d (diff) | |
| download | contexthub-ef16898a3991f5257b072e5edfff437be8523439.tar.gz | |
Merge "firmware: Remove obsolete gyroCalDestroy() call" am: 2e1270465b am: 5ecfa2325e am: f712a2da13
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1464508
Change-Id: Ieb223e9342b3e9d4f3609268779c642e694b061d
| -rw-r--r-- | firmware/os/drivers/invensense_icm40600/invensense_icm40600.c | 3 | ||||
| -rw-r--r-- | firmware/os/drivers/st_lsm6dsm/st_lsm6dsm.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/firmware/os/drivers/invensense_icm40600/invensense_icm40600.c b/firmware/os/drivers/invensense_icm40600/invensense_icm40600.c index dc85f551..9410b192 100644 --- a/firmware/os/drivers/invensense_icm40600/invensense_icm40600.c +++ b/firmware/os/drivers/invensense_icm40600/invensense_icm40600.c @@ -3258,9 +3258,6 @@ static void endTask(void) #ifdef ACCEL_CAL_ENABLED accelCalDestroy(&T(accel_cal)); #endif -#ifdef GYRO_CAL_ENABLED - gyroCalDestroy(&T(gyro_cal)); -#endif slabAllocatorDestroy(T(mDataSlab)); spiMasterRelease(T(spiDev)); diff --git a/firmware/os/drivers/st_lsm6dsm/st_lsm6dsm.c b/firmware/os/drivers/st_lsm6dsm/st_lsm6dsm.c index d8e7e87b..0c9930c8 100644 --- a/firmware/os/drivers/st_lsm6dsm/st_lsm6dsm.c +++ b/firmware/os/drivers/st_lsm6dsm/st_lsm6dsm.c @@ -5209,9 +5209,6 @@ static void lsm6dsm_endTask(void) #ifdef LSM6DSM_MAGN_CALIB_ENABLED magCalDestroy(&T(magnCal)); #endif /* LSM6DSM_MAGN_CALIB_ENABLED */ -#ifdef LSM6DSM_GYRO_CALIB_ENABLED - gyroCalDestroy(&T(gyroCal)); -#endif /* LSM6DSM_GYRO_CALIB_ENABLED */ lsm6dsm_disableInterrupt(T(int1), &T(isr1)); #ifdef LSM6DSM_I2C_MASTER_BAROMETER_ENABLED |