eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

freertos includes adapted

This commit is contained in:
Robin Müller 2020-05-14 21:26:04 +02:00
parent 49fa2fe32c
commit 69237bc2e8
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osal/FreeRTOS/MessageQueue.cpp
View File

@ -121,7 +121,7 @@ ReturnValue_t MessageQueue::sendMessageFromMessageQueue(MessageQueueId_t sendTo,
BaseType_t result;
if(callContext == CallContext::task) {
result = xQueueSendToBack(reinterpret_cast<QueueHandle_t>(sendTo),
reinterpret_cast<const void*>(message->getBuffer()), 0);
static_cast<const void*>(message->getBuffer()), 0);
}
else {
// If the call context is from an interrupt,
@ -129,7 +129,7 @@ ReturnValue_t MessageQueue::sendMessageFromMessageQueue(MessageQueueId_t sendTo,
// was blocked by the interrupt.
BaseType_t xHigherPriorityTaskWoken = pdFALSE;
result = xQueueSendFromISR(reinterpret_cast<QueueHandle_t>(sendTo),
reinterpret_cast<const void*>(message->getBuffer()),
static_cast<const void*>(message->getBuffer()),
&xHigherPriorityTaskWoken);
if(xHigherPriorityTaskWoken == pdTRUE) {
TaskManagement::requestContextSwitch(callContext);

4
osal/FreeRTOS/MessageQueue.h
View File

@ -7,8 +7,8 @@
#include <framework/osal/FreeRTOS/TaskManagement.h>
extern "C" {
#include "FreeRTOS.h"
#include "freertos/queue.h"
#include <freertos/FreeRTOS.h>
#include <freertos/queue.h>
}

6
osal/FreeRTOS/Mutex.h
View File

@ -3,9 +3,11 @@
#include <framework/ipc/MutexIF.h>
extern "C" {
#include <freertos/FreeRTOS.h>
#include <freertos/semphr.h>
}
#include <FreeRTOS.h>
#include "semphr.h"
/**
* @brief OS component to implement MUTual EXclusion

4
osal/FreeRTOS/TaskManagement.h
View File

@ -4,8 +4,8 @@
#include <framework/returnvalues/HasReturnvaluesIF.h>
extern "C" {
#include "FreeRTOS.h"
#include "task.h"
#include <freertos/FreeRTOS.h>
#include <freertos/task.h>
}
#include <cstdint>