Merge branch 'bugfix/freertos_xportgetcoreid_iram' into 'master'

freertos: make sure xPortGetCoreID is placed into IRAM

See merge request !1165
This commit is contained in:
Ivan Grokhotkov
2017-08-29 13:32:37 +08:00
2 changed files with 2 additions and 1 deletions

View File

@@ -197,7 +197,7 @@ BaseType_t xPortInIsrContext();
#endif #endif
/* Multi-core: get current core ID */ /* Multi-core: get current core ID */
static inline uint32_t xPortGetCoreID() { static inline uint32_t IRAM_ATTR xPortGetCoreID() {
int id; int id;
asm volatile( asm volatile(
"rsr.prid %0\n" "rsr.prid %0\n"

View File

@@ -121,6 +121,7 @@ typedef unsigned portBASE_TYPE UBaseType_t;
#include "portbenchmark.h" #include "portbenchmark.h"
#include "sdkconfig.h" #include "sdkconfig.h"
#include "esp_attr.h"
#define portFIRST_TASK_HOOK CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG #define portFIRST_TASK_HOOK CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG