alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-25 17:58:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

FreeRTOS: Convert portMUX_DEBUG to a configuration item

Browse Source
This commit is contained in:
Angus Gratton
2016-08-25 16:30:47 +08:00
parent 96b9649aa4
commit 00ea21f736
4 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/freertos/include/freertos/portmacro.h
View File

@@ -120,13 +120,12 @@ typedef unsigned portBASE_TYPE UBaseType_t;
#include "sdkconfig.h"
#define portMUX_DEBUG
#define portFIRST_TASK_HOOK CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG
typedef struct {
volatile uint32_t mux;
#ifdef portMUX_DEBUG
#ifdef CONFIG_FREERTOS_PORTMUX_DEBUG
const char *lastLockedFn;
int lastLockedLine;
#endif
@@ -151,7 +150,7 @@ typedef struct {
#define portMUX_VAL_SHIFT 0
//Keep this in sync with the portMUX_TYPE struct definition please.
#ifdef portMUX_DEBUG
#ifndef CONFIG_FREERTOS_PORTMUX_DEBUG
#define portMUX_INITIALIZER_UNLOCKED { \
.mux = portMUX_MAGIC_VAL|portMUX_FREE_VAL \
}
@@ -170,13 +169,6 @@ typedef struct {
#define portCRITICAL_NESTING_IN_TCB 1
/*
Enable this to enable mux debugging. With this on, the mux code will warn you for deadlocks
and double releases etc.
*/
#define portMUX_DEBUG
/*
Modifications to portENTER_CRITICAL:
@@ -198,7 +190,7 @@ This all assumes that interrupts are either entirely disabled or enabled. Interr
will break this scheme.
*/
void vPortCPUInitializeMutex(portMUX_TYPE *mux);
#ifdef portMUX_DEBUG
#ifdef CONFIG_FREERTOS_PORTMUX_DEBUG
void vPortCPUAcquireMutex(portMUX_TYPE *mux, const char *function, int line);
portBASE_TYPE vPortCPUReleaseMutex(portMUX_TYPE *mux, const char *function, int line);
void vTaskEnterCritical( portMUX_TYPE *mux, const char *function, int line );