From 57daec35d0c0b956e83492d63f411a24328e9193 Mon Sep 17 00:00:00 2001 From: WCX1024979076 Date: Tue, 25 Jul 2023 01:34:45 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3include=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=92=8CFreeRTOS.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FreeRTOS/SConscript | 2 +- FreeRTOS/include/freertos/FreeRTOS.h | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/FreeRTOS/SConscript b/FreeRTOS/SConscript index 9fd2397..058504a 100644 --- a/FreeRTOS/SConscript +++ b/FreeRTOS/SConscript @@ -5,7 +5,7 @@ cwd = GetCurrentDir() src = Glob('*.c') src += Glob(os.path.join("portable", "rt-thread", "*.c")) -CPPPATH = [os.path.join(cwd, "include", "freertos"), os.path.join(cwd, "portable", "rt-thread")] +CPPPATH = [os.path.join(cwd, "include", "freertos"), os.path.join(cwd, "include"), os.path.join(cwd, "portable", "rt-thread")] if GetDepend('PKG_FREERTOS_USING_MEMMANG_HEAP1'): src += [os.path.join("portable", "MemMang", "heap_1.c")] diff --git a/FreeRTOS/include/freertos/FreeRTOS.h b/FreeRTOS/include/freertos/FreeRTOS.h index b189e0a..3494d81 100644 --- a/FreeRTOS/include/freertos/FreeRTOS.h +++ b/FreeRTOS/include/freertos/FreeRTOS.h @@ -94,8 +94,8 @@ #define configMINIMAL_STACK_SIZE 128 #endif -#if defined(PKG_FREERTOS_USING_MEMMANG_HEAP1) || - defined(PKG_FREERTOS_USING_MEMMANG_HEAP2) || +#if defined(PKG_FREERTOS_USING_MEMMANG_HEAP1) || \ + defined(PKG_FREERTOS_USING_MEMMANG_HEAP2) || \ defined(PKG_FREERTOS_USING_MEMMANG_HEAP4) #ifndef configTOTAL_HEAP_SIZE #define configTOTAL_HEAP_SIZE 10240 @@ -105,7 +105,7 @@ #endif #endif -#if defined(PKG_FREERTOS_USING_MEMMANG_HEAP4) || +#if defined(PKG_FREERTOS_USING_MEMMANG_HEAP4) || \ defined(PKG_FREERTOS_USING_MEMMANG_HEAP5) #ifndef configUSE_FREERTOS_PROVIDED_HEAP #define configUSE_FREERTOS_PROVIDED_HEAP 1 @@ -121,7 +121,6 @@ /* The following features are not supported by RT-Thread */ #define INCLUDE_xTimerPendFunctionCall 0 -#define configNUM_THREAD_LOCAL_STORAGE_POINTERS 0 #define configUSE_CO_ROUTINES 0 #define configQUEUE_REGISTRY_SIZE 0 #define configUSE_QUEUE_SETS 0