Storage: remove LFS (#3577)

* Storage: drop internal storage

* Storage: rollback some unnecessary changes

* Storage: rollback some unnecessary changes part 2

* Storage: cleanup various defines and int handling. Ble: allow short connection interval if internal flash is not used.

* Storage: do not return storage if it is not ready

* Save PIN code to RTC, update settings

* Simplify the code, clean up includes

* Rearrange some code

* apps: storage_move_to_sd: conditionally enable with --extra-define=STORAGE_INT_ON_LFS

* Load Desktop settings automatically

* Redirect /any to /ext

* Abolish storage_move_to_sd app

* Remove as many mentions of ANY_PATH as possible

* Fix desktop settings wrongly not loading

* Improve desktop settings handling and strings

* Load BLE settings and keys automatically

* Improve BLE configuration procedure

* Do not load bluetooth keys twice if they were already loaded

* Load dolphin state automatically

* Fix merge artifact

* Load notification settings automatically

* Update desktop settings strings

* Load expansion settings automatically

* Do not use thread signals to reload desktop settings

* Load region data automatically, separate to its own hook

* Improve ble behaviour with no keys

* Fix Dolphin state not resetting correctly

* Add a status check

* Make Desktop save its own settings

* Check result when taking and releasing mutex

* Improve default thread signal handling in FuriEventLoop

* Make bt service in charge of saving settings, add settings api

* Fix a deadlock due to timer thread not receiving time

* Lock core2 when reinitialising bt

* Update clang-format

* Revert "Update clang-format"

This reverts commit d61295ac06.

* Format sources with clang-format

* Revert old stack size for desktop settings

* Allocate big struct dynamically

* Simplify PIN comparison

* Save pointer to storage in Desktop object

* Fix region provisioning for hardware regions

* Remove stale TODO + siimplify code

* Clean up region.c

* Use sizeof instead of macro define

* Limit PIN length to 10 for consistency

* Emit a warning upon usage of /any

* Add delay after finding flipper

* Remove unnecessary delay

* Remove all mentions of STORAGE_INT_ON_LFS

* Remove littlefs and internal storage

* Remove all possible LittleFS mentions

* Fix browser tab in Archive

* Ble: fix connection interval explanation

* Bump API Symbols

* BLE: Update comments interval connection comments

* Storage: clear FuriHalRtcFlagStorageFormatInternal if set

---------

Co-authored-by: Georgii Surkov <georgii.surkov@outlook.com>
Co-authored-by: hedger <hedger@nanode.su>
Co-authored-by: Georgii Surkov <37121527+gsurkov@users.noreply.github.com>

lib/ReadMe.md

@@ -18,7 +18,6 @@
 - `infrared`            - Infrared library, used by Infrared application
 - `lfrfid`              - LF-RFID library, used by LF RFID application
 - `libusb_stm32`        - LibUSB for STM32 series MCU
-- `littlefs`            - LittleFS file system driver, used by internal storage
 - `mbedtls`             - MbedTLS cryptography library
 - `microtar`            - MicroTAR library
 - `mjs`                 - MJs, javascript engine library

lib/SConscript

@@ -27,7 +27,6 @@ libs = env.BuildModules(
         "one_wire",
         "ibutton",
         "infrared",
-        "littlefs",
         "subghz",
         "nfc",
         "digital_signal",

lib/ble_profile/extra_profiles/hid_profile.c

@@ -373,6 +373,12 @@ bool ble_profile_hid_mouse_scroll(FuriHalBleProfileBase* profile, int8_t delta)
     return state;
 }
 
+// AN5289: 4.7, in order to use flash controller interval must be at least 25ms + advertisement, which is 30 ms
+// Since we don't use flash controller anymore interval can be lowered to 7.5ms
+#define CONNECTION_INTERVAL_MIN (0x0006)
+// Up to 45 ms
+#define CONNECTION_INTERVAL_MAX (0x24)
+
 static GapConfig template_config = {
     .adv_service_uuid = HUMAN_INTERFACE_DEVICE_SERVICE_UUID,
     .appearance_char = GAP_APPEARANCE_KEYBOARD,
@@ -380,8 +386,8 @@ static GapConfig template_config = {
     .pairing_method = GapPairingPinCodeVerifyYesNo,
     .conn_param =
         {
-            .conn_int_min = 0x18, // AN5289: 4.7, we need at least 25ms + advertisement, which is 30 ms
-            .conn_int_max = 0x24, // 45 ms
+            .conn_int_min = CONNECTION_INTERVAL_MIN,
+            .conn_int_max = CONNECTION_INTERVAL_MAX,
             .slave_latency = 0,
             .supervisor_timeout = 0,
         },

lib/lfs_config.h

@@ -1,204 +0,0 @@
-#pragma once
-
-#include <furi.h>
-
-#ifdef FURI_NDEBUG
-#define LFS_NO_ASSERT
-#define LFS_ASSERT(x)
-#else
-#define LFS_ASSERT furi_assert
-#endif
-
-#define LFS_TAG "Lfs"
-
-#ifdef FURI_LFS_DEBUG
-#define LFS_TRACE(...) FURI_LOG_T(LFS_TAG, __VA_ARGS__);
-
-#define LFS_DEBUG(...) FURI_LOG_D(LFS_TAG, __VA_ARGS__);
-#else
-#define LFS_TRACE(...)
-
-#define LFS_DEBUG(...)
-#endif // FURI_LFS_DEBUG
-
-#define LFS_WARN(...) FURI_LOG_W(LFS_TAG, __VA_ARGS__);
-
-#define LFS_ERROR(...) FURI_LOG_E(LFS_TAG, __VA_ARGS__);
-
-// Because crc
-#undef LFS_CONFIG
-
-// System includes
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <inttypes.h>
-
-#ifndef LFS_NO_MALLOC
-#include <stdlib.h>
-#endif
-#ifndef LFS_NO_ASSERT
-#include <assert.h>
-#endif
-#if !defined(LFS_NO_DEBUG) || !defined(LFS_NO_WARN) || !defined(LFS_NO_ERROR) || \
-    defined(LFS_YES_TRACE)
-#include <stdio.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Builtin functions, these may be replaced by more efficient
-// toolchain-specific implementations. LFS_NO_INTRINSICS falls back to a more
-// expensive basic C implementation for debugging purposes
-
-// Min/max functions for unsigned 32-bit numbers
-static inline uint32_t lfs_max(uint32_t a, uint32_t b) {
-    return (a > b) ? a : b;
-}
-
-static inline uint32_t lfs_min(uint32_t a, uint32_t b) {
-    return (a < b) ? a : b;
-}
-
-// Align to nearest multiple of a size
-static inline uint32_t lfs_aligndown(uint32_t a, uint32_t alignment) {
-    return a - (a % alignment);
-}
-
-static inline uint32_t lfs_alignup(uint32_t a, uint32_t alignment) {
-    return lfs_aligndown(a + alignment - 1, alignment);
-}
-
-// Find the smallest power of 2 greater than or equal to a
-static inline uint32_t lfs_npw2(uint32_t a) {
-#if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
-    return 32 - __builtin_clz(a - 1);
-#else
-    uint32_t r = 0;
-    uint32_t s;
-    a -= 1;
-    s = (a > 0xffff) << 4;
-    a >>= s;
-    r |= s;
-    s = (a > 0xff) << 3;
-    a >>= s;
-    r |= s;
-    s = (a > 0xf) << 2;
-    a >>= s;
-    r |= s;
-    s = (a > 0x3) << 1;
-    a >>= s;
-    r |= s;
-    return (r | (a >> 1)) + 1;
-#endif
-}
-
-// Count the number of trailing binary zeros in a
-// lfs_ctz(0) may be undefined
-static inline uint32_t lfs_ctz(uint32_t a) {
-#if !defined(LFS_NO_INTRINSICS) && defined(__GNUC__)
-    return __builtin_ctz(a);
-#else
-    return lfs_npw2((a & -a) + 1) - 1;
-#endif
-}
-
-// Count the number of binary ones in a
-static inline uint32_t lfs_popc(uint32_t a) {
-#if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM))
-    return __builtin_popcount(a);
-#else
-    a = a - ((a >> 1) & 0x55555555);
-    a = (a & 0x33333333) + ((a >> 2) & 0x33333333);
-    return (((a + (a >> 4)) & 0xf0f0f0f) * 0x1010101) >> 24;
-#endif
-}
-
-// Find the sequence comparison of a and b, this is the distance
-// between a and b ignoring overflow
-static inline int lfs_scmp(uint32_t a, uint32_t b) {
-    return (int)(unsigned)(a - b);
-}
-
-// Convert between 32-bit little-endian and native order
-static inline uint32_t lfs_fromle32(uint32_t a) {
-#if !defined(LFS_NO_INTRINSICS) &&                                   \
-    ((defined(BYTE_ORDER) && defined(ORDER_LITTLE_ENDIAN) &&         \
-      BYTE_ORDER == ORDER_LITTLE_ENDIAN) ||                          \
-     (defined(__BYTE_ORDER) && defined(__ORDER_LITTLE_ENDIAN) &&     \
-      __BYTE_ORDER == __ORDER_LITTLE_ENDIAN) ||                      \
-     (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
-      __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
-    return a;
-#elif !defined(LFS_NO_INTRINSICS) &&                                                         \
-    ((defined(BYTE_ORDER) && defined(ORDER_BIG_ENDIAN) && BYTE_ORDER == ORDER_BIG_ENDIAN) || \
-     (defined(__BYTE_ORDER) && defined(__ORDER_BIG_ENDIAN) &&                                \
-      __BYTE_ORDER == __ORDER_BIG_ENDIAN) ||                                                 \
-     (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) &&                            \
-      __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
-    return __builtin_bswap32(a);
-#else
-    return (((uint8_t*)&a)[0] << 0) | (((uint8_t*)&a)[1] << 8) | (((uint8_t*)&a)[2] << 16) |
-           (((uint8_t*)&a)[3] << 24);
-#endif
-}
-
-static inline uint32_t lfs_tole32(uint32_t a) {
-    return lfs_fromle32(a);
-}
-
-// Convert between 32-bit big-endian and native order
-static inline uint32_t lfs_frombe32(uint32_t a) {
-#if !defined(LFS_NO_INTRINSICS) &&                                   \
-    ((defined(BYTE_ORDER) && defined(ORDER_LITTLE_ENDIAN) &&         \
-      BYTE_ORDER == ORDER_LITTLE_ENDIAN) ||                          \
-     (defined(__BYTE_ORDER) && defined(__ORDER_LITTLE_ENDIAN) &&     \
-      __BYTE_ORDER == __ORDER_LITTLE_ENDIAN) ||                      \
-     (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
-      __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
-    return __builtin_bswap32(a);
-#elif !defined(LFS_NO_INTRINSICS) &&                                                         \
-    ((defined(BYTE_ORDER) && defined(ORDER_BIG_ENDIAN) && BYTE_ORDER == ORDER_BIG_ENDIAN) || \
-     (defined(__BYTE_ORDER) && defined(__ORDER_BIG_ENDIAN) &&                                \
-      __BYTE_ORDER == __ORDER_BIG_ENDIAN) ||                                                 \
-     (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) &&                            \
-      __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
-    return a;
-#else
-    return (((uint8_t*)&a)[0] << 24) | (((uint8_t*)&a)[1] << 16) | (((uint8_t*)&a)[2] << 8) |
-           (((uint8_t*)&a)[3] << 0);
-#endif
-}
-
-static inline uint32_t lfs_tobe32(uint32_t a) {
-    return lfs_frombe32(a);
-}
-
-// Calculate CRC-32 with polynomial = 0x04c11db7
-uint32_t lfs_crc(uint32_t crc, const void* buffer, size_t size);
-
-// Allocate memory, only used if buffers are not provided to littlefs
-// Note, memory must be 64-bit aligned
-static inline void* lfs_malloc(size_t size) {
-#ifndef LFS_NO_MALLOC
-    return malloc(size);
-#else
-    (void)size;
-    return NULL;
-#endif
-}
-
-// Deallocate memory, only used if buffers are not provided to littlefs
-static inline void lfs_free(void* p) {
-#ifndef LFS_NO_MALLOC
-    free(p);
-#else
-    (void)p;
-#endif
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif

lib/littlefs.scons

@@ -1,22 +0,0 @@
-Import("env")
-
-env.Append(
-    CPPPATH=[
-        "#/lib/littlefs",
-    ],
-)
-
-
-libenv = env.Clone(FW_LIB_NAME="littlefs")
-libenv.ApplyLibFlags()
-libenv.Append(
-    CPPDEFINES=[
-        ("LFS_CONFIG", "lfs_config.h"),
-    ],
-)
-
-sources = Glob("littlefs/*.c", source=True)
-
-lib = libenv.StaticLibrary("${FW_LIB_NAME}", sources)
-libenv.Install("${LIB_DIST_DIR}", lib)
-Return("lib")

lib/subghz/devices/registry.c

@@ -23,7 +23,7 @@ void subghz_device_registry_init(void) {
         firmware_api_interface);
 
     //TODO FL-3556: fix path to plugins
-    if(plugin_manager_load_all(subghz_device->manager, "/any/apps_data/subghz/plugins") !=
+    if(plugin_manager_load_all(subghz_device->manager, EXT_PATH("apps_data/subghz/plugins")) !=
        //if(plugin_manager_load_all(subghz_device->manager, APP_DATA_PATH("plugins")) !=
        PluginManagerErrorNone) {
         FURI_LOG_E(TAG, "Failed to load all libs");

lib/toolbox/crc32_calc.c

@@ -1,11 +1,37 @@
 #include "crc32_calc.h"
-#include <littlefs/lfs_util.h>
 
 #define CRC_DATA_BUFFER_MAX_LEN 512
 
 uint32_t crc32_calc_buffer(uint32_t crc, const void* buffer, size_t size) {
-    // TODO FL-3547: consider removing dependency on LFS
-    return ~lfs_crc(~crc, buffer, size);
+    crc = ~crc;
+
+    static const uint32_t rtable[16] = {
+        0x00000000,
+        0x1db71064,
+        0x3b6e20c8,
+        0x26d930ac,
+        0x76dc4190,
+        0x6b6b51f4,
+        0x4db26158,
+        0x5005713c,
+        0xedb88320,
+        0xf00f9344,
+        0xd6d6a3e8,
+        0xcb61b38c,
+        0x9b64c2b0,
+        0x86d3d2d4,
+        0xa00ae278,
+        0xbdbdf21c,
+    };
+
+    const uint8_t* data = buffer;
+
+    for(size_t i = 0; i < size; i++) {
+        crc = (crc >> 4) ^ rtable[(crc ^ (data[i] >> 0)) & 0xf];
+        crc = (crc >> 4) ^ rtable[(crc ^ (data[i] >> 4)) & 0xf];
+    }
+
+    return ~crc;
 }
 
 uint32_t crc32_calc_file(File* file, const FileCrcProgressCb progress_cb, void* context) {

lib/toolbox/stream/file_stream.c

@@ -159,8 +159,8 @@ static bool file_stream_delete_and_insert(
     FuriString* tmp_name;
     tmp_name = furi_string_alloc();
     storage_get_next_filename(
-        _stream->storage, STORAGE_ANY_PATH_PREFIX, ".scratch", ".pad", tmp_name, 255);
-    scratch_name = furi_string_alloc_printf(ANY_PATH("%s.pad"), furi_string_get_cstr(tmp_name));
+        _stream->storage, STORAGE_EXT_PATH_PREFIX, ".scratch", ".pad", tmp_name, 255);
+    scratch_name = furi_string_alloc_printf(EXT_PATH("%s.pad"), furi_string_get_cstr(tmp_name));
     furi_string_free(tmp_name);
 
     do {

lib/toolbox/tar/tar_archive.c

@@ -289,7 +289,7 @@ bool tar_archive_file_finalize(TarArchive* archive) {
 typedef struct {
     TarArchive* archive;
     const char* work_dir;
-    Storage_name_converter converter;
+    TarArchiveNameConverter converter;
 } TarArchiveDirectoryOpParams;
 
 static bool archive_extract_current_file(TarArchive* archive, const char* dst_path) {
@@ -386,7 +386,7 @@ static int archive_extract_foreach_cb(mtar_t* tar, const mtar_header_t* header,
 bool tar_archive_unpack_to(
     TarArchive* archive,
     const char* destination,
-    Storage_name_converter converter) {
+    TarArchiveNameConverter converter) {
     furi_check(archive);
     TarArchiveDirectoryOpParams param = {
         .archive = archive,

lib/toolbox/tar/tar_archive.h

@@ -54,6 +54,8 @@ bool tar_archive_open(TarArchive* archive, const char* path, TarOpenMode mode);
  */
 void tar_archive_free(TarArchive* archive);
 
+typedef void (*TarArchiveNameConverter)(FuriString*);
+
 /* High-level API  - assumes archive is open */
 
 /** Unpack tar archive to destination
@@ -67,7 +69,7 @@ void tar_archive_free(TarArchive* archive);
 bool tar_archive_unpack_to(
     TarArchive* archive,
     const char* destination,
-    Storage_name_converter converter);
+    TarArchiveNameConverter converter);
 
 /** Add file to tar archive
  *