s32ze: canxl: always use OsIf_GetCounter before OsIf_GetElapsed

OsIf_GetCounter shall be used to obtain current counter
value before passing it to OsIf_GetElapsed.

Fix build warning.

Signed-off-by: Ha Duong Quang <[email protected]>

Author: haduongquang

s32/drivers/s32ze/Can_CANEXCEL/src/CanEXCEL_Ip.c

@@ -453,6 +453,7 @@ static Canexcel_Ip_StatusType Canexcel_ResetController(uint8 instance)
     uint32 uS2Ticks = OsIf_MicrosToTicks(CANEXCEL_IP_TIMEOUT_DURATION, CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);
     Canexcel_Ip_StatusType returnResult = CANEXCEL_STATUS_SUCCESS;
 
+    timeStart = OsIf_GetCounter(CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);
     /* Wait Hardware to became available after clock start */
     while ((CANEXCEL.EXL_SIC[instance]->SYSS & CANXL_SIC_SYSS_FRZACKF_MASK) == 0U)
     {
@@ -815,6 +816,7 @@ Canexcel_Ip_StatusType Canexcel_Ip_TxDescriptor(uint8 instance, uint8 descNo, ui
 {
     uint32 timeStart = 0U;
     uint32 timeElapsed = 0U;
+    uint32 uS2Ticks = OsIf_MicrosToTicks(CANEXCEL_IP_TIMEOUT_DURATION, CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);
     Canexcel_Ip_StateType * state = Canexcel_Ip_apxState[instance];
     Canexcel_Ip_StatusType returnResult = CANEXCEL_STATUS_SUCCESS;
 
@@ -825,14 +827,13 @@ Canexcel_Ip_StatusType Canexcel_Ip_TxDescriptor(uint8 instance, uint8 descNo, ui
     }
     else
     {
-        uint32 uS2Ticks = OsIf_MicrosToTicks(CANEXCEL_IP_TIMEOUT_DURATION, CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);
-        timeStart = OsIf_GetCounter(CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);
         /* Set system lock Status */
         #if (CANEXCEL_IP_HAS_SYSLOCK01 == STD_ON)
         CANEXCEL.EXL_DESC_CTR[instance]->DSCMBCTRLAR[descNo].DCSYSLOCK = 1U;
         #else
         (void)CANEXCEL.EXL_DESC_CTR[instance]->DSCMBCTRLAR[descNo].DCSYSLOCK;
         #endif
+        timeStart = OsIf_GetCounter(CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);
         while (CANEXCEL_DESCNTSTATUS_LOCKED_HW == CanXL_GetDescControlStatus(CANEXCEL.EXL_DESC_CTR[instance], descNo))
         {
             timeElapsed += OsIf_GetElapsed(&timeStart, CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);

s32/drivers/s32ze/Can_CANEXCEL/src/CanEXCEL_Ip_HwAccess.c

@@ -237,6 +237,7 @@ Canexcel_Ip_StatusType CanXL_SoftReset(CANXL_SIC_Type * base)
     Canexcel_Ip_StatusType returnResult = CANEXCEL_STATUS_SUCCESS;
     uint32 uS2Ticks = OsIf_MicrosToTicks(CANEXCEL_IP_TIMEOUT_DURATION, CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);
     base->SYSMC = CANXL_SIC_SYSMC_SOFRST_MASK;
+    timeStart = OsIf_GetCounter(CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);
     while ((base->SYSMC & CANXL_SIC_SYSMC_SOFRST_MASK) == CANXL_SIC_SYSMC_SOFRST_MASK)
     {
         timeElapsed += OsIf_GetElapsed(&timeStart, CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);
@@ -275,7 +276,7 @@ void CanXL_ClearRAM(const CANEXCEL_StructType * CANXL, uint8 instance)
        }
    }
    /* Clear the filter bank check the size in device reg as CANXL_IP_FILTER_BANK_SIZE */
-   volatile uint32 * ptr = &CANXL->EXL_FILTER[instance]->AFCFG0;
+   volatile uint32 * ptr = (volatile uint32 *)&CANXL->EXL_FILTER[instance]->AFCFG0;
    for (idx = 0u; idx <= (uint16)(CANXL_IP_FILTER_BANK_SIZE/4U); idx++)
    {
        ptr[idx] = 0U;
@@ -358,6 +359,7 @@ Canexcel_Ip_StatusType CanXL_EnterFreezeMode(CANXL_SIC_Type * base)
     }
     if (CANEXCEL_STATUS_SUCCESS == returnResult)
     {
+        timeElapsed = 0U;
         timeStart = OsIf_GetCounter(CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);
         while (0U == (base->SYSS & CANXL_SIC_SYSS_FRZACKF_MASK))
         {
@@ -376,6 +378,7 @@ Canexcel_Ip_StatusType CanXL_EnterFreezeMode(CANXL_SIC_Type * base)
         SchM_Enter_Can_43_CANEXCEL_CAN_EXCLUSIVE_AREA_01();
         base->SYSMC |= CANXL_SIC_SYSMC_LPMREQ_MASK;
         SchM_Exit_Can_43_CANEXCEL_CAN_EXCLUSIVE_AREA_01();
+        timeElapsed = 0U;
         timeStart = OsIf_GetCounter(CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);
         while (0U == (base->SYSS & CANXL_SIC_SYSS_LPMACKF_MASK))
         {
@@ -432,6 +435,7 @@ Canexcel_Ip_StatusType CanXL_ExitFreezeMode(CANXL_SIC_Type * base)
         SchM_Enter_Can_43_CANEXCEL_CAN_EXCLUSIVE_AREA_02();
         base->SYSMC &= ~CANXL_SIC_SYSMC_FRZREQ_MASK;
         SchM_Exit_Can_43_CANEXCEL_CAN_EXCLUSIVE_AREA_02();
+        timeElapsed = 0U;
         timeStart = OsIf_GetCounter(CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);
         while (0U == (base->SYSS & CANXL_SIC_SYSS_FRZACKF_MASK))
         {
@@ -449,6 +453,8 @@ Canexcel_Ip_StatusType CanXL_ExitFreezeMode(CANXL_SIC_Type * base)
         SchM_Enter_Can_43_CANEXCEL_CAN_EXCLUSIVE_AREA_02();
         base->SYSMC |= CANXL_SIC_SYSMC_LPMREQ_MASK;
         SchM_Exit_Can_43_CANEXCEL_CAN_EXCLUSIVE_AREA_02();
+        timeElapsed = 0U;
+        timeStart = OsIf_GetCounter(CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);
         while (0U == (base->SYSS & CANXL_SIC_SYSS_LPMACKF_MASK))
         {
             timeElapsed += OsIf_GetElapsed(&timeStart, CANEXCEL_IP_SERVICE_TIMEOUT_TYPE);