Merge in the FSConfig changs from SDFS PR

Enable setConfig for LittleFS as well plys merge the SPIFFS changes
done in the SDFS PR.

Author: Earle F. Philhower, III

cores/esp8266/FS.cpp

@@ -220,6 +220,14 @@ bool Dir::rewind() {
     return _impl->rewind();
 }
 
+bool FS::setConfig(const FSConfig *cfg) {
+    if (!_impl || !cfg) {
+        return false;
+    }
+
+    return _impl->setConfig(cfg);
+}
+
 bool FS::begin() {
     if (!_impl) {
         return false;

cores/esp8266/FS.h

@@ -119,11 +119,41 @@ struct FSInfo {
     size_t maxPathLength;
 };
 
+class FSConfig
+{
+public:
+    FSConfig(bool autoFormat = true) {
+        _type = FSConfig::fsid::FSId;
+	_autoFormat = autoFormat;
+    }
+
+    enum fsid { FSId = 0x00000000 };
+    FSConfig setAutoFormat(bool val = true) {
+        _autoFormat = val;
+        return *this;
+    }
+
+    uint32_t _type;
+    bool     _autoFormat;
+};
+
+class SPIFFSConfig : public FSConfig
+{
+public:
+    SPIFFSConfig(bool autoFormat = true) {
+        _type = SPIFFSConfig::fsid::FSId;
+	_autoFormat = autoFormat;
+    }
+    enum fsid { FSId = 0x53504946 };
+};
+
 class FS
 {
 public:
     FS(FSImplPtr impl) : _impl(impl) { }
 
+    bool setConfig(const FSConfig *cfg);
+
     bool begin();
     void end();
 
@@ -166,6 +196,7 @@ using fs::SeekSet;
 using fs::SeekCur;
 using fs::SeekEnd;
 using fs::FSInfo;
+using fs::FSConfig;
 #endif //FS_NO_GLOBALS
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SPIFFS)

cores/esp8266/FSImpl.h

@@ -69,6 +69,7 @@ class DirImpl {
 class FSImpl {
 public:
     virtual ~FSImpl () { }
+    virtual bool setConfig(const FSConfig *cfg) = 0;
     virtual bool begin() = 0;
     virtual void end() = 0;
     virtual bool format() = 0;

cores/esp8266/spiffs_api.h

@@ -123,6 +123,15 @@ class SPIFFSImpl : public FSImpl
         return false;
     }
 
+    bool setConfig(const FSConfig *cfg) override
+    {
+        if ((cfg->_type != SPIFFSConfig::fsid::FSId) || (SPIFFS_mounted(&_fs) != 0)) {
+            return false;
+        }
+        _cfg = *static_cast<const SPIFFSConfig *>(cfg);
+       return true;
+    }
+
     bool begin() override
     {
 #if defined(ARDUINO) && !defined(CORE_MOCK)
@@ -139,12 +148,15 @@ class SPIFFSImpl : public FSImpl
         if (_tryMount()) {
             return true;
         }
-        auto rc = SPIFFS_format(&_fs);
-        if (rc != SPIFFS_OK) {
-            DEBUGV("SPIFFS_format: rc=%d, err=%d\r\n", rc, _fs.err_code);
-            return false;
+        if (_cfg._autoFormat) {
+            auto rc = SPIFFS_format(&_fs);
+            if (rc != SPIFFS_OK) {
+                DEBUGV("SPIFFS_format: rc=%d, err=%d\r\n", rc, _fs.err_code);
+                return false;
+            }
+            return _tryMount();
         }
-        return _tryMount();
+        return false;
     }
 
     void end() override
@@ -290,6 +302,8 @@ class SPIFFSImpl : public FSImpl
     std::unique_ptr<uint8_t[]> _workBuf;
     std::unique_ptr<uint8_t[]> _fdsBuf;
     std::unique_ptr<uint8_t[]> _cacheBuf;
+
+    SPIFFSConfig _cfg;
 };
 
 #define CHECKFD() while (_fd == 0) { panic(); }

libraries/LittleFS/src/LittleFS.h

@@ -44,6 +44,16 @@ namespace littlefs_impl {
 class LittleFSFileImpl;
 class LittleFSDirImpl;
 
+class LittleFSConfig : public FSConfig
+{
+public:
+    LittleFSConfig(bool autoFormat = true) {
+        _type = LittleFSConfig::fsid::FSId;
+        _autoFormat = autoFormat;
+    }
+    enum fsid { FSId = 0x4c495454 };
+};
+
 class LittleFSImpl : public FSImpl
 {
 public:
@@ -147,6 +157,14 @@ class LittleFSImpl : public FSImpl
         return remove(path);  // Same call on LittleFS
     }
 
+    bool setConfig(const FSConfig *cfg) override {
+        if ((cfg->_type != LittleFSConfig::fsid::FSId) || _mounted) {
+            return false;
+        }
+        _cfg = *static_cast<const LittleFSConfig *>(cfg);
+       return true;
+    }
+
     bool begin() override {
         if (_size <= 0) {
             DEBUGV("LittleFS size is <= zero");
@@ -155,7 +173,7 @@ class LittleFSImpl : public FSImpl
         if (_tryMount()) {
             return true;
         }
-        if (!format()) {
+        if (!_cfg._autoFormat || !format()) {
             return false;
         }
         return _tryMount();
@@ -282,6 +300,8 @@ class LittleFSImpl : public FSImpl
     lfs_t       _lfs;
     lfs_config  _lfs_cfg;
 
+    LittleFSConfig _cfg;
+
     uint32_t _start;
     uint32_t _size;
     uint32_t _pageSize;
@@ -521,6 +541,7 @@ class LittleFSDirImpl : public DirImpl
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_LITTLEFS)
 extern FS LittleFS;
+using littlefs_impl::LittleFSConfig;
 #endif // ARDUINO