[BH-1424] FreeRTOS update

Updated FreeRTOS source code to 10.4.6.
Moved FreeRTOS sources to the third-party directory.
Added necessary changes to the CMake configuration.
Split FreeRTOSConfig.h. From now, each board has its own.
Added missing log headers.
Minor refactor of the module-os cmake.
Fixed stack overflows in bell application main and time service.

Author: Mateusz Piesta

.gitmodules

@@ -109,3 +109,7 @@
 [submodule "third-party/msgpack11/msgpack11"]
 	path = third-party/msgpack11/msgpack11
 	url = https://github.com/ar90n/msgpack11.git
+[submodule "third-party/freeRTOS-kernel/freeRTOS-kernel"]
+	path = third-party/freeRTOS-kernel/freeRTOS-kernel
+	url = ../FreeRTOS-Kernel.git
+	branch = mudita

CMakeLists.txt

@@ -121,7 +121,6 @@ if (NOT ENABLE_SECURE_BOOT)
         )
 endif ()
 
-add_subdirectory(third-party)
 add_subdirectory(board)
 add_subdirectory(source)
 add_subdirectory(module-platform)
@@ -139,6 +138,7 @@ add_subdirectory(module-apps)
 add_subdirectory(module-bluetooth)
 add_subdirectory(image)
 add_subdirectory(host-tools)
+add_subdirectory(third-party)
 
 include(tools/clang-tidy.cmake)
 

Target_RT1051.cmake

@@ -57,14 +57,6 @@ add_compile_options(
         $<$<COMPILE_LANGUAGE:CXX>:-Wno-literal-suffix>
 )
 
-set(TARGET_SOURCES
-
-        ${CMAKE_CURRENT_LIST_DIR}/module-os/board/rt1051/_exit.cpp
-        ${CMAKE_CURRENT_LIST_DIR}/module-os/board/rt1051/__atexit.c
-        ${CMAKE_CURRENT_LIST_DIR}/module-os/board/rt1051/__call_atexit.c
-        CACHE INTERNAL ""
-)
-
 # where is the target environment
 SET(CMAKE_FIND_ROOT_PATH  ${TOOLCHAIN_PATH}/${TOOLCHAIN_PREFIX})
 # search for programs in the build host directories

board/rt1051/ldscripts/sections.ld

@@ -87,6 +87,7 @@ SECTIONS
     {
         *(NonCacheable)
         *(COMMON)
+        *libfreertos_kernel.a:*(.bss*)
         *libmodule-os.a:*(.bss*)
         *libmodule-sys.a:*(.bss*)
         *libmodule-bsp.a:*(.bss*)

module-audio/Audio/StreamFactory.cpp

@@ -7,6 +7,7 @@
 #include "transcode/TransformFactory.hpp"
 
 #include <Math.hpp>
+#include <log/log.hpp>
 
 #include <algorithm>
 #include <chrono>

module-audio/Audio/StreamQueuedEventsListener.cpp

@@ -4,6 +4,7 @@
 #include "StreamQueuedEventsListener.hpp"
 
 #include <macros.h>
+#include <log/log.hpp>
 
 #include <utility>
 

module-audio/board/rt1051/SAIAudioDevice.cpp

@@ -4,6 +4,7 @@
 #include "SAIAudioDevice.hpp"
 
 #include <Audio/Stream.hpp>
+#include <log/log.hpp>
 
 #include <cmath>
 

module-bsp/board/linux/hal/battery_charger/BatteryCharger.cpp

@@ -7,6 +7,7 @@
 
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 namespace hal::battery
 {

module-bsp/board/linux/hal/key_input/KeyInput.cpp

@@ -7,6 +7,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/epoll.h>
+#include <unistd.h>
+#include <cstdio>
 
 namespace hal::key_input
 {

module-bsp/board/linux/torch/torch.cpp

@@ -2,6 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "bsp/torch/torch.hpp"
+#include <log/log.hpp>
 
 static xQueueHandle qHandleIrq = NULL;
 

module-bsp/board/rt1051/bellpx/bsp/rotary_encoder/rotary_encoder.cpp

@@ -7,6 +7,7 @@
 #include <timers.h>
 #include <fsl_common.h>
 #include <fsl_qtmr.h>
+#include <log/log.hpp>
 
 /* Hardware PINS
  * TMR3_CH0-----GPIO_B0_06-----

module-bsp/board/rt1051/bellpx/hal/battery_charger/BatteryCharger.cpp

@@ -13,6 +13,7 @@
 #include <devices/power/MP2639B.hpp>
 #include <devices/power/CW2015.hpp>
 #include <board/BoardDefinitions.hpp>
+#include <log/log.hpp>
 
 namespace
 {

module-bsp/board/rt1051/bsp/audio/CodecMAX98090.hpp

@@ -8,8 +8,6 @@
 #include "drivers/i2c/DriverI2C.hpp"
 #include <cstdint>
 
-#include <cstdint>
-
 class CodecParamsMAX98090 : public CodecParams
 {
   public:

module-bsp/board/rt1051/bsp/eink/ED028TC1.cpp

@@ -16,10 +16,8 @@
 #include "FreeRTOS.h"
 #include "task.h"
 #include "semphr.h"
-//#include "fat_media.h"
-//#include "vfs.h"
 
-//#include "log.h"
+#include <log/log.hpp>
 #include "board.h"
 #include "eink_binarization_luts.h"
 #include "macros.h"

module-bsp/board/rt1051/bsp/headset/headset.cpp

@@ -9,6 +9,8 @@
 #include "fsl_common.h"
 #include "timers.h"
 
+#include <log/log.hpp>
+
 namespace bsp
 {
     namespace headset

module-bsp/board/rt1051/bsp/pit/pit.hpp

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <FreeRTOS.h>
-#include <FreeRTOS/include/queue.h>
+#include <queue.h>
 #include <functional>
 
 namespace bsp

module-bsp/board/rt1051/bsp/rtc/rtc.cpp

@@ -9,6 +9,7 @@
 #include <module-os/RTOSWrapper/include/ticks.hpp>
 #include <time/time_constants.hpp>
 #include <time.h>
+#include <log/log.hpp>
 
 namespace
 {

module-bsp/board/rt1051/bsp/torch/torch.cpp

@@ -8,6 +8,7 @@
 #include "drivers/i2c/DriverI2C.hpp"
 
 #include "fsl_common.h"
+#include <log/log.hpp>
 
 using namespace drivers;
 

module-bsp/board/rt1051/drivers/RT1051DriverDMAMux.cpp

@@ -4,6 +4,8 @@
 #include "RT1051DriverDMAMux.hpp"
 #include <algorithm>
 
+#include <log/log.hpp>
+
 namespace drivers
 {
 

module-bsp/board/rt1051/puretx/hal/battery_charger/BatteryCharger.cpp

@@ -15,7 +15,7 @@
 
 #include <hal/battery_charger/AbstractBatteryCharger.hpp>
 #include <bsp/battery_charger/battery_charger.hpp>
-
+#include <log/log.hpp>
 #include <magic_enum.hpp>
 
 namespace

module-bsp/board/rt1051/puretx/hal/battery_charger/CurrentMeasurementScope.cpp

@@ -3,12 +3,10 @@
 
 #include "CurrentMeasurementScope.hpp"
 
-extern "C"
-{
 #include "FreeRTOS.h"
-}
 #include <timers.h>
 #include <battery_charger/battery_charger.hpp>
+#include <log/log.hpp>
 #include <ticks.hpp>
 
 #include <chrono>

module-bsp/board/rt1051/puretx/irq_gpio.cpp

@@ -11,6 +11,7 @@
 #include "board/rt1051/bsp/eink/bsp_eink.h"
 #include <hal/key_input/KeyInput.hpp>
 #include <hal/battery_charger/BatteryChargerIRQ.hpp>
+#include <log/log.hpp>
 #include "bsp/cellular/bsp_cellular.hpp"
 #include "bsp/headset/headset.hpp"
 #include "board/BoardDefinitions.hpp"

module-bsp/bsp/cellular/bsp_cellular.hpp

@@ -9,7 +9,7 @@
 #include <memory>
 #include <chrono>
 #include <FreeRTOS.h>
-#include <FreeRTOS/include/queue.h>
+#include <queue.h>
 #include "drivers/lpuart/DriverLPUART.hpp"
 #include <EventStore.hpp>
 

module-bsp/devices/power/CW2015.cpp

@@ -6,6 +6,8 @@
 #include "FreeRTOS.h"
 #include "task.h"
 
+#include <log/log.hpp>
+
 /// CW2015 tips&tricks
 /// 1. Setting POR bits in Mode register doesn't seem to reset the state of registers. Nevertheless it is required to
 /// perform proper profile update.

module-os/CMakeLists.txt

@@ -1,43 +1,30 @@
 project(module-os VERSION 1.0
         DESCRIPTION "OS module library")
 
-set(SOURCES
-        ${CMAKE_CURRENT_SOURCE_DIR}/RTOSWrapper/ccondition_variable.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/RTOSWrapper/cevent_groups.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/RTOSWrapper/cmem_pool.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/RTOSWrapper/cmutex.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/RTOSWrapper/cqueue.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/RTOSWrapper/cread_write_lock.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/RTOSWrapper/csemaphore.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/RTOSWrapper/ctasklet.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/RTOSWrapper/cthread.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/RTOSWrapper/ctickhook.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/RTOSWrapper/ctimer.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/RTOSWrapper/cworkqueue.cpp
-
-        ${CMAKE_CURRENT_SOURCE_DIR}/FreeRTOS/application.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/FreeRTOS/event_groups.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/FreeRTOS/heap_4.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/FreeRTOS/list.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/FreeRTOS/queue.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/FreeRTOS/stream_buffer.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/FreeRTOS/timers.c
-
-        ${CMAKE_CURRENT_SOURCE_DIR}/memory/usermem.c
-
-        ${CMAKE_CURRENT_SOURCE_DIR}/CriticalSectionGuard.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/LockGuard.cpp
+add_library(${PROJECT_NAME} STATIC
+
+        RTOSWrapper/ccondition_variable.cpp
+        RTOSWrapper/cevent_groups.cpp
+        RTOSWrapper/cmem_pool.cpp
+        RTOSWrapper/cmutex.cpp
+        RTOSWrapper/cqueue.cpp
+        RTOSWrapper/cread_write_lock.cpp
+        RTOSWrapper/csemaphore.cpp
+        RTOSWrapper/ctasklet.cpp
+        RTOSWrapper/cthread.cpp
+        RTOSWrapper/ctickhook.cpp
+        RTOSWrapper/ctimer.cpp
+        RTOSWrapper/cworkqueue.cpp
+
+        application.c
+        memory/usermem.c
+
+        CriticalSectionGuard.cpp
+        LockGuard.cpp
+
+        $<$<BOOL:${PROF_ON}>:prof/prof.c>
         )
 
-add_library(${PROJECT_NAME} STATIC)
-target_sources(module-os PRIVATE ${SOURCES})
-if(NOT ${SYSTEM_VIEW_ENABLED})
-        target_sources(module-os PRIVATE FreeRTOS/tasks.c)
-endif()
-if(${PROF_ON})
-        target_sources(module-os PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/FreeRTOS/prof.c)
-endif()
-
 add_board_subdirectory(board)
 
 # Board specific compilation definitions,options,include directories and features
@@ -50,15 +37,15 @@ target_compile_definitions(${PROJECT_NAME}
         PUBLIC
 
         CPP_FREERTOS_CONDITION_VARIABLES
-)
+        )
 
 # enforce no optimization for RelWithDebInfo configuration to debug system memory
 if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
-        target_compile_options (${PROJECT_NAME} PRIVATE "-O0")
+    set_source_files_properties(memory/usermem.c PROPERTIES COMPILE_OPTIONS "-O0")
 endif ()
 
 if (${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR ${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
-	target_compile_definitions(${PROJECT_NAME} PRIVATE DEBUG_FREERTOS)
+    target_compile_definitions(${PROJECT_NAME} PUBLIC DEBUG_FREERTOS)
 endif ()
 
 target_include_directories(${PROJECT_NAME}
@@ -67,23 +54,19 @@ target_include_directories(${PROJECT_NAME}
 
         ${CMAKE_CURRENT_SOURCE_DIR}
 
-        ${CMAKE_CURRENT_SOURCE_DIR}/FreeRTOS/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/FreeRTOS
-        ${CMAKE_CURRENT_SOURCE_DIR}/RTOSWrapper/include
+        RTOSWrapper/include
+        prof
 
         )
 
 #Add FreeRTOS SystemvView headers if enabled
-if((${PROJECT_TARGET} STREQUAL "TARGET_RT1051") AND (${SYSTEM_VIEW_ENABLED}))
-    target_include_directories(${PROJECT_NAME}
-        PUBLIC
-            ${CMAKE_CURRENT_SOURCE_DIR}/systemviewPatch
-    )
+if ((${PROJECT_TARGET} STREQUAL "TARGET_RT1051") AND (${SYSTEM_VIEW_ENABLED}))
     target_link_libraries(${PROJECT_NAME} PUBLIC segger::systemview)
-endif()
+endif ()
 
-target_link_libraries(${PROJECT_NAME} PUBLIC log-api board-config)
+target_link_libraries(${PROJECT_NAME} PUBLIC log-api board-config freertos_kernel)
 
 if (${ENABLE_TESTS})
     add_subdirectory(test)
 endif ()
+