espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-07 06:34:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/freertos_linux_target_add_features' into 'master'

Browse Source 
freertos/linux: added event group and stream buffer

Closes IDF-6007

See merge request espressif/esp-idf!20878
This commit is contained in:
Jakob Hasse
2022-11-03 19:05:06 +08:00
parent e3ff53d0c1 37e8f1f348
commit a995c83060
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/freertos/CMakeLists.txt
View File

@@ -49,12 +49,6 @@ if(${target} STREQUAL "linux")
list(APPEND srcs list(APPEND srcs
"${kernel_dir}/portable/${arch}/port_idf.c" "${kernel_dir}/portable/${arch}/port_idf.c"
"${kernel_dir}/portable/${arch}/utils/wait_for_event.c") "${kernel_dir}/portable/${arch}/utils/wait_for_event.c")
# TODO: This is temporary until the following files can safely be added to the Linux target:
list(REMOVE_ITEM srcs
"${kernel_dir}/croutine.c"
"${kernel_dir}/event_groups.c"
"${kernel_dir}/stream_buffer.c")
else() else()
list(APPEND srcs list(APPEND srcs
"FreeRTOS-openocd.c" "FreeRTOS-openocd.c"

1
components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/portmacro_idf.h
View File

@@ -13,6 +13,7 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> // This is for malloc(), used by portmacro.h
#include "sdkconfig.h" #include "sdkconfig.h"
#include "esp_attr.h" #include "esp_attr.h"
#include "spinlock.h" #include "spinlock.h"

2
components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h
View File

@@ -191,7 +191,7 @@ This file get's pulled into assembly sources. Therefore, some includes need to b
// -------------------- Co-routines ----------------------- // -------------------- Co-routines -----------------------
#define configUSE_CO_ROUTINES 0 #define configUSE_CO_ROUTINES 0 // CO_ROUTINES are not supported in ESP-IDF
#define configMAX_CO_ROUTINE_PRIORITIES 2 #define configMAX_CO_ROUTINE_PRIORITIES 2
// ------------------- Software Timer ---------------------- // ------------------- Software Timer ----------------------