From 3ee25785a2cefa7eca6d33bba49e046df75a18e1 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 14 Dec 2020 21:54:03 +0100
Subject: [PATCH] linux changes adapted

---
 osal/linux/BinarySemaphore.cpp  |  2 +-
 osal/linux/Clock.cpp            | 20 ++++++++++----------
 osal/linux/Mutex.cpp            |  2 +-
 osal/linux/Mutex.h              |  8 ++------
 osal/linux/MutexFactory.cpp     |  3 ++-
 osal/linux/PosixThread.cpp      |  4 +++-
 osal/linux/SemaphoreFactory.cpp |  3 ++-
 osal/linux/TaskFactory.cpp      |  5 +++--
 osal/linux/Timer.cpp            |  3 ++-
 9 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/osal/linux/BinarySemaphore.cpp b/osal/linux/BinarySemaphore.cpp
index 8c0eeae71..b81fa1090 100644
--- a/osal/linux/BinarySemaphore.cpp
+++ b/osal/linux/BinarySemaphore.cpp
@@ -1,4 +1,4 @@
-#include "../../osal/linux/BinarySemaphore.h"
+#include "BinarySemaphore.h"
 #include "../../serviceinterface/ServiceInterfaceStream.h"
 
 extern "C" {
diff --git a/osal/linux/Clock.cpp b/osal/linux/Clock.cpp
index 468fcb80f..6cddda35b 100644
--- a/osal/linux/Clock.cpp
+++ b/osal/linux/Clock.cpp
@@ -1,4 +1,3 @@
-#include <fsfw/timemanager/Stopwatch.h>
 #include "../../serviceinterface/ServiceInterfaceStream.h"
 #include "../../timemanager/Clock.h"
 
@@ -86,15 +85,16 @@ ReturnValue_t Clock::getUptime(timeval* uptime) {
     return HasReturnvaluesIF::RETURN_OK;
 }
 
-uint32_t Clock::getUptimeSeconds() {
-	//TODO This is not posix compatible and delivers only seconds precision
-	struct sysinfo sysInfo;
-	int result = sysinfo(&sysInfo);
-	if(result != 0){
-		return HasReturnvaluesIF::RETURN_FAILED;
-	}
-	return sysInfo.uptime;
-}
+// Wait for new FSFW Clock function delivering seconds uptime.
+//uint32_t Clock::getUptimeSeconds() {
+//	//TODO This is not posix compatible and delivers only seconds precision
+//	struct sysinfo sysInfo;
+//	int result = sysinfo(&sysInfo);
+//	if(result != 0){
+//		return HasReturnvaluesIF::RETURN_FAILED;
+//	}
+//	return sysInfo.uptime;
+//}
 
 ReturnValue_t Clock::getUptime(uint32_t* uptimeMs) {
 	timeval uptime;
diff --git a/osal/linux/Mutex.cpp b/osal/linux/Mutex.cpp
index 2ecae0cb8..b27ff8c0a 100644
--- a/osal/linux/Mutex.cpp
+++ b/osal/linux/Mutex.cpp
@@ -1,4 +1,4 @@
-#include "../../osal/linux/Mutex.h"
+#include "Mutex.h"
 #include "../../serviceinterface/ServiceInterfaceStream.h"
 #include "../../timemanager/Clock.h"
 
diff --git a/osal/linux/Mutex.h b/osal/linux/Mutex.h
index 3acb6d90c..cfce407f7 100644
--- a/osal/linux/Mutex.h
+++ b/osal/linux/Mutex.h
@@ -1,12 +1,8 @@
-#ifndef OS_LINUX_MUTEX_H_
-#define OS_LINUX_MUTEX_H_
+#ifndef FSFW_OSAL_LINUX_MUTEX_H_
+#define FSFW_OSAL_LINUX_MUTEX_H_
 
 #include "../../ipc/MutexIF.h"
-
-extern "C" {
 #include <pthread.h>
-}
-
 
 class Mutex : public MutexIF {
 public:
diff --git a/osal/linux/MutexFactory.cpp b/osal/linux/MutexFactory.cpp
index 73ab10a2f..80211f8bc 100644
--- a/osal/linux/MutexFactory.cpp
+++ b/osal/linux/MutexFactory.cpp
@@ -1,5 +1,6 @@
+#include "Mutex.h"
+
 #include "../../ipc/MutexFactory.h"
-#include "../../osal/linux/Mutex.h"
 
 //TODO: Different variant than the lazy loading in QueueFactory. What's better and why?
 MutexFactory* MutexFactory::factoryInstance = new MutexFactory();
diff --git a/osal/linux/PosixThread.cpp b/osal/linux/PosixThread.cpp
index f6ace3805..55d74de3e 100644
--- a/osal/linux/PosixThread.cpp
+++ b/osal/linux/PosixThread.cpp
@@ -1,5 +1,7 @@
+#include "PosixThread.h"
+
 #include "../../serviceinterface/ServiceInterfaceStream.h"
-#include "../../osal/linux/PosixThread.h"
+
 #include <cstring>
 #include <errno.h>
 
diff --git a/osal/linux/SemaphoreFactory.cpp b/osal/linux/SemaphoreFactory.cpp
index e4710933e..cfb5f12dd 100644
--- a/osal/linux/SemaphoreFactory.cpp
+++ b/osal/linux/SemaphoreFactory.cpp
@@ -1,6 +1,7 @@
-#include "../../tasks/SemaphoreFactory.h"
 #include "BinarySemaphore.h"
 #include "CountingSemaphore.h"
+
+#include "../../tasks/SemaphoreFactory.h"
 #include "../../serviceinterface/ServiceInterfaceStream.h"
 
 SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr;
diff --git a/osal/linux/TaskFactory.cpp b/osal/linux/TaskFactory.cpp
index a25b817d7..d18a03161 100644
--- a/osal/linux/TaskFactory.cpp
+++ b/osal/linux/TaskFactory.cpp
@@ -1,5 +1,6 @@
-#include "../../osal/linux/FixedTimeslotTask.h"
-#include "../../osal/linux/PeriodicPosixTask.h"
+#include "FixedTimeslotTask.h"
+#include "PeriodicPosixTask.h"
+
 #include "../../tasks/TaskFactory.h"
 #include "../../returnvalues/HasReturnvaluesIF.h"
 
diff --git a/osal/linux/Timer.cpp b/osal/linux/Timer.cpp
index b458fd905..bae631d72 100644
--- a/osal/linux/Timer.cpp
+++ b/osal/linux/Timer.cpp
@@ -1,6 +1,7 @@
+#include "Timer.h"
 #include "../../serviceinterface/ServiceInterfaceStream.h"
 #include <errno.h>
-#include "../../osal/linux/Timer.h"
+
 
 Timer::Timer() {
 	sigevent sigEvent;