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

WIP: somethings wrong.. #19

Closed
muellerr wants to merge 808 commits from source/master into master
pull from: source/master
merge into: KSat:master
Conversation 0 Commits 808 Files Changed 512 +10 -8
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 69237bc2e8 - Show all commits

4
osal/FreeRTOS/MessageQueue.cpp
View File

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

4
osal/FreeRTOS/MessageQueue.h
View File

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

6
osal/FreeRTOS/Mutex.h
View File

@ -3,9 +3,11 @@
#include <framework/ipc/MutexIF.h> #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 * @brief OS component to implement MUTual EXclusion

4
osal/FreeRTOS/TaskManagement.h
View File

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