Merge remote-tracking branch 'ofw/dev' into mntm-dev

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

@@ -325,7 +325,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) {
@@ -429,7 +429,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

@@ -55,6 +55,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
@@ -68,7 +70,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
  *