From 75a0df4cd97fd14bd5bb99475dcbaf14fbc4dda8 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 22 Dec 2020 15:59:28 +0100
Subject: [PATCH] tm storage update

---
 tmstorage/CMakeLists.txt      |  4 ++++
 tmstorage/TmStoreBackendIF.h  | 10 +++++-----
 tmstorage/TmStoreFrontendIF.h |  9 +++++----
 tmstorage/TmStoreMessage.cpp  |  2 +-
 tmstorage/TmStoreMessage.h    | 15 +++++++++------
 tmstorage/TmStorePackets.h    |  6 +++---
 6 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 tmstorage/CMakeLists.txt

diff --git a/tmstorage/CMakeLists.txt b/tmstorage/CMakeLists.txt
new file mode 100644
index 000000000..7990d85a1
--- /dev/null
+++ b/tmstorage/CMakeLists.txt
@@ -0,0 +1,4 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		TmStoreMessage.cpp
+)
diff --git a/tmstorage/TmStoreBackendIF.h b/tmstorage/TmStoreBackendIF.h
index 2ebe85e4c..4ae776095 100644
--- a/tmstorage/TmStoreBackendIF.h
+++ b/tmstorage/TmStoreBackendIF.h
@@ -1,5 +1,5 @@
-#ifndef PLATFORM_TMTCSERVICES_TMSTOREBACKENDIF_H_
-#define PLATFORM_TMTCSERVICES_TMSTOREBACKENDIF_H_
+#ifndef FSFW_TMTCSERVICES_TMSTOREBACKENDIF_H_
+#define FSFW_TMTCSERVICES_TMSTOREBACKENDIF_H_
 
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include "../objectmanager/SystemObjectIF.h"
@@ -51,7 +51,7 @@ public:
 	virtual ~TmStoreBackendIF() {}
 
 	/**
-	 * What do I need to implement here ?
+	 * SHOULDDO: Specification on what has to be implemented here
 	 * @param opCode
 	 * @return
 	 */
@@ -71,7 +71,7 @@ public:
 	virtual ReturnValue_t dumpIndex(store_address_t* storeId) = 0;
 
 	/**
-	 * TODO: Adapt for file management system?
+	 * SHOULDDO: Adapt for file management system?
 	 * @param startAddress
 	 * @param endAddress
 	 * @return
@@ -92,4 +92,4 @@ public:
 
 
 
-#endif /* PLATFORM_TMTCSERVICES_TMSTOREBACKENDIF_H_ */
+#endif /* FSFW_TMTCSERVICES_TMSTOREBACKENDIF_H_ */
diff --git a/tmstorage/TmStoreFrontendIF.h b/tmstorage/TmStoreFrontendIF.h
index e0a7e0782..beee7ede0 100644
--- a/tmstorage/TmStoreFrontendIF.h
+++ b/tmstorage/TmStoreFrontendIF.h
@@ -1,9 +1,10 @@
-#ifndef PLATFORM_TMTCSERVICES_TMSTOREFRONTENDIF_H_
-#define PLATFORM_TMTCSERVICES_TMSTOREFRONTENDIF_H_
+#ifndef FSFW_TMTCSERVICES_TMSTOREFRONTENDIF_H_
+#define FSFW_TMTCSERVICES_TMSTOREFRONTENDIF_H_
 
+#include "TmStorePackets.h"
 #include "../returnvalues/HasReturnvaluesIF.h"
-#include "../tmstorage/TmStorePackets.h"
 #include "../ipc/MessageQueueSenderIF.h"
+
 class TmPacketMinimal;
 class SpacePacketBase;
 class TmStoreBackendIF;
@@ -60,4 +61,4 @@ public:
 
 
 
-#endif /* PLATFORM_TMTCSERVICES_TMSTOREFRONTENDIF_H_ */
+#endif /* FSFW_TMTCSERVICES_TMSTOREFRONTENDIF_H_ */
diff --git a/tmstorage/TmStoreMessage.cpp b/tmstorage/TmStoreMessage.cpp
index 753ac1b74..033cbb1d2 100644
--- a/tmstorage/TmStoreMessage.cpp
+++ b/tmstorage/TmStoreMessage.cpp
@@ -1,5 +1,5 @@
+#include "TmStoreMessage.h"
 #include "../objectmanager/ObjectManagerIF.h"
-#include "../tmstorage/TmStoreMessage.h"
 
 TmStoreMessage::~TmStoreMessage() {
 	
diff --git a/tmstorage/TmStoreMessage.h b/tmstorage/TmStoreMessage.h
index 59354a203..d0178920c 100644
--- a/tmstorage/TmStoreMessage.h
+++ b/tmstorage/TmStoreMessage.h
@@ -1,10 +1,11 @@
-#ifndef FRAMEWORK_TMSTORAGE_TMSTOREMESSAGE_H_
-#define FRAMEWORK_TMSTORAGE_TMSTOREMESSAGE_H_
+#ifndef FSFW_TMSTORAGE_TMSTOREMESSAGE_H_
+#define FSFW_TMSTORAGE_TMSTOREMESSAGE_H_
 
+#include "TmStorePackets.h"
 #include "../ipc/CommandMessage.h"
 #include "../storagemanager/StorageManagerIF.h"
-#include "../tmstorage/TmStorePackets.h"
 #include "../objectmanager/SystemObjectIF.h"
+
 class TmStoreMessage  {
 public:
 	static ReturnValue_t setEnableStoringMessage(CommandMessage* cmd,
@@ -25,8 +26,10 @@ public:
 	static void setDownlinkContentTimeMessage(CommandMessage* cmd,
 			store_address_t storeId);
 	static void setIndexReportMessage(CommandMessage* cmd, store_address_t storeId);
-	static ReturnValue_t setDeleteBlocksMessage(CommandMessage* cmd, uint32_t addressLow, uint32_t addressHigh);
-	static ReturnValue_t setDownlinkBlocksMessage(CommandMessage* cmd, uint32_t addressLow, uint32_t addressHigh);
+	static ReturnValue_t setDeleteBlocksMessage(CommandMessage* cmd,
+			uint32_t addressLow, uint32_t addressHigh);
+	static ReturnValue_t setDownlinkBlocksMessage(CommandMessage* cmd,
+			uint32_t addressLow, uint32_t addressHigh);
 	static ReturnValue_t setIndexRequestMessage(CommandMessage* cmd);
 	static void setDeleteContentTimeMessage(CommandMessage* cmd,
 			store_address_t storeId);
@@ -60,4 +63,4 @@ private:
 	TmStoreMessage();
 };
 
-#endif /* FRAMEWORK_TMSTORAGE_TMSTOREMESSAGE_H_ */
+#endif /* FSFW_TMSTORAGE_TMSTOREMESSAGE_H_ */
diff --git a/tmstorage/TmStorePackets.h b/tmstorage/TmStorePackets.h
index 0312a9989..3abd0c1ca 100644
--- a/tmstorage/TmStorePackets.h
+++ b/tmstorage/TmStorePackets.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_TMSTORAGE_TMSTOREPACKETS_H_
-#define FRAMEWORK_TMSTORAGE_TMSTOREPACKETS_H_
+#ifndef FSFW_TMSTORAGE_TMSTOREPACKETS_H_
+#define FSFW_TMSTORAGE_TMSTOREPACKETS_H_
 
 #include "../serialize/SerialFixedArrayListAdapter.h"
 #include "../serialize/SerializeElement.h"
@@ -300,4 +300,4 @@ private:
 	uint8_t rawTimestamp[TimeStamperIF::MISSION_TIMESTAMP_SIZE];
 
 };
-#endif /* FRAMEWORK_TMSTORAGE_TMSTOREPACKETS_H_ */
+#endif /* FSFW_TMSTORAGE_TMSTOREPACKETS_H_ */