From a493771f97361e025bba2fb381b5367cdeb3afae Mon Sep 17 00:00:00 2001
From: Lucjan Bryndza <lucjan.bryndza@mudita.com>
Date: Fri, 22 Jan 2021 15:38:57 +0100
Subject: [PATCH] [EGD-5385] Fix unallowed use of ff_rename

Fix unallowed use of ff_rename FFAT function
---
 .../bsp/battery-charger/battery_charger.cpp     | 17 +++--------------
 module-db/tests/EventsTable_tests.cpp           |  6 +++---
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/module-bsp/board/rt1051/bsp/battery-charger/battery_charger.cpp b/module-bsp/board/rt1051/bsp/battery-charger/battery_charger.cpp
index ef8fd7cc3029e9519f9189cbdbf296bb1c55f4b2..f20adff51dd00c9e13bd6971b169d07597c76fc2 100644
--- a/module-bsp/board/rt1051/bsp/battery-charger/battery_charger.cpp
+++ b/module-bsp/board/rt1051/bsp/battery-charger/battery_charger.cpp
@@ -2,6 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "bsp/battery-charger/battery_charger.hpp"
+#include "fsl_common.h"
 #include "MAX77818.hpp"
 #include <purefs/filesystem_paths.hpp>
 
@@ -11,6 +12,7 @@
 #include "drivers/i2c/DriverI2C.hpp"
 #include <purefs/filesystem_paths.hpp>
 #include <utility>
+#include <cstdio>
 
 namespace bsp::battery_charger
 {
@@ -113,18 +115,6 @@ namespace bsp::battery_charger
             return kStatus_Success;
         }
 
-        std::pair<int, std::uint8_t> chargerTopControllerRead(Registers registerAddress)
-        {
-            std::uint8_t value;
-            int status                      = kStatus_Success;
-            topControllerAddress.subAddress = static_cast<std::uint32_t>(registerAddress);
-            auto ret                        = i2c->Read(topControllerAddress, &value, sizeof(std::uint8_t));
-            if (ret != sizeof(std::uint8_t)) {
-                status = kStatus_Fail;
-            }
-            return std::make_pair(status, value);
-        }
-
         batteryRetval loadConfiguration()
         {
             auto fd = std::fopen(cfgFile.c_str(), "r");
@@ -161,7 +151,7 @@ namespace bsp::battery_charger
         batteryRetval storeConfiguration()
         {
             // TODO:M.P procedure below seems to crash system, it should be fixed.
-            if (ff_rename(cfgFile.c_str(), cfgFilePrev.c_str(), false) != 0) {
+            if (rename(cfgFile.c_str(), cfgFilePrev.c_str()) != 0) {
                 LOG_ERROR("Could not move configuration file");
                 return batteryRetval::ChargerError;
             }
@@ -378,7 +368,6 @@ namespace bsp::battery_charger
 
     bool getChargeStatus()
     {
-        std::uint8_t val = 0;
         // read clears state
         auto value = chargerRead(Registers::CHG_INT_OK);
         if (value.first != kStatus_Success) {
diff --git a/module-db/tests/EventsTable_tests.cpp b/module-db/tests/EventsTable_tests.cpp
index bec99eb1f7217e529470efc9c4feaa53bc6536fd..f5e7abb2bfefcdb0cec17eb9122e4f58d33022af 100644
--- a/module-db/tests/EventsTable_tests.cpp
+++ b/module-db/tests/EventsTable_tests.cpp
@@ -7,7 +7,7 @@
 #include "Databases/EventsDB.hpp"
 #include "Tables/EventsTable.hpp"
 
-#include <vfs.hpp>
+#include <purefs/filesystem_paths.hpp>
 #include <stdint.h>
 #include <string>
 #include <algorithm>
@@ -33,10 +33,10 @@ TEST_CASE("Events Table tests")
 
     Database::initialize();
 
-    const auto eventsPath = (purefs::dir::getUserDiskPath() / "events.db").c_str();
+    const auto eventsPath = (std::filesystem::path{"user"} / "events.db");
     std::filesystem::remove(eventsPath);
 
-    EventsDB eventsDb{eventsPath};
+    EventsDB eventsDb{eventsPath.c_str()};
     REQUIRE(eventsDb.isInitialized());
 
     auto &eventsTbl = eventsDb.events;