From e67478f423dc3bbd43489c9d53560f81ced46a00 Mon Sep 17 00:00:00 2001 From: cajun-rat Date: Thu, 19 Mar 2020 14:53:46 +0000 Subject: [PATCH] FreeRTOS implementation of etl::mutex (#202) Signed-off-by: Phil Wise --- include/etl/mutex.h | 3 ++ include/etl/mutex/mutex_freertos.h | 79 ++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 include/etl/mutex/mutex_freertos.h diff --git a/include/etl/mutex.h b/include/etl/mutex.h index 7dcfc2c9..4c647d27 100644 --- a/include/etl/mutex.h +++ b/include/etl/mutex.h @@ -34,6 +34,9 @@ SOFTWARE. #if ETL_CPP11_SUPPORTED == 1 && !defined(ETL_NO_STL) #include "mutex/mutex_std.h" #define ETL_HAS_MUTEX 1 +#elif defined(ETL_TARGET_OS_FREERTOS) + #include "mutex/mutex_freertos.h" + #define ETL_HAS_MUTEX 1 #elif defined(ETL_COMPILER_ARM5) || defined(ETL_COMPILER_ARM6) || defined(ETL_COMPILER_ARM7) || defined(ETL_COMPILER_ARM8) #include "mutex/mutex_arm.h" #define ETL_HAS_MUTEX 1 diff --git a/include/etl/mutex/mutex_freertos.h b/include/etl/mutex/mutex_freertos.h new file mode 100644 index 00000000..0e7e35c8 --- /dev/null +++ b/include/etl/mutex/mutex_freertos.h @@ -0,0 +1,79 @@ +/****************************************************************************** +The MIT License(MIT) + +Embedded Template Library. +https://github.com/ETLCPP/etl +https://www.etlcpp.com + +Copyright(c) 2020 Phil Wise phil@phil-wise.com + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files(the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and / or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions : + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +******************************************************************************/ + +#ifndef ETL_MUTEX_FREERTOS_INCLUDED +#define ETL_MUTEX_FREERTOS_INCLUDED + +#include "../platform.h" + +#include "FreeRTOS.h" +#include + +namespace etl +{ +//*************************************************************************** +///\ingroup mutex +///\brief This mutex class is implemented using FreeRTOS's mutexes +//*************************************************************************** +class mutex +{ + public: + + + mutex() + { + access = xSemaphoreCreateMutexStatic(&mutex_allocation); + } + + void lock() + { + xSemaphoreTake(access, portMAX_DELAY); // portMAX_DELAY=block forever + } + + bool try_lock() + { + return xSemaphoreTake(access, 0) == pdTRUE; + } + + void unlock() + { + xSemaphoreGive(access); + } + + private: + // Non-copyable + mutex(const mutex&); + mutex& operator=(const mutex&); + // Memory to hold the mutex + StaticSemaphore_t mutex_allocation; + // The mutex handle itself + SemaphoreHandle_t access; +}; +} + +#endif