follow up to pr468

1 files changed, 24 insertions, 17 deletions

diff --git a/src/osal/osal_freertos.h b/src/osal/osal_freertos.h
index 416065eeb..004bd1b6b 100644
--- a/src/osal/osal_freertos.h
+++ b/src/osal/osal_freertos.h
@@ -32,7 +32,6 @@
 #include "semphr.h"
 #include "queue.h"
 #include "task.h"
-#include "tusb_option.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -59,19 +58,23 @@ static inline osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semde
 
 static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)
 {
-  if(!in_isr){
+  if ( !in_isr )
+  {
     return xSemaphoreGive(sem_hdl) != 0;
   }
-  BaseType_t xHigherPriorityTaskWoken;
-  BaseType_t res = xSemaphoreGiveFromISR(sem_hdl, &xHigherPriorityTaskWoken);
+  else
+  {
+    BaseType_t xHigherPriorityTaskWoken;
+    BaseType_t res = xSemaphoreGiveFromISR(sem_hdl, &xHigherPriorityTaskWoken);
+
 #if CFG_TUSB_MCU == OPT_MCU_ESP32S2
-  if (xHigherPriorityTaskWoken) {
-    portYIELD_FROM_ISR();
-  }
+    if ( xHigherPriorityTaskWoken ) portYIELD_FROM_ISR();
 #else
-  portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+    portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
 #endif
-  return res != 0;
+
+    return res != 0;
+  }
 }
 
 static inline bool osal_semaphore_wait (osal_semaphore_t sem_hdl, uint32_t msec)
@@ -138,19 +141,23 @@ static inline bool osal_queue_receive(osal_queue_t qhdl, void* data)
 
 static inline bool osal_queue_send(osal_queue_t qhdl, void const * data, bool in_isr)
 {
-  if(!in_isr){
+  if ( !in_isr )
+  {
     return xQueueSendToBack(qhdl, data, OSAL_TIMEOUT_WAIT_FOREVER) != 0;
   }
-  BaseType_t xHigherPriorityTaskWoken;
-  BaseType_t res = xQueueSendToBackFromISR(qhdl, data, &xHigherPriorityTaskWoken);
+  else
+  {
+    BaseType_t xHigherPriorityTaskWoken;
+    BaseType_t res = xQueueSendToBackFromISR(qhdl, data, &xHigherPriorityTaskWoken);
+
 #if CFG_TUSB_MCU == OPT_MCU_ESP32S2
-  if (xHigherPriorityTaskWoken) {
-    portYIELD_FROM_ISR();
-  }
+    if ( xHigherPriorityTaskWoken ) portYIELD_FROM_ISR();
 #else
-  portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+    portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
 #endif
-  return res != 0;
+
+    return res != 0;
+  }
 }
 
 static inline bool osal_queue_empty(osal_queue_t qhdl)