feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'contrib/github_pr_13022_v5.1' into 'release/v5.1'

Browse Source 
fix(freertos): Fix broken portable macro portTRY_ENTER_CRITICAL_SAFE() (v5.1)

See merge request espressif/esp-idf!30317
This commit is contained in:
Jiang Jiang Jian
2024-06-03 10:27:00 +08:00
parent f209f008f3 b562ceb8c1
commit 8d296506b5
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h
View File

@@ -340,7 +340,12 @@ FORCE_INLINE_ATTR BaseType_t xPortGetCoreID(void)
portEXIT_CRITICAL(mux); \ portEXIT_CRITICAL(mux); \
} \ } \
}) })
#define portTRY_ENTER_CRITICAL_SAFE(mux, timeout) portENTER_CRITICAL_SAFE(mux, timeout) #define portTRY_ENTER_CRITICAL_SAFE(mux, timeout) ({ \
(void)timeout; \
portENTER_CRITICAL_SAFE(mux); \
BaseType_t ret = pdPASS; \
ret; \
})
// ---------------------- Yielding ------------------------- // ---------------------- Yielding -------------------------

4
components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h
View File

@@ -197,7 +197,7 @@ BaseType_t xPortInterruptedFromISRContext(void);
static inline UBaseType_t xPortSetInterruptMaskFromISR(void); static inline UBaseType_t xPortSetInterruptMaskFromISR(void);
/** /**
* @brief Reenable interrupts in a nested manner (meant to be called from ISRs) * @brief Re-enable interrupts in a nested manner (meant to be called from ISRs)
* *
* @warning Only applies to current CPU. * @warning Only applies to current CPU.
* @param prev_level Previous interrupt level * @param prev_level Previous interrupt level
@@ -464,7 +464,7 @@ FORCE_INLINE_ATTR BaseType_t xPortGetCoreID(void);
#define portENTER_CRITICAL_ISR(mux) vPortEnterCritical(mux) #define portENTER_CRITICAL_ISR(mux) vPortEnterCritical(mux)
#define portEXIT_CRITICAL_ISR(mux) vPortExitCritical(mux) #define portEXIT_CRITICAL_ISR(mux) vPortExitCritical(mux)
#define portTRY_ENTER_CRITICAL_SAFE(mux, timeout) xPortEnterCriticalTimeoutSafe(mux) #define portTRY_ENTER_CRITICAL_SAFE(mux, timeout) xPortEnterCriticalTimeoutSafe(mux, timeout)
#define portENTER_CRITICAL_SAFE(mux) vPortEnterCriticalSafe(mux) #define portENTER_CRITICAL_SAFE(mux) vPortEnterCriticalSafe(mux)
#define portEXIT_CRITICAL_SAFE(mux) vPortExitCriticalSafe(mux) #define portEXIT_CRITICAL_SAFE(mux) vPortExitCriticalSafe(mux)