Skip to content

Commit 5d27fbf

Browse files
committed
Fix deprecated xTaskGetAffinity-> xTaskGetCoreID
``` /__w/AtomVM/AtomVM/src/platforms/esp32/components/avm_sys/smp.c: In function 'scheduler_thread_entry_point': /__w/AtomVM/AtomVM/src/platforms/esp32/components/avm_sys/smp.c:69:5: warning: 'xTaskGetAffinity' is deprecated: This function is deprecated and will be removed in ESP-IDF 6.0. Please use xTaskGetCoreID() instead. [-Wdeprecated-declarations] 69 | BaseType_t core = xTaskGetAffinity(NULL); | ^~~~~~~~~~ In file included from /opt/esp/idf/components/freertos/FreeRTOS-Kernel/include/freertos/FreeRTOS.h:1533, from /__w/AtomVM/AtomVM/src/platforms/esp32/components/avm_sys/smp.c:32: /opt/esp/idf/components/freertos/esp_additions/include/freertos/idf_additions.h:639:12: note: declared here 639 | BaseType_t xTaskGetAffinity( TaskHandle_t xTask ) | ^~~~~~~~~~~~~~~~ [1055/1091] Building C object esp-idf/avm_sys/CMakeFiles/__idf_avm_sys.dir/platform_defaultatoms.c.obj [1056/1091] Building C object esp-idf/avm_sys/CMakeFiles/__idf_avm_sys.dir/jit_stream_flash.c.obj [1057/1091] Building C object esp-idf/avm_sys/CMakeFiles/__idf_avm_sys.dir/platform_nifs.c.obj [1058/1091] Building C object esp-idf/avm_sys/CMakeFiles/__idf_avm_sys.dir/sys.c.obj /__w/AtomVM/AtomVM/src/platforms/esp32/components/avm_sys/sys.c: In function 'sys_init_platform': /__w/AtomVM/AtomVM/src/platforms/esp32/components/avm_sys/sys.c:239:5: warning: 'xTaskGetAffinity' is deprecated: This function is deprecated and will be removed in ESP-IDF 6.0. Please use xTaskGetCoreID() instead. [-Wdeprecated-declarations] 239 | BaseType_t affinity = xTaskGetAffinity(NULL); | ^~~~~~~~~~ In file included from /opt/esp/idf/components/freertos/FreeRTOS-Kernel/include/freertos/FreeRTOS.h:1533, from /__w/AtomVM/AtomVM/src/platforms/esp32/components/avm_sys/include/esp32_sys.h:25, from /__w/AtomVM/AtomVM/src/platforms/esp32/components/avm_sys/sys.c:22: /opt/esp/idf/components/freertos/esp_additions/include/freertos/idf_additions.h:639:12: note: declared here 639 | BaseType_t xTaskGetAffinity( TaskHandle_t xTask ) | ^~~~~~~~~~~~~~~~ ``` Signed-off-by: Peter M <[email protected]>
1 parent 5bb7199 commit 5d27fbf

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/platforms/esp32/components/avm_sys/smp.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ static void *scheduler_thread_entry_point(void *arg)
6666
{
6767
g_sub_main_thread = true;
6868
void *result = (void *) scheduler_entry_point((GlobalContext *) arg);
69+
#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0))
70+
BaseType_t core = xTaskGetCoreID(NULL);
71+
#else
6972
BaseType_t core = xTaskGetAffinity(NULL);
73+
#endif
7074
if (core != -1) {
7175
uint32_t desired = 1;
7276
uint32_t expected = 3;

src/platforms/esp32/components/avm_sys/sys.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,11 @@ void sys_init_platform(GlobalContext *glb)
236236
// other cores, supposing it's pinned to core 0.
237237
esp_pthread_cfg_t esp_pthread_cfg = esp_pthread_get_default_config();
238238
esp_pthread_cfg.prio = uxTaskPriorityGet(NULL);
239+
#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0))
240+
BaseType_t affinity = xTaskGetCoreID(NULL);
241+
#else
239242
BaseType_t affinity = xTaskGetAffinity(NULL);
243+
#endif
240244
if (affinity == -1) {
241245
esp_pthread_cfg.pin_to_core = tskNO_AFFINITY;
242246
} else {

0 commit comments

Comments
 (0)