espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2026-05-05 12:25:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/freertos_portmux_debug' into 'master'

Browse Source 
freertos: fix compilation errors with portMUX debugging enabled

See merge request !1392
This commit is contained in:
Ivan Grokhotkov
2017-10-17 04:44:04 +08:00
parent a638871aa5 715d081341
commit 468d90762a
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/freertos/port.c
+1 -1
View File
@@ -319,7 +319,7 @@ void vPortCPUAcquireMutex(portMUX_TYPE *mux, const char *fnName, int line) {
portEXIT_CRITICAL_NESTED(irqStatus);
}
bool vPortCPUAcquireMutexTimeout(portMUX_TYPE *mux, uint32_t timeout_cycles, const char *fnName, int line) {
bool vPortCPUAcquireMutexTimeout(portMUX_TYPE *mux, int timeout_cycles, const char *fnName, int line) {
unsigned int irqStatus = portENTER_CRITICAL_NESTED();
bool result = vPortCPUAcquireMutexIntsDisabled(mux, timeout_cycles, fnName, line);
portEXIT_CRITICAL_NESTED(irqStatus);