Fix #1503, Update timer interval comparison

Author: pepepr08

src/unit-tests/ostimer-test/ut_ostimer_test.c

@@ -49,6 +49,7 @@ char        g_longTimerName[UT_OS_NAME_BUFF_SIZE];
 
 uint32    g_cbLoopCntMax = 5;
 uint32    g_toleranceVal = 0;
+uint32    g_intervalTime = 0;
 uint32    g_timerFirst   = 0;
 int32     g_status       = 0;
 osal_id_t g_timerId;
@@ -74,37 +75,35 @@ void UT_os_timercallback(osal_id_t timerId)
 {
     int              deltaTime = 0;
     static int32     loopCnt = 0, res = 0;
-    static uint32    prevIntervalTime = 0;
     static uint32    currIntervalTime = 0;
     static OS_time_t currTime = {0}, endTime = {0};
 
     if (OS_ObjectIdEqual(timerId, g_timerId))
     {
+
+        OS_GetLocalTime(&endTime);
+
         if (g_timerFirst)
         {
             g_timerFirst     = 0;
             g_status         = 0;
-            prevIntervalTime = 0;
             res              = 0;
             loopCnt          = 0;
-            OS_GetLocalTime(&currTime);
+            currTime         = endTime;
         }
 
-        OS_GetLocalTime(&endTime);
-
         currIntervalTime = OS_TimeGetTotalMicroseconds(OS_TimeSubtract(endTime, currTime));
 
-        if (currIntervalTime >= prevIntervalTime)
-            deltaTime = currIntervalTime - prevIntervalTime;
+        if (currIntervalTime >= g_intervalTime)
+            deltaTime = currIntervalTime - g_intervalTime;
         else
-            deltaTime = prevIntervalTime - currIntervalTime;
+            deltaTime = g_intervalTime - currIntervalTime;
 
         if ((deltaTime > g_toleranceVal) && (loopCnt > 1))
             res = -1;
 
         loopCnt++;
         currTime         = endTime;
-        prevIntervalTime = currIntervalTime;
 
         if (loopCnt == g_cbLoopCntMax)
         {

src/unit-tests/ostimer-test/ut_ostimer_test.h

@@ -51,6 +51,7 @@ extern char        g_longTimerName[UT_OS_NAME_BUFF_SIZE];
 
 extern uint32    g_cbLoopCntMax;
 extern uint32    g_toleranceVal;
+extern uint32    g_intervalTime;
 extern uint32    g_timerFirst;
 extern int32     g_status;
 extern osal_id_t g_timerId;

src/unit-tests/ostimer-test/ut_ostimer_timerio_test.c

@@ -401,7 +401,7 @@ void UT_os_timerdelete_test()
 **--------------------------------------------------------------------------------*/
 void UT_os_timerset_test()
 {
-    uint32 startTime = 0, intervalTime = 0;
+    uint32 startTime = 0;
 
     /*-----------------------------------------------------*/
     /* #1 Invalid-id-arg */
@@ -424,18 +424,18 @@ void UT_os_timerset_test()
         g_timerFirst   = 1;
         g_cbLoopCntMax = 10;
         startTime      = 1000;
-        intervalTime   = 5;
+        g_intervalTime = 5;
         g_toleranceVal = 0;
 
         UtPrintf("\nOS_TimerSet() - #3 Interval-too-short (clk_accuracy=%d)\n", (int)g_clkAccuracy);
-        if (UT_NOMINAL(OS_TimerSet(g_timerIds[3], startTime, intervalTime)))
+        if (UT_NOMINAL(OS_TimerSet(g_timerIds[3], startTime, g_intervalTime)))
         {
             while (g_status == 0)
             {
                 OS_TaskDelay(1);
             }
 
-            UtAssert_True(g_status < 0, "4# Nominal - callback status %d", (int)g_status);
+            UtAssert_True(g_status < 0, "#3 Interval-too-short - callback status %d", (int)g_status);
         }
 
         /* Reset test environment */
@@ -452,11 +452,11 @@ void UT_os_timerset_test()
         g_timerFirst   = 1;
         g_cbLoopCntMax = 10;
         startTime      = 1000;
-        intervalTime   = 500000;
-        g_toleranceVal = intervalTime / 20; /* 5% */
+        g_intervalTime = 500000;
+        g_toleranceVal = g_intervalTime / 20; /* 5% */
 
         UtPrintf("\nOS_TimerSet() - #4 Nominal condition (clk_accuracy=%d)\n", (int)g_clkAccuracy);
-        if (UT_NOMINAL(OS_TimerSet(g_timerIds[4], startTime, intervalTime)))
+        if (UT_NOMINAL(OS_TimerSet(g_timerIds[4], startTime, g_intervalTime)))
         {
             while (g_status == 0)
             {