implement osal critical for none/freertos/pico-sdk

3 files changed, 56 insertions, 14 deletions

diff --git a/src/osal/osal_freertos.h b/src/osal/osal_freertos.h
index ba998bfa1..5d6534709 100644
--- a/src/osal/osal_freertos.h
+++ b/src/osal/osal_freertos.h
@@ -102,38 +102,50 @@ TU_ATTR_ALWAYS_INLINE static inline void osal_task_delay(uint32_t msec) {
 //--------------------------------------------------------------------+
 // Critical API
 //--------------------------------------------------------------------+
+#define OSAL_CRITIAL_DEF(_name, _int_set) \
+  osal_critical_t _name
+
 #if TUSB_MCU_VENDOR_ESPRESSIF
-// Espressif critical take spinlock as argument
+// Espressif critical take spinlock as argument and does not use in_isr
 typedef portMUX_TYPE osal_critical_t;
 
 TU_ATTR_ALWAYS_INLINE static inline void osal_critical_init(osal_critical_t *ctx) {
   spinlock_initialize(ctx);
 }
 
-TU_ATTR_ALWAYS_INLINE static inline void osal_critical_enter(osal_critical_t *ctx) {
+TU_ATTR_ALWAYS_INLINE static inline void osal_critical_enter(osal_critical_t *ctx, bool in_isr) {
+  (void) in_isr;
   portENTER_CRITICAL(ctx);
 }
 
-TU_ATTR_ALWAYS_INLINE static inline void osal_critical_exit(osal_critical_t *ctx) {
+TU_ATTR_ALWAYS_INLINE static inline void osal_critical_exit(osal_critical_t *ctx, bool in_isr) {
+  (void) in_isr;
   portEXIT_CRITICAL(ctx);
 }
 
 #else
 
-typedef uint8_t osal_critical_t; // not used
+typedef UBaseType_t osal_critical_t;
 
 TU_ATTR_ALWAYS_INLINE static inline void osal_critical_init(osal_critical_t *ctx) {
   (void) ctx;
 }
 
-TU_ATTR_ALWAYS_INLINE static inline void osal_critical_enter(osal_critical_t *ctx) {
-  (void) ctx;
-  portENTER_CRITICAL();
+TU_ATTR_ALWAYS_INLINE static inline void osal_critical_enter(osal_critical_t *ctx, bool in_isr) {
+  if (in_isr) {
+    *ctx = taskENTER_CRITICAL_FROM_ISR();
+  } else {
+    taskENTER_CRITICAL();
+  }
 }
 
-TU_ATTR_ALWAYS_INLINE static inline void osal_critical_exit(osal_critical_t *ctx) {
+TU_ATTR_ALWAYS_INLINE static inline void osal_critical_exit(osal_critical_t *ctx, bool in_isr) {
   (void) ctx;
-  portEXIT_CRITICAL();
+  if (in_isr) {
+    taskEXIT_CRITICAL_FROM_ISR(*ctx);
+  } else {
+    taskEXIT_CRITICAL();
+  }
 }
 
 #endif
diff --git a/src/osal/osal_none.h b/src/osal/osal_none.h
index d9100cfdd..05a121ae6 100644
--- a/src/osal/osal_none.h
+++ b/src/osal/osal_none.h
@@ -43,18 +43,27 @@ TU_ATTR_WEAK void osal_task_delay(uint32_t msec);
 //--------------------------------------------------------------------+
 // Critical API
 //--------------------------------------------------------------------+
-typedef uint8_t osal_critical_t; // not used
+typedef struct {
+  void (* interrupt_set)(bool);
+} osal_critical_t;
+
+#define OSAL_CRITIAL_DEF(_name, _int_set) \
+  osal_critical_t _name = { .interrupt_set = _int_set }
 
 TU_ATTR_ALWAYS_INLINE static inline void osal_critical_init(osal_critical_t *ctx) {
   (void) ctx;
 }
 
-TU_ATTR_ALWAYS_INLINE static inline void osal_critical_enter(osal_critical_t *ctx) {
-  (void) ctx;
+TU_ATTR_ALWAYS_INLINE static inline void osal_critical_enter(osal_critical_t *ctx, bool in_isr) {
+  if (!in_isr) {
+    ctx->interrupt_set(false);
+  }
 }
 
-TU_ATTR_ALWAYS_INLINE static inline void osal_critical_exit(osal_critical_t *ctx) {
-  (void) ctx;
+TU_ATTR_ALWAYS_INLINE static inline void osal_critical_exit(osal_critical_t *ctx, bool in_isr) {
+  if (!in_isr) {
+    ctx->interrupt_set(true);
+  }
 }
 
 //--------------------------------------------------------------------+
diff --git a/src/osal/osal_pico.h b/src/osal/osal_pico.h
index 315de0950..be631ed18 100644
--- a/src/osal/osal_pico.h
+++ b/src/osal/osal_pico.h
@@ -44,6 +44,27 @@ TU_ATTR_ALWAYS_INLINE static inline void osal_task_delay(uint32_t msec) {
 }
 
 //--------------------------------------------------------------------+
+// Critical API
+//--------------------------------------------------------------------+
+typedef critical_section_t osal_critical_t;
+#define OSAL_CRITIAL_DEF(_name, _int_set) \
+  osal_critical_t _name
+
+TU_ATTR_ALWAYS_INLINE static inline void osal_critical_init(osal_critical_t *ctx) {
+  critical_section_init(ctx);
+}
+
+TU_ATTR_ALWAYS_INLINE static inline void osal_critical_enter(osal_critical_t *ctx, bool in_isr) {
+  (void) in_isr;
+  critical_section_enter_blocking(ctx);
+}
+
+TU_ATTR_ALWAYS_INLINE static inline void osal_critical_exit(osal_critical_t *ctx, bool in_isr) {
+  (void) in_isr;
+  critical_section_exit(ctx);
+}
+
+//--------------------------------------------------------------------+
 // Binary Semaphore API
 //--------------------------------------------------------------------+
 typedef struct semaphore osal_semaphore_def_t, * osal_semaphore_t;