corrections for freertos osal
This commit is contained in:
parent
66a79cb86c
commit
d5dfffda2d
@ -1,8 +1,8 @@
|
|||||||
#ifndef FSFW_OSAL_FREERTOS_BINSEMAPHUSINGTASK_H_
|
#ifndef FSFW_OSAL_FREERTOS_BINSEMAPHUSINGTASK_H_
|
||||||
#define FSFW_OSAL_FREERTOS_BINSEMAPHUSINGTASK_H_
|
#define FSFW_OSAL_FREERTOS_BINSEMAPHUSINGTASK_H_
|
||||||
|
|
||||||
#include "../../returnvalues/HasReturnvaluesIF.h"
|
#include "fsfw/returnvalues/HasReturnvaluesIF.h"
|
||||||
#include "../../tasks/SemaphoreIF.h"
|
#include "fsfw/tasks/SemaphoreIF.h"
|
||||||
|
|
||||||
#include "FreeRTOS.h"
|
#include "FreeRTOS.h"
|
||||||
#include "task.h"
|
#include "task.h"
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#ifndef FSFW_OSAL_FREERTOS_BINARYSEMPAHORE_H_
|
#ifndef FSFW_OSAL_FREERTOS_BINARYSEMPAHORE_H_
|
||||||
#define FSFW_OSAL_FREERTOS_BINARYSEMPAHORE_H_
|
#define FSFW_OSAL_FREERTOS_BINARYSEMPAHORE_H_
|
||||||
|
|
||||||
#include "../../returnvalues/HasReturnvaluesIF.h"
|
#include "fsfw/returnvalues/HasReturnvaluesIF.h"
|
||||||
#include "../../tasks/SemaphoreIF.h"
|
#include "fsfw/tasks/SemaphoreIF.h"
|
||||||
|
|
||||||
#include "FreeRTOS.h"
|
#include "FreeRTOS.h"
|
||||||
#include "semphr.h"
|
#include "semphr.h"
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
#define FSFW_OSAL_FREERTOS_COUNTINGSEMAPHUSINGTASK_H_
|
#define FSFW_OSAL_FREERTOS_COUNTINGSEMAPHUSINGTASK_H_
|
||||||
|
|
||||||
#include "CountingSemaphUsingTask.h"
|
#include "CountingSemaphUsingTask.h"
|
||||||
#include "../../tasks/SemaphoreIF.h"
|
#include "fsfw/tasks/SemaphoreIF.h"
|
||||||
|
|
||||||
#include "FreeRTOS.h"
|
#include "FreeRTOS.h"
|
||||||
#include "task.h"
|
#include "task.h"
|
||||||
|
@ -2,9 +2,9 @@
|
|||||||
#define FSFW_OSAL_FREERTOS_FIXEDTIMESLOTTASK_H_
|
#define FSFW_OSAL_FREERTOS_FIXEDTIMESLOTTASK_H_
|
||||||
|
|
||||||
#include "FreeRTOSTaskIF.h"
|
#include "FreeRTOSTaskIF.h"
|
||||||
#include "../../tasks/FixedSlotSequence.h"
|
#include "fsfw/tasks/FixedSlotSequence.h"
|
||||||
#include "../../tasks/FixedTimeslotTaskIF.h"
|
#include "fsfw/tasks/FixedTimeslotTaskIF.h"
|
||||||
#include "../../tasks/Typedef.h"
|
#include "fsfw/tasks/Typedef.h"
|
||||||
|
|
||||||
#include "FreeRTOS.h"
|
#include "FreeRTOS.h"
|
||||||
#include "task.h"
|
#include "task.h"
|
||||||
|
@ -3,10 +3,10 @@
|
|||||||
|
|
||||||
#include "TaskManagement.h"
|
#include "TaskManagement.h"
|
||||||
|
|
||||||
#include "../../internalError/InternalErrorReporterIF.h"
|
#include "fsfw/internalerror/InternalErrorReporterIF.h"
|
||||||
#include "../../ipc/MessageQueueIF.h"
|
#include "fsfw/ipc/MessageQueueIF.h"
|
||||||
#include "../../ipc/MessageQueueMessageIF.h"
|
#include "fsfw/ipc/MessageQueueMessageIF.h"
|
||||||
#include "../../ipc/MessageQueueMessage.h"
|
#include "fsfw/ipc/MessageQueueMessage.h"
|
||||||
|
|
||||||
#include "FreeRTOS.h"
|
#include "FreeRTOS.h"
|
||||||
#include "queue.h"
|
#include "queue.h"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef FRAMEWORK_FREERTOS_MUTEX_H_
|
#ifndef FRAMEWORK_FREERTOS_MUTEX_H_
|
||||||
#define FRAMEWORK_FREERTOS_MUTEX_H_
|
#define FRAMEWORK_FREERTOS_MUTEX_H_
|
||||||
|
|
||||||
#include "../../ipc/MutexIF.h"
|
#include "fsfw/ipc/MutexIF.h"
|
||||||
|
|
||||||
#include "FreeRTOS.h"
|
#include "FreeRTOS.h"
|
||||||
#include "semphr.h"
|
#include "semphr.h"
|
||||||
|
@ -2,9 +2,9 @@
|
|||||||
#define FSFW_OSAL_FREERTOS_PERIODICTASK_H_
|
#define FSFW_OSAL_FREERTOS_PERIODICTASK_H_
|
||||||
|
|
||||||
#include "FreeRTOSTaskIF.h"
|
#include "FreeRTOSTaskIF.h"
|
||||||
#include "../../objectmanager/ObjectManagerIF.h"
|
#include "fsfw/objectmanager/ObjectManagerIF.h"
|
||||||
#include "../../tasks/PeriodicTaskIF.h"
|
#include "fsfw/tasks/PeriodicTaskIF.h"
|
||||||
#include "../../tasks/Typedef.h"
|
#include "fsfw/tasks/Typedef.h"
|
||||||
|
|
||||||
#include "FreeRTOS.h"
|
#include "FreeRTOS.h"
|
||||||
#include "task.h"
|
#include "task.h"
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
#ifndef FSFW_OSAL_FREERTOS_QUEUEMAPMANAGER_H_
|
#ifndef FSFW_OSAL_FREERTOS_QUEUEMAPMANAGER_H_
|
||||||
#define FSFW_OSAL_FREERTOS_QUEUEMAPMANAGER_H_
|
#define FSFW_OSAL_FREERTOS_QUEUEMAPMANAGER_H_
|
||||||
|
|
||||||
#include "../../ipc/MutexIF.h"
|
#include "fsfw/ipc/MutexIF.h"
|
||||||
#include "../../ipc/messageQueueDefinitions.h"
|
#include "fsfw/ipc/messageQueueDefinitions.h"
|
||||||
#include "../../ipc/MessageQueueIF.h"
|
#include "fsfw/ipc/MessageQueueIF.h"
|
||||||
|
|
||||||
#include "FreeRTOS.h"
|
#include "FreeRTOS.h"
|
||||||
#include "queue.h"
|
#include "queue.h"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef FSFW_TASKS_SEMAPHOREFACTORY_H_
|
#ifndef FSFW_TASKS_SEMAPHOREFACTORY_H_
|
||||||
#define FSFW_TASKS_SEMAPHOREFACTORY_H_
|
#define FSFW_TASKS_SEMAPHOREFACTORY_H_
|
||||||
|
|
||||||
#include "../tasks/SemaphoreIF.h"
|
#include "fsfw/tasks/SemaphoreIF.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates Semaphore.
|
* Creates Semaphore.
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# Check the OS_FSFW variable
|
# Check the OS_FSFW variable
|
||||||
if(FSFW_OSAL MATCHES "freertos")
|
if(FSFW_OSAL MATCHES "freertos")
|
||||||
add_subdirectory(FreeRTOS)
|
add_subdirectory(freertos)
|
||||||
elseif(FSFW_OSAL MATCHES "rtems")
|
elseif(FSFW_OSAL MATCHES "rtems")
|
||||||
add_subdirectory(rtems)
|
add_subdirectory(rtems)
|
||||||
elseif(FSFW_OSAL MATCHES "linux")
|
elseif(FSFW_OSAL MATCHES "linux")
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include "BinSemaphUsingTask.h"
|
#include "fsfw/osal/freertos/BinSemaphUsingTask.h"
|
||||||
#include "TaskManagement.h"
|
#include "fsfw/osal/freertos/TaskManagement.h"
|
||||||
#include "../../serviceinterface/ServiceInterfaceStream.h"
|
#include "fsfw/serviceinterface/ServiceInterface.h"
|
||||||
|
|
||||||
#if (tskKERNEL_VERSION_MAJOR == 8 && tskKERNEL_VERSION_MINOR > 2) || \
|
#if (tskKERNEL_VERSION_MAJOR == 8 && tskKERNEL_VERSION_MINOR > 2) || \
|
||||||
tskKERNEL_VERSION_MAJOR > 8
|
tskKERNEL_VERSION_MAJOR > 8
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include "BinarySemaphore.h"
|
#include "fsfw/osal/freertos/BinarySemaphore.h"
|
||||||
#include "TaskManagement.h"
|
#include "fsfw/osal/freertos/TaskManagement.h"
|
||||||
#include "../../serviceinterface/ServiceInterfaceStream.h"
|
#include "fsfw/serviceinterface/ServiceInterface.h"
|
||||||
|
|
||||||
BinarySemaphore::BinarySemaphore() {
|
BinarySemaphore::BinarySemaphore() {
|
||||||
handle = xSemaphoreCreateBinary();
|
handle = xSemaphoreCreateBinary();
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
#include "Timekeeper.h"
|
#include "fsfw/osal/freertos/Timekeeper.h"
|
||||||
|
|
||||||
#include "../../timemanager/Clock.h"
|
#include "fsfw/timemanager/Clock.h"
|
||||||
#include "../../globalfunctions/timevalOperations.h"
|
#include "fsfw/globalfunctions/timevalOperations.h"
|
||||||
|
|
||||||
#include "FreeRTOS.h"
|
#include "FreeRTOS.h"
|
||||||
#include "task.h"
|
#include "task.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <cstdlib>
|
||||||
#include <time.h>
|
#include <ctime>
|
||||||
|
|
||||||
//TODO sanitize input?
|
//TODO sanitize input?
|
||||||
//TODO much of this code can be reused for tick-only systems
|
//TODO much of this code can be reused for tick-only systems
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "CountingSemaphUsingTask.h"
|
#include "fsfw/osal/freertos/CountingSemaphUsingTask.h"
|
||||||
#include "TaskManagement.h"
|
#include "fsfw/osal/freertos/TaskManagement.h"
|
||||||
|
|
||||||
#include "../../serviceinterface/ServiceInterfaceStream.h"
|
#include "fsfw/serviceinterface/ServiceInterface.h"
|
||||||
|
|
||||||
#if (tskKERNEL_VERSION_MAJOR == 8 && tskKERNEL_VERSION_MINOR > 2) || \
|
#if (tskKERNEL_VERSION_MAJOR == 8 && tskKERNEL_VERSION_MINOR > 2) || \
|
||||||
tskKERNEL_VERSION_MAJOR > 8
|
tskKERNEL_VERSION_MAJOR > 8
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "CountingSemaphore.h"
|
#include "fsfw/osal/freertos/CountingSemaphore.h"
|
||||||
#include "TaskManagement.h"
|
#include "fsfw/osal/freertos/TaskManagement.h"
|
||||||
|
|
||||||
#include "../../serviceinterface/ServiceInterfaceStream.h"
|
#include "fsfw/serviceinterface/ServiceInterface.h"
|
||||||
|
|
||||||
#include "FreeRTOS.h"
|
#include "FreeRTOS.h"
|
||||||
#include "semphr.h"
|
#include "semphr.h"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "FixedTimeslotTask.h"
|
#include "fsfw/osal/freertos/FixedTimeslotTask.h"
|
||||||
|
|
||||||
#include "../../objectmanager/ObjectManager.h"
|
#include "fsfw/objectmanager/ObjectManager.h"
|
||||||
#include "../../serviceinterface/ServiceInterface.h"
|
#include "fsfw/serviceinterface/ServiceInterface.h"
|
||||||
|
|
||||||
uint32_t FixedTimeslotTask::deadlineMissedCount = 0;
|
uint32_t FixedTimeslotTask::deadlineMissedCount = 0;
|
||||||
const size_t PeriodicTaskIF::MINIMUM_STACK_SIZE = configMINIMAL_STACK_SIZE;
|
const size_t PeriodicTaskIF::MINIMUM_STACK_SIZE = configMINIMAL_STACK_SIZE;
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#include "MessageQueue.h"
|
#include "fsfw/osal/freertos/MessageQueue.h"
|
||||||
#include "QueueMapManager.h"
|
#include "fsfw/osal/freertos/QueueMapManager.h"
|
||||||
|
|
||||||
#include "fsfw/objectmanager/ObjectManager.h"
|
#include "fsfw/objectmanager/ObjectManager.h"
|
||||||
#include "fsfw/serviceinterface/ServiceInterface.h"
|
#include "fsfw/serviceinterface/ServiceInterface.h"
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include "Mutex.h"
|
#include "fsfw/osal/freertos/Mutex.h"
|
||||||
|
|
||||||
#include "../../serviceinterface/ServiceInterfaceStream.h"
|
#include "fsfw/serviceinterface/ServiceInterface.h"
|
||||||
|
|
||||||
Mutex::Mutex() {
|
Mutex::Mutex() {
|
||||||
handle = xSemaphoreCreateMutex();
|
handle = xSemaphoreCreateMutex();
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include "Mutex.h"
|
#include "fsfw/osal/freertos/Mutex.h"
|
||||||
|
|
||||||
#include "../../ipc/MutexFactory.h"
|
#include "fsfw/ipc/MutexFactory.h"
|
||||||
|
|
||||||
|
|
||||||
//TODO: Different variant than the lazy loading in QueueFactory.
|
//TODO: Different variant than the lazy loading in QueueFactory.
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#include "PeriodicTask.h"
|
#include "fsfw/osal/freertos/PeriodicTask.h"
|
||||||
|
|
||||||
#include "../../objectmanager/ObjectManager.h"
|
#include "fsfw/objectmanager/ObjectManager.h"
|
||||||
#include "../../serviceinterface/ServiceInterface.h"
|
#include "fsfw/serviceinterface/ServiceInterface.h"
|
||||||
#include "../../tasks/ExecutableObjectIF.h"
|
#include "fsfw/tasks/ExecutableObjectIF.h"
|
||||||
|
|
||||||
PeriodicTask::PeriodicTask(const char *name, TaskPriority setPriority,
|
PeriodicTask::PeriodicTask(const char *name, TaskPriority setPriority,
|
||||||
TaskStackSize setStack, TaskPeriod setPeriod,
|
TaskStackSize setStack, TaskPeriod setPeriod,
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#include "MessageQueue.h"
|
#include "fsfw/osal/freertos/MessageQueue.h"
|
||||||
|
|
||||||
#include "../../ipc/MessageQueueSenderIF.h"
|
#include "fsfw/ipc/MessageQueueSenderIF.h"
|
||||||
#include "../../ipc/QueueFactory.h"
|
#include "fsfw/ipc/QueueFactory.h"
|
||||||
|
|
||||||
|
|
||||||
QueueFactory* QueueFactory::factoryInstance = nullptr;
|
QueueFactory* QueueFactory::factoryInstance = nullptr;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include "QueueMapManager.h"
|
#include "fsfw/osal/freertos/QueueMapManager.h"
|
||||||
#include "../../ipc/MutexFactory.h"
|
#include "fsfw/ipc/MutexFactory.h"
|
||||||
#include "../../ipc/MutexGuard.h"
|
#include "fsfw/ipc/MutexGuard.h"
|
||||||
|
|
||||||
QueueMapManager* QueueMapManager::mqManagerInstance = nullptr;
|
QueueMapManager* QueueMapManager::mqManagerInstance = nullptr;
|
||||||
|
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
#include "BinarySemaphore.h"
|
#include "fsfw/osal/freertos/BinarySemaphore.h"
|
||||||
#include "BinSemaphUsingTask.h"
|
#include "fsfw/osal/freertos/BinSemaphUsingTask.h"
|
||||||
#include "CountingSemaphore.h"
|
#include "fsfw/osal/freertos/CountingSemaphore.h"
|
||||||
#include "CountingSemaphUsingTask.h"
|
#include "fsfw/osal/freertos/CountingSemaphUsingTask.h"
|
||||||
|
|
||||||
#include "../../tasks/SemaphoreFactory.h"
|
#include "fsfw/tasks/SemaphoreFactory.h"
|
||||||
#include "../../serviceinterface/ServiceInterface.h"
|
#include "fsfw/serviceinterface/ServiceInterface.h"
|
||||||
|
|
||||||
SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr;
|
SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr;
|
||||||
|
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
#include "../../tasks/TaskFactory.h"
|
#include "fsfw/tasks/TaskFactory.h"
|
||||||
#include "../../returnvalues/HasReturnvaluesIF.h"
|
#include "fsfw/osal/freertos/PeriodicTask.h"
|
||||||
|
#include "fsfw/osal/freertos/FixedTimeslotTask.h"
|
||||||
#include "PeriodicTask.h"
|
|
||||||
#include "FixedTimeslotTask.h"
|
|
||||||
|
|
||||||
|
#include "fsfw/returnvalues/HasReturnvaluesIF.h"
|
||||||
|
|
||||||
TaskFactory* TaskFactory::factoryInstance = new TaskFactory();
|
TaskFactory* TaskFactory::factoryInstance = new TaskFactory();
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "TaskManagement.h"
|
#include "fsfw/osal/freertos/TaskManagement.h"
|
||||||
|
|
||||||
void TaskManagement::vRequestContextSwitchFromTask() {
|
void TaskManagement::vRequestContextSwitchFromTask() {
|
||||||
vTaskDelay(0);
|
vTaskDelay(0);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "Timekeeper.h"
|
#include "fsfw/osal/freertos/Timekeeper.h"
|
||||||
|
|
||||||
#include "FreeRTOSConfig.h"
|
#include "FreeRTOSConfig.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user