KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

newer non-deprecated semaphore call used

Browse Source
This commit is contained in:
Robin Müller 2020-04-23 18:12:02 +02:00
parent 0e6f8d3f82
commit 328737d0ad
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osal/FreeRTOS/BinarySemaphore.cpp
View File

@ -8,16 +8,13 @@
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include <framework/serviceinterface/ServiceInterfaceStream.h>
extern "C" {
#include "portmacro.h"
#include "task.h"
}
BinarySemaphore::BinarySemaphore() { BinarySemaphore::BinarySemaphore() {
xSemaphoreCreateBinary(handle); handle = xSemaphoreCreateBinary();
if(handle == nullptr) { if(handle == nullptr) {
error << "Binary semaphore creation failure" << std::endl; error << "Binary semaphore creation failure" << std::endl;
} }
xSemaphoreGive(handle);
} }
BinarySemaphore::~BinarySemaphore() { BinarySemaphore::~BinarySemaphore() {
@ -27,36 +24,40 @@ BinarySemaphore::~BinarySemaphore() {
// This copy ctor is important as it prevents the assignment to a ressource // This copy ctor is important as it prevents the assignment to a ressource
// (other.handle) variable which is later deleted! // (other.handle) variable which is later deleted!
BinarySemaphore::BinarySemaphore(const BinarySemaphore& other) { BinarySemaphore::BinarySemaphore(const BinarySemaphore& other) {
xSemaphoreCreateBinary(handle); handle = xSemaphoreCreateBinary();
if(handle == nullptr) { if(handle == nullptr) {
error << "Binary semaphore creation failure" << std::endl; error << "Binary semaphore creation failure" << std::endl;
} }
xSemaphoreGive(handle);
} }
BinarySemaphore& BinarySemaphore::operator =(const BinarySemaphore& s) { BinarySemaphore& BinarySemaphore::operator =(const BinarySemaphore& s) {
if(this != &s) { if(this != &s) {
xSemaphoreCreateBinary(handle); handle = xSemaphoreCreateBinary();
if(handle == nullptr) { if(handle == nullptr) {
error << "Binary semaphore creation failure" << std::endl; error << "Binary semaphore creation failure" << std::endl;
} }
xSemaphoreGive(handle);
} }
return *this; return *this;
} }
BinarySemaphore::BinarySemaphore(BinarySemaphore&& s) { BinarySemaphore::BinarySemaphore(BinarySemaphore&& s) {
xSemaphoreCreateBinary(handle); handle = xSemaphoreCreateBinary();
if(handle == nullptr) { if(handle == nullptr) {
error << "Binary semaphore creation failure" << std::endl; error << "Binary semaphore creation failure" << std::endl;
} }
xSemaphoreGive(handle);
} }
BinarySemaphore& BinarySemaphore::operator =( BinarySemaphore& BinarySemaphore::operator =(
BinarySemaphore&& s) { BinarySemaphore&& s) {
if(&s != this) { if(&s != this) {
xSemaphoreCreateBinary(handle); handle = xSemaphoreCreateBinary();
if(handle == nullptr) { if(handle == nullptr) {
error << "Binary semaphore creation failure" << std::endl; error << "Binary semaphore creation failure" << std::endl;
} }
xSemaphoreGive(handle);
} }
return *this; return *this;
} }
@ -127,7 +128,8 @@ ReturnValue_t BinarySemaphore::giveBinarySemaphore(SemaphoreHandle_t semaphore)
void BinarySemaphore::resetSemaphore() { void BinarySemaphore::resetSemaphore() {
if(handle != nullptr) { if(handle != nullptr) {
vSemaphoreDelete(handle); vSemaphoreDelete(handle);
xSemaphoreCreateBinary(handle); handle = xSemaphoreCreateBinary();
xSemaphoreGive(handle);
} }
} }

8
osal/FreeRTOS/BinarySemaphore.h
View File

@ -18,6 +18,10 @@ extern "C" {
* @brief OS Tool to achieve synchronization of between tasks or between task and ISR * @brief OS Tool to achieve synchronization of between tasks or between task and ISR
* @details * @details
* Documentation: https://www.freertos.org/Embedded-RTOS-Binary-Semaphores.html * Documentation: https://www.freertos.org/Embedded-RTOS-Binary-Semaphores.html
*
* SHOULDDO: check freeRTOS version and use new task notifications,
* if non-ancient freeRTOS version is used.
*
* @ingroup osal * @ingroup osal
*/ */
class BinarySemaphore: public HasReturnvaluesIF { class BinarySemaphore: public HasReturnvaluesIF {
@ -68,8 +72,8 @@ public:
/** /**
* Take the binary semaphore. * Take the binary semaphore.
* If the semaphore has already been taken, the task will be blocked for a maximum * If the semaphore has already been taken, the task will be blocked
* of #timeoutMs or until the semaphore is given back, * for a maximum of #timeoutMs or until the semaphore is given back,
* for example by an ISR or another task. * for example by an ISR or another task.
* @param timeoutMs * @param timeoutMs
* @return -@c RETURN_OK on success * @return -@c RETURN_OK on success