From 3a6b8cc66be53a65d3d439338898619d4051d347 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 12 Jul 2021 16:32:14 +0200
Subject: [PATCH] FS queue size configurable

---
 bsp_q7s/memory/CMakeLists.txt        |  1 -
 bsp_q7s/memory/FileSystemHandler.cpp |  2 +-
 bsp_q7s/memory/FileSystemHandler.h   |  6 ++++++
 bsp_q7s/memory/SdCardAccess.cpp      |  7 -------
 bsp_q7s/memory/SdCardAccess.h        | 13 -------------
 bsp_q7s/memory/SdCardManager.h       | 15 +++++++++++++--
 linux/fsfwconfig/OBSWConfig.h.in     |  2 ++
 7 files changed, 22 insertions(+), 24 deletions(-)
 delete mode 100644 bsp_q7s/memory/SdCardAccess.cpp
 delete mode 100644 bsp_q7s/memory/SdCardAccess.h

diff --git a/bsp_q7s/memory/CMakeLists.txt b/bsp_q7s/memory/CMakeLists.txt
index ada948fb..6c7d0a94 100644
--- a/bsp_q7s/memory/CMakeLists.txt
+++ b/bsp_q7s/memory/CMakeLists.txt
@@ -1,6 +1,5 @@
 target_sources(${TARGET_NAME} PRIVATE
     FileSystemHandler.cpp
-    SdCardAccess.cpp
     SdCardManager.cpp
     scratchApi.cpp
 )
\ No newline at end of file
diff --git a/bsp_q7s/memory/FileSystemHandler.cpp b/bsp_q7s/memory/FileSystemHandler.cpp
index 5f7e0435..473a5167 100644
--- a/bsp_q7s/memory/FileSystemHandler.cpp
+++ b/bsp_q7s/memory/FileSystemHandler.cpp
@@ -6,7 +6,7 @@
 
 FileSystemHandler::FileSystemHandler(object_id_t fileSystemHandler):
         SystemObject(fileSystemHandler) {
-    mq = QueueFactory::instance()->createMessageQueue(50);
+    mq = QueueFactory::instance()->createMessageQueue(FS_MAX_QUEUE_SIZE);
 }
 
 FileSystemHandler::~FileSystemHandler() {
diff --git a/bsp_q7s/memory/FileSystemHandler.h b/bsp_q7s/memory/FileSystemHandler.h
index 04cea3dc..803e52b7 100644
--- a/bsp_q7s/memory/FileSystemHandler.h
+++ b/bsp_q7s/memory/FileSystemHandler.h
@@ -1,11 +1,15 @@
 #ifndef BSP_Q7S_MEMORY_FILESYSTEMHANDLER_H_
 #define BSP_Q7S_MEMORY_FILESYSTEMHANDLER_H_
 
+#include "OBSWConfig.h"
+
 #include "fsfw/ipc/MessageQueueIF.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
 #include "fsfw/objectmanager/SystemObject.h"
 #include "fsfw/memory/HasFileSystemIF.h"
 
+#include <string>
+
 class FileSystemHandler: public SystemObject,
         public ExecutableObjectIF,
         public HasFileSystemIF {
@@ -23,6 +27,8 @@ public:
 
 private:
     MessageQueueIF* mq = nullptr;
+    std::string currentMountPrefix;
+    static constexpr uint32_t FS_MAX_QUEUE_SIZE = config::OBSW_FILESYSTEM_HANDLER_QUEUE_SIZE;
 
     ReturnValue_t appendToFile(const char* repositoryPath,
             const char* filename, const uint8_t* data, size_t size,
diff --git a/bsp_q7s/memory/SdCardAccess.cpp b/bsp_q7s/memory/SdCardAccess.cpp
deleted file mode 100644
index 55efde98..00000000
--- a/bsp_q7s/memory/SdCardAccess.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "SdCardAccess.h"
-
-#include "fsfw/ipc/MutexGuard.h"
-
-SdCardAccess::SdCardAccess() {
-
-}
diff --git a/bsp_q7s/memory/SdCardAccess.h b/bsp_q7s/memory/SdCardAccess.h
deleted file mode 100644
index 38dc3336..00000000
--- a/bsp_q7s/memory/SdCardAccess.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef BSP_Q7S_MEMORY_SDCARDACCESS_H_
-#define BSP_Q7S_MEMORY_SDCARDACCESS_H_
-
-#include "definitions.h"
-
-class SdCardAccess {
-public:
-    SdCardAccess();
-private:
-};
-
-
-#endif /* BSP_Q7S_MEMORY_SDCARDACCESS_H_ */
diff --git a/bsp_q7s/memory/SdCardManager.h b/bsp_q7s/memory/SdCardManager.h
index 9a4dcbc5..d47b5322 100644
--- a/bsp_q7s/memory/SdCardManager.h
+++ b/bsp_q7s/memory/SdCardManager.h
@@ -56,8 +56,21 @@ public:
      */
     static SdCardManager* instance();
 
+    /**
+     * Set the preferred SD card which will determine which SD card will be used as the primary
+     * SD card in hot redundant and cold redundant mode. This function will not switch the
+     * SD cards which are currently on and mounted, this needs to be implemented by
+     * an upper layer by using #switchOffSdCard , #switchOnSdCard and #updateSdCardStateFile
+     * @param sdCard
+     * @return
+     */
     ReturnValue_t setPreferredSdCard(sd::SdCard sdCard);
 
+    /**
+     * Get the currently configured preferred SD card
+     * @param sdCard
+     * @return
+     */
     ReturnValue_t getPreferredSdCard(sd::SdCard& sdCard) const;
 
     /**
@@ -124,8 +137,6 @@ private:
 
     ReturnValue_t setSdCardState(sd::SdCard sdCard, bool on);
 
-    sd::SdCard preferredSdCard = sd::SdCard::SLOT_0;
-
     void processSdStatusLine(SdStatusPair& active, std::string& line, uint8_t& idx,
             sd::SdCard& currentSd);
 
diff --git a/linux/fsfwconfig/OBSWConfig.h.in b/linux/fsfwconfig/OBSWConfig.h.in
index a5a439ab..ef6b419d 100644
--- a/linux/fsfwconfig/OBSWConfig.h.in
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@@ -14,6 +14,8 @@
 #include "commonConfig.h"
 #include "OBSWVersion.h"
 
+#define OBSW_FILESYSTEM_HANDLER_QUEUE_SIZE  50
+
 /* These defines should be disabled for mission code but are useful for
 debugging. */
 #define OBSW_VERBOSE_LEVEL              1