commit 15be52090197d0166749740705f651601b54326b
author Peng Xu <pengxu@google.com> Fri Oct 06 20:13:35 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 06 20:13:35 2017 +0000
tree 59f3b00fad921097bf873da115b64ea98afd6f25
parent fb0ef1ecddcdc2d4a2fe2a5d2534d38d79034d23
parent 68e443112a0d1eb1ee8351af78e50b03f6c72100

Merge "Use sched_setscheduler instead of scheduling policy service"

firmware/os/drivers/st_mag40/st_mag40.c

diff --git a/firmware/os/drivers/st_mag40/st_mag40.c b/firmware/os/drivers/st_mag40/st_mag40.c
index bdc874a..1b09fd5 100644
--- a/firmware/os/drivers/st_mag40/st_mag40.c
+++ b/firmware/os/drivers/st_mag40/st_mag40.c
@@ -674,8 +674,6 @@
     if (!extiIsPendingGpio(mTask.Int1))
         return false;
 
-    mTask.timestampInt = rtcGetTime();
-
     /* Start sampling for a value */
     if (!osEnqueuePrivateEvt(EVT_SENSOR_INTERRUPT, NULL, NULL, mTask.tid))
         ERROR_PRINT("st_mag40_int1_isr: osEnqueuePrivateEvt() failed\n");
@@ -701,6 +699,8 @@
     float xi, yi, zi;
 #endif
 
+    mTask.timestampInt = sensorGetTime();
+
 	/* Discard samples generated during sensor turn-on time */
     if (mTask.samplesToDiscard > 0) {
         mTask.samplesToDiscard--;
@@ -1024,6 +1024,9 @@
 static void endTask(void)
 {
     INFO_PRINT("ended\n");
+#if defined(ST_MAG40_CAL_ENABLED)
+    magCalDestroy(&mTask.moc);
+#endif /* ST_MAG40_CAL_ENABLED */
     slabAllocatorDestroy(mTask.magDataSlab);
     disableInterrupt(mTask.Int1, &mTask.Isr1);
 }