fix: remount warnings

Seeed-Studio · Apr 18, 2024 · d717626 · d717626
1 parent 9f0b9a8
commit d717626
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/porting/himax/we2/el_extfs_we2.cpp b/porting/himax/we2/el_extfs_we2.cpp
@@ -82,14 +82,16 @@ static Status STATUS_FROM_FRESULT(FRESULT res) {
     }
 }
 
-FileWE2::~FileWE2() { close(); }
+FileWE2::~FileWE2() {}
 
 void FileWE2::close() {
     if (_file != nullptr) {
         f_close(static_cast<FIL*>(_file));
         delete static_cast<FIL*>(_file);
         _file = nullptr;
     }
+    _fs_mount_times = 0;
+    _mounted        = false;
 }
 
 Status FileWE2::write(const uint8_t* data, size_t size, size_t* written) {
@@ -115,7 +117,8 @@ FileWE2::FileWE2(const void* f) {
     *static_cast<FIL*>(_file) = *static_cast<const FIL*>(f);
 }
 
-int ExtfsWE2::_fs_mount_times = 0;
+int  ExtfsWE2::_fs_mount_times = 0;
+bool ExtfsWE2::_mounted        = false;
 
 ExtfsWE2::ExtfsWE2() { _fs = new (std::nothrow) FATFS{}; }
 
@@ -127,6 +130,9 @@ ExtfsWE2::~ExtfsWE2() {
 }
 
 Status ExtfsWE2::mount(const char* path) {
+    if (_mounted) {
+        return {true, ""};
+    }
     if (_fs_mount_times > CONFIG_FS_MAX_MOUNT_TIMES) {
         return {false, "Filesystem mount times exceed the limit"};
     }
@@ -181,6 +187,10 @@ Status ExtfsWE2::mount(const char* path) {
         curdir = nullptr;
     }
 
+    if (res == FR_OK) {
+        _mounted = true;
+    }
+
     return STATUS_FROM_FRESULT(res);
 }
 

diff --git a/porting/himax/we2/el_extfs_we2.h b/porting/himax/we2/el_extfs_we2.h
@@ -55,6 +55,8 @@ class ExtfsWE2 final : public Extfs {
    private:
     static int _fs_mount_times;
     void*      _fs;
+
+    static bool _mounted;
 };
 
 }  // namespace edgelab