From 06f898006ed762e677ed13cace5f6e9a2e0afff7 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sun, 25 Jul 2021 17:31:33 +0200
Subject: [PATCH] Added F2 support and try to save more memory

---
 radio/src/FreeRTOSConfig.h                           | 12 ++++++------
 radio/src/targets/common/arm/stm32/f2/CMakeLists.txt |  4 ++--
 radio/src/targets/taranis/diskio.cpp                 |  7 +------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/radio/src/FreeRTOSConfig.h b/radio/src/FreeRTOSConfig.h
index 9badff642..65a2ca018 100644
--- a/radio/src/FreeRTOSConfig.h
+++ b/radio/src/FreeRTOSConfig.h
@@ -31,12 +31,12 @@
 #define configMAX_PRIORITIES            ( 5 )
 #define configMINIMAL_STACK_SIZE        ( ( unsigned short ) 130 )
 //#define configTOTAL_HEAP_SIZE           ( ( size_t ) ( 75 * 1024 ) )
-#define configMAX_TASK_NAME_LEN         ( 10 )
+#define configMAX_TASK_NAME_LEN         1
 #define configUSE_TRACE_FACILITY        0 // 1 rco: save some memory? 
 #define configUSE_16_BIT_TICKS          0
 #define configIDLE_SHOULD_YIELD         1
 #define configUSE_MUTEXES               0
-#define configQUEUE_REGISTRY_SIZE       8
+#define configQUEUE_REGISTRY_SIZE       0
 #define configCHECK_FOR_STACK_OVERFLOW  0
 #define configUSE_RECURSIVE_MUTEXES     0
 #define configUSE_MALLOC_FAILED_HOOK    0
@@ -59,10 +59,10 @@
 
 /* Set the following definitions to 1 to include the API function, or zero
 to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet        1
-#define INCLUDE_uxTaskPriorityGet       1
-#define INCLUDE_vTaskDelete             1
-#define INCLUDE_vTaskCleanUpResources   1
+//#define INCLUDE_vTaskPrioritySet        1
+//#define INCLUDE_uxTaskPriorityGet       1
+//#define INCLUDE_vTaskDelete             1
+//#define INCLUDE_vTaskCleanUpResources   1
 #define INCLUDE_vTaskSuspend            1
 #define INCLUDE_vTaskDelayUntil         1
 #define INCLUDE_vTaskDelay              1
diff --git a/radio/src/targets/common/arm/stm32/f2/CMakeLists.txt b/radio/src/targets/common/arm/stm32/f2/CMakeLists.txt
index 8d0136c92..3aca8a114 100644
--- a/radio/src/targets/common/arm/stm32/f2/CMakeLists.txt
+++ b/radio/src/targets/common/arm/stm32/f2/CMakeLists.txt
@@ -35,7 +35,7 @@ include_directories(${RTOS_DIR}/portable/GCC/ARM_CM3)
 # System and FreeRTOS port files
 #
 set(FIRMWARE_TARGET_SRC ${FIRMWARE_TARGET_SRC}
-  ../../common/arm/stm32/f2/system_stm32f2xx.c
-  ../../${THIRDPARTY_DIR}/${RTOS_DIR}/portable/GCC/ARM_CM3/port.c
+  ../common/arm/stm32/f2/system_stm32f2xx.c
+  ../../${RTOS_DIR}/portable/GCC/ARM_CM3/port.c
   )
 
diff --git a/radio/src/targets/taranis/diskio.cpp b/radio/src/targets/taranis/diskio.cpp
index 6a5dc8352..0f33edc08 100644
--- a/radio/src/targets/taranis/diskio.cpp
+++ b/radio/src/targets/taranis/diskio.cpp
@@ -999,12 +999,7 @@ void sdInit(void)
 void sdInit(void)
 {
   TRACE("sdInit");
-
-  ioMutex = CoCreateMutex();
-  if (ioMutex >= CFG_MAX_MUTEX) {
-    //sd error
-    return;
-  }
+  RTOS_CREATE_MUTEX(ioMutex);
   sdMount();
 }