From ff33bc6aea43009ec2fd17a90a851160330b33f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=82=E3=81=8F?= <alleteam@gmail.com>
Date: Thu, 8 Sep 2022 15:47:23 +0900
Subject: [PATCH] Furi: wait for timer wind down in destructor (#1716)

---
 applications/gui/modules/text_input.c |  2 --
 furi/core/timer.c                     | 29 ++++++++++++++-------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/applications/gui/modules/text_input.c b/applications/gui/modules/text_input.c
index 26f74e7a..b8098a3b 100644
--- a/applications/gui/modules/text_input.c
+++ b/applications/gui/modules/text_input.c
@@ -463,8 +463,6 @@ void text_input_free(TextInput* text_input) {
 
     // Send stop command
     furi_timer_stop(text_input->timer);
-    // Wait till timer stop
-    while(furi_timer_is_running(text_input->timer)) furi_delay_tick(1);
     // Release allocated memory
     furi_timer_free(text_input->timer);
 
diff --git a/furi/core/timer.c b/furi/core/timer.c
index 807f477e..462a2e89 100644
--- a/furi/core/timer.c
+++ b/furi/core/timer.c
@@ -1,5 +1,7 @@
 #include "timer.h"
 #include "check.h"
+#include "memmgr.h"
+#include "kernel.h"
 
 #include "core/common_defines.h"
 #include <FreeRTOS.h>
@@ -39,7 +41,7 @@ FuriTimer* furi_timer_alloc(FuriTimerCallback func, FuriTimerType type, void* co
     /* Dynamic memory allocation is available: if memory for callback and */
     /* its context is not provided, allocate it from dynamic memory pool */
     if(callb == NULL) {
-        callb = (TimerCallback_t*)pvPortMalloc(sizeof(TimerCallback_t));
+        callb = (TimerCallback_t*)malloc(sizeof(TimerCallback_t));
 
         if(callb != NULL) {
             /* Callback memory was allocated from dynamic pool, set flag */
@@ -65,7 +67,7 @@ FuriTimer* furi_timer_alloc(FuriTimerCallback func, FuriTimerType type, void* co
         if((hTimer == NULL) && (callb != NULL) && (callb_dyn == 1U)) {
             /* Failed to create a timer, release allocated resources */
             callb = (TimerCallback_t*)((uint32_t)callb & ~1U);
-            vPortFree(callb);
+            free(callb);
         }
     }
 
@@ -82,14 +84,16 @@ void furi_timer_free(FuriTimer* instance) {
 
     callb = (TimerCallback_t*)pvTimerGetTimerID(hTimer);
 
-    if(xTimerDelete(hTimer, portMAX_DELAY) == pdPASS) {
-        if((uint32_t)callb & 1U) {
-            /* Callback memory was allocated from dynamic pool, clear flag */
-            callb = (TimerCallback_t*)((uint32_t)callb & ~1U);
+    furi_check(xTimerDelete(hTimer, portMAX_DELAY) == pdPASS);
 
-            /* Return allocated memory to dynamic pool */
-            vPortFree(callb);
-        }
+    while (furi_timer_is_running(instance)) furi_delay_tick(2);
+
+    if((uint32_t)callb & 1U) {
+        /* Callback memory was allocated from dynamic pool, clear flag */
+        callb = (TimerCallback_t*)((uint32_t)callb & ~1U);
+
+        /* Return allocated memory to dynamic pool */
+        free(callb);
     }
 }
 
@@ -120,11 +124,8 @@ FuriStatus furi_timer_stop(FuriTimer* instance) {
     if(xTimerIsTimerActive(hTimer) == pdFALSE) {
         stat = FuriStatusErrorResource;
     } else {
-        if(xTimerStop(hTimer, portMAX_DELAY) == pdPASS) {
-            stat = FuriStatusOk;
-        } else {
-            stat = FuriStatusError;
-        }
+        furi_check(xTimerStop(hTimer, portMAX_DELAY) == pdPASS);
+        stat = FuriStatusOk;
     }
 
     /* Return execution status */