Merge branch 'bugfix/freertos_xportgetcoreid_iram' into 'master'

freertos: make sure xPortGetCoreID is placed into IRAM See merge request !1165
2017-08-29 13:32:37 +08:00 · 2017-08-29 13:32:37 +08:00 · 9a764f3108
parent 71fa25c560 eb1b4f971b
commit 9a764f3108
2 changed files with 2 additions and 1 deletions
--- a/components/freertos/include/freertos/portable.h
+++ b/components/freertos/include/freertos/portable.h
@ -197,7 +197,7 @@ BaseType_t xPortInIsrContext();
 #endif

 /* Multi-core: get current core ID */
-static inline uint32_t xPortGetCoreID() {
+static inline uint32_t IRAM_ATTR xPortGetCoreID() {
    int id;
    asm volatile(
        "rsr.prid %0\n"
--- a/components/freertos/include/freertos/portmacro.h
+++ b/components/freertos/include/freertos/portmacro.h
@ -121,6 +121,7 @@ typedef unsigned portBASE_TYPE	UBaseType_t;
 #include "portbenchmark.h"

 #include "sdkconfig.h"
+#include "esp_attr.h"

 #define portFIRST_TASK_HOOK CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG