[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
#include "storage-int.h"
|
|
|
|
#include <lfs.h>
|
2021-08-08 18:03:25 +00:00
|
|
|
#include <furi-hal.h>
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
|
2021-11-12 13:04:35 +00:00
|
|
|
#define TAG "StorageInt"
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
#define STORAGE_PATH "/int"
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
const size_t start_address;
|
|
|
|
const size_t start_page;
|
|
|
|
struct lfs_config config;
|
|
|
|
lfs_t lfs;
|
|
|
|
} LFSData;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
void* data;
|
|
|
|
bool open;
|
|
|
|
} LFSHandle;
|
|
|
|
|
|
|
|
static LFSHandle* lfs_handle_alloc_file() {
|
|
|
|
LFSHandle* handle = furi_alloc(sizeof(LFSHandle));
|
|
|
|
handle->data = furi_alloc(sizeof(lfs_file_t));
|
|
|
|
return handle;
|
|
|
|
}
|
|
|
|
|
|
|
|
static LFSHandle* lfs_handle_alloc_dir() {
|
|
|
|
LFSHandle* handle = furi_alloc(sizeof(LFSHandle));
|
|
|
|
handle->data = furi_alloc(sizeof(lfs_dir_t));
|
|
|
|
return handle;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* INTERNALS */
|
|
|
|
|
|
|
|
static lfs_dir_t* lfs_handle_get_dir(LFSHandle* handle) {
|
|
|
|
return handle->data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static lfs_file_t* lfs_handle_get_file(LFSHandle* handle) {
|
|
|
|
return handle->data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void lfs_handle_free(LFSHandle* handle) {
|
|
|
|
free(handle->data);
|
|
|
|
free(handle);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void lfs_handle_set_open(LFSHandle* handle) {
|
|
|
|
handle->open = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool lfs_handle_is_open(LFSHandle* handle) {
|
|
|
|
return handle->open;
|
|
|
|
}
|
|
|
|
|
|
|
|
static lfs_t* lfs_get_from_storage(StorageData* storage) {
|
|
|
|
return &((LFSData*)storage->data)->lfs;
|
|
|
|
}
|
|
|
|
|
|
|
|
static LFSData* lfs_data_get_from_storage(StorageData* storage) {
|
|
|
|
return (LFSData*)storage->data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int storage_int_device_read(
|
|
|
|
const struct lfs_config* c,
|
|
|
|
lfs_block_t block,
|
|
|
|
lfs_off_t off,
|
|
|
|
void* buffer,
|
|
|
|
lfs_size_t size) {
|
|
|
|
LFSData* lfs_data = c->context;
|
|
|
|
size_t address = lfs_data->start_address + block * c->block_size + off;
|
|
|
|
|
|
|
|
FURI_LOG_D(
|
|
|
|
TAG,
|
|
|
|
"Device read: block %d, off %d, buffer: %p, size %d, translated address: %p",
|
|
|
|
block,
|
|
|
|
off,
|
|
|
|
buffer,
|
|
|
|
size,
|
|
|
|
address);
|
|
|
|
|
|
|
|
memcpy(buffer, (void*)address, size);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int storage_int_device_prog(
|
|
|
|
const struct lfs_config* c,
|
|
|
|
lfs_block_t block,
|
|
|
|
lfs_off_t off,
|
|
|
|
const void* buffer,
|
|
|
|
lfs_size_t size) {
|
|
|
|
LFSData* lfs_data = c->context;
|
|
|
|
size_t address = lfs_data->start_address + block * c->block_size + off;
|
|
|
|
|
|
|
|
FURI_LOG_D(
|
|
|
|
TAG,
|
|
|
|
"Device prog: block %d, off %d, buffer: %p, size %d, translated address: %p",
|
|
|
|
block,
|
|
|
|
off,
|
|
|
|
buffer,
|
|
|
|
size,
|
|
|
|
address);
|
|
|
|
|
|
|
|
int ret = 0;
|
|
|
|
while(size > 0) {
|
2021-08-08 18:03:25 +00:00
|
|
|
if(!furi_hal_flash_write_dword(address, *(uint64_t*)buffer)) {
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
ret = -1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
address += c->prog_size;
|
|
|
|
buffer += c->prog_size;
|
|
|
|
size -= c->prog_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int storage_int_device_erase(const struct lfs_config* c, lfs_block_t block) {
|
|
|
|
LFSData* lfs_data = c->context;
|
|
|
|
size_t page = lfs_data->start_page + block;
|
|
|
|
|
2021-11-04 17:26:41 +00:00
|
|
|
FURI_LOG_D(TAG, "Device erase: page %d, translated page: %x", block, page);
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
|
2021-11-10 09:53:00 +00:00
|
|
|
if(furi_hal_flash_erase(page)) {
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int storage_int_device_sync(const struct lfs_config* c) {
|
|
|
|
FURI_LOG_D(TAG, "Device sync: skipping, cause ");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static LFSData* storage_int_lfs_data_alloc() {
|
|
|
|
LFSData* lfs_data = furi_alloc(sizeof(LFSData));
|
|
|
|
|
|
|
|
// Internal storage start address
|
2021-08-08 18:03:25 +00:00
|
|
|
*(size_t*)(&lfs_data->start_address) = furi_hal_flash_get_free_page_start_address();
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
*(size_t*)(&lfs_data->start_page) =
|
2021-08-08 18:03:25 +00:00
|
|
|
(lfs_data->start_address - furi_hal_flash_get_base()) / furi_hal_flash_get_page_size();
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
|
|
|
|
// LFS configuration
|
|
|
|
// Glue and context
|
|
|
|
lfs_data->config.context = lfs_data;
|
|
|
|
lfs_data->config.read = storage_int_device_read;
|
|
|
|
lfs_data->config.prog = storage_int_device_prog;
|
|
|
|
lfs_data->config.erase = storage_int_device_erase;
|
|
|
|
lfs_data->config.sync = storage_int_device_sync;
|
|
|
|
|
|
|
|
// Block device description
|
2021-08-08 18:03:25 +00:00
|
|
|
lfs_data->config.read_size = furi_hal_flash_get_read_block_size();
|
|
|
|
lfs_data->config.prog_size = furi_hal_flash_get_write_block_size();
|
|
|
|
lfs_data->config.block_size = furi_hal_flash_get_page_size();
|
|
|
|
lfs_data->config.block_count = furi_hal_flash_get_free_page_count();
|
|
|
|
lfs_data->config.block_cycles = furi_hal_flash_get_cycles_count();
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
lfs_data->config.cache_size = 16;
|
|
|
|
lfs_data->config.lookahead_size = 16;
|
|
|
|
|
|
|
|
return lfs_data;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void storage_int_lfs_mount(LFSData* lfs_data, StorageData* storage) {
|
|
|
|
int err;
|
2021-10-26 12:24:14 +00:00
|
|
|
FuriHalBootloaderFlag bootloader_flags = furi_hal_bootloader_get_flags();
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
lfs_t* lfs = &lfs_data->lfs;
|
|
|
|
|
2021-10-26 12:24:14 +00:00
|
|
|
if(bootloader_flags & FuriHalBootloaderFlagFactoryReset) {
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
// Factory reset
|
|
|
|
err = lfs_format(lfs, &lfs_data->config);
|
|
|
|
if(err == 0) {
|
|
|
|
FURI_LOG_I(TAG, "Factory reset: Format successful, trying to mount");
|
2021-10-26 12:24:14 +00:00
|
|
|
furi_hal_bootloader_set_flags(bootloader_flags & ~FuriHalBootloaderFlagFactoryReset);
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
err = lfs_mount(lfs, &lfs_data->config);
|
|
|
|
if(err == 0) {
|
|
|
|
FURI_LOG_I(TAG, "Factory reset: Mounted");
|
|
|
|
storage->status = StorageStatusOK;
|
|
|
|
} else {
|
|
|
|
FURI_LOG_E(TAG, "Factory reset: Mount after format failed");
|
|
|
|
storage->status = StorageStatusNotMounted;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
FURI_LOG_E(TAG, "Factory reset: Format failed");
|
|
|
|
storage->status = StorageStatusNoFS;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// Normal
|
|
|
|
err = lfs_mount(lfs, &lfs_data->config);
|
|
|
|
if(err == 0) {
|
|
|
|
FURI_LOG_I(TAG, "Mounted");
|
|
|
|
storage->status = StorageStatusOK;
|
|
|
|
} else {
|
|
|
|
FURI_LOG_E(TAG, "Mount failed, formatting");
|
|
|
|
err = lfs_format(lfs, &lfs_data->config);
|
|
|
|
if(err == 0) {
|
|
|
|
FURI_LOG_I(TAG, "Format successful, trying to mount");
|
|
|
|
err = lfs_mount(lfs, &lfs_data->config);
|
|
|
|
if(err == 0) {
|
|
|
|
FURI_LOG_I(TAG, "Mounted");
|
|
|
|
storage->status = StorageStatusOK;
|
|
|
|
} else {
|
|
|
|
FURI_LOG_E(TAG, "Mount after format failed");
|
|
|
|
storage->status = StorageStatusNotMounted;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
FURI_LOG_E(TAG, "Format failed");
|
|
|
|
storage->status = StorageStatusNoFS;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************** Common Functions ******************/
|
|
|
|
|
|
|
|
static FS_Error storage_int_parse_error(int error) {
|
|
|
|
FS_Error result = FSE_INTERNAL;
|
|
|
|
|
|
|
|
if(error >= LFS_ERR_OK) {
|
|
|
|
result = FSE_OK;
|
|
|
|
} else {
|
|
|
|
switch(error) {
|
|
|
|
case LFS_ERR_IO:
|
|
|
|
result = FSE_INTERNAL;
|
|
|
|
break;
|
|
|
|
case LFS_ERR_CORRUPT:
|
|
|
|
result = FSE_INTERNAL;
|
|
|
|
break;
|
|
|
|
case LFS_ERR_NOENT:
|
|
|
|
result = FSE_NOT_EXIST;
|
|
|
|
break;
|
|
|
|
case LFS_ERR_EXIST:
|
|
|
|
result = FSE_EXIST;
|
|
|
|
break;
|
|
|
|
case LFS_ERR_NOTDIR:
|
|
|
|
result = FSE_INVALID_NAME;
|
|
|
|
break;
|
|
|
|
case LFS_ERR_ISDIR:
|
|
|
|
result = FSE_INVALID_NAME;
|
|
|
|
break;
|
|
|
|
case LFS_ERR_NOTEMPTY:
|
|
|
|
result = FSE_DENIED;
|
|
|
|
break;
|
|
|
|
case LFS_ERR_BADF:
|
|
|
|
result = FSE_INVALID_NAME;
|
|
|
|
break;
|
|
|
|
case LFS_ERR_FBIG:
|
|
|
|
result = FSE_INTERNAL;
|
|
|
|
break;
|
|
|
|
case LFS_ERR_INVAL:
|
|
|
|
result = FSE_INVALID_PARAMETER;
|
|
|
|
break;
|
|
|
|
case LFS_ERR_NOSPC:
|
|
|
|
result = FSE_INTERNAL;
|
|
|
|
break;
|
|
|
|
case LFS_ERR_NOMEM:
|
|
|
|
result = FSE_INTERNAL;
|
|
|
|
break;
|
|
|
|
case LFS_ERR_NOATTR:
|
|
|
|
result = FSE_INVALID_PARAMETER;
|
|
|
|
break;
|
|
|
|
case LFS_ERR_NAMETOOLONG:
|
|
|
|
result = FSE_INVALID_NAME;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************* File Functions *******************/
|
|
|
|
|
|
|
|
static bool storage_int_file_open(
|
|
|
|
void* ctx,
|
|
|
|
File* file,
|
|
|
|
const char* path,
|
|
|
|
FS_AccessMode access_mode,
|
|
|
|
FS_OpenMode open_mode) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
|
|
|
|
int flags = 0;
|
|
|
|
|
|
|
|
if(access_mode & FSAM_READ) flags |= LFS_O_RDONLY;
|
|
|
|
if(access_mode & FSAM_WRITE) flags |= LFS_O_WRONLY;
|
|
|
|
|
2021-09-21 09:34:16 +00:00
|
|
|
if(open_mode & FSOM_OPEN_EXISTING) flags |= 0;
|
[FL-1191][FL-1524] Filesystem rework (#568)
* FS-Api: removed datetime manipulation functions and most of the file flags
* Filesystem: common proxy api
* Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance.
* Storage: sd mount and sd file open
* Storage: sd file close
* Storage: temporary test app
* Storage: free filedata on close
* Storage: sd file read and write
* Storage: added internal storage (LittleFS)
* Storage: renamed internal commands
* Storage: seek, tell, truncate, size, sync, eof
* Storage: error descriptions
* Storage: directory management api (open, close, read, rewind)
* Storage: common management api (stat, fs_stat, remove, rename, mkdir)
* Dolphin app and Notifications app now use raw storage.
* Storage: storage statuses renamed. Implemented sd card icon.
* Storage: added raw sd-card api.
* Storage settings: work started
* Assets: use new icons approach
* Storage settings: working storage settings
* Storage: completely redesigned api, no longer sticking out FS_Api
* Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file
* Storage: cli info and format commands
* Storage-cli: file list
* Storage: a simpler and more reliable api
* FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service.
* Storage-cli: accommodate to the new cli api.
* Storage: filesystem api is separated into internal and common api.
* Cli: added the ability to print the list of free heap blocks
* Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags.
* Storage settings: added the ability to benchmark the SD card.
* Gui module file select: uses new storage api
* Apps: removed deprecated sd_card_test application
* Args lib: support for enquoted arguments
* Dialogs: a new gui app for simple non-asynchronous apps
* Dialogs: view holder for easy single view work
* File worker: use new storage api
* IButton and lfrrfid apps: save keys to any storage
* Apps: fix ibutton and lfrfid stack, remove sd_card_test.
* SD filesystem: app removed
* File worker: fixed api pointer type
* Subghz: loading assets using the new storage api
* NFC: use the new storage api
* Dialogs: the better api for the message element
* Archive: use new storage api
* Irda: changed assest path, changed app path
* FileWorker: removed unused file_buf_cnt
* Storage: copying and renaming files now works between storages
* Storage cli: read, copy, remove, rename commands
* Archive: removed commented code
* Storage cli: write command
* Applications: add SRV_STORAGE and SRV_DIALOGS
* Internal-storage: removed
* Storage: improved api
* Storage app: changed api pointer from StorageApp to Storage
* Storage: better file_id handling
* Storage: more consistent errors
* Loader: support for NULL icons
* Storage: do nothing with the lfs file or directory if it is not open
* Storage: fix typo
* Storage: minor float usage cleanup, rename some symbols.
* Storage: compact doxygen comments.
Co-authored-by: あく <alleteam@gmail.com>
2021-07-23 12:20:19 +00:00
|
|
|
if(open_mode & FSOM_OPEN_ALWAYS) flags |= LFS_O_CREAT;
|
|
|
|
if(open_mode & FSOM_OPEN_APPEND) flags |= LFS_O_CREAT | LFS_O_APPEND;
|
|
|
|
if(open_mode & FSOM_CREATE_NEW) flags |= LFS_O_CREAT | LFS_O_EXCL;
|
|
|
|
if(open_mode & FSOM_CREATE_ALWAYS) flags |= LFS_O_CREAT | LFS_O_TRUNC;
|
|
|
|
|
|
|
|
LFSHandle* handle = lfs_handle_alloc_file();
|
|
|
|
storage_set_storage_file_data(file, handle, storage);
|
|
|
|
file->internal_error_id = lfs_file_open(lfs, lfs_handle_get_file(handle), path, flags);
|
|
|
|
|
|
|
|
if(file->internal_error_id >= LFS_ERR_OK) {
|
|
|
|
lfs_handle_set_open(handle);
|
|
|
|
}
|
|
|
|
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
return (file->error_id == FSE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool storage_int_file_close(void* ctx, File* file) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
LFSHandle* handle = storage_get_storage_file_data(file, storage);
|
|
|
|
|
|
|
|
if(lfs_handle_is_open(handle)) {
|
|
|
|
file->internal_error_id = lfs_file_close(lfs, lfs_handle_get_file(handle));
|
|
|
|
} else {
|
|
|
|
file->internal_error_id = LFS_ERR_BADF;
|
|
|
|
}
|
|
|
|
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
lfs_handle_free(handle);
|
|
|
|
return (file->error_id == FSE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint16_t
|
|
|
|
storage_int_file_read(void* ctx, File* file, void* buff, uint16_t const bytes_to_read) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
LFSHandle* handle = storage_get_storage_file_data(file, storage);
|
|
|
|
|
|
|
|
uint16_t bytes_readed = 0;
|
|
|
|
|
|
|
|
if(lfs_handle_is_open(handle)) {
|
|
|
|
file->internal_error_id =
|
|
|
|
lfs_file_read(lfs, lfs_handle_get_file(handle), buff, bytes_to_read);
|
|
|
|
} else {
|
|
|
|
file->internal_error_id = LFS_ERR_BADF;
|
|
|
|
}
|
|
|
|
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
|
|
|
|
if(file->error_id == FSE_OK) {
|
|
|
|
bytes_readed = file->internal_error_id;
|
|
|
|
file->internal_error_id = 0;
|
|
|
|
}
|
|
|
|
return bytes_readed;
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint16_t
|
|
|
|
storage_int_file_write(void* ctx, File* file, const void* buff, uint16_t const bytes_to_write) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
LFSHandle* handle = storage_get_storage_file_data(file, storage);
|
|
|
|
|
|
|
|
uint16_t bytes_written = 0;
|
|
|
|
|
|
|
|
if(lfs_handle_is_open(handle)) {
|
|
|
|
file->internal_error_id =
|
|
|
|
lfs_file_write(lfs, lfs_handle_get_file(handle), buff, bytes_to_write);
|
|
|
|
} else {
|
|
|
|
file->internal_error_id = LFS_ERR_BADF;
|
|
|
|
}
|
|
|
|
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
|
|
|
|
if(file->error_id == FSE_OK) {
|
|
|
|
bytes_written = file->internal_error_id;
|
|
|
|
file->internal_error_id = 0;
|
|
|
|
}
|
|
|
|
return bytes_written;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool
|
|
|
|
storage_int_file_seek(void* ctx, File* file, const uint32_t offset, const bool from_start) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
LFSHandle* handle = storage_get_storage_file_data(file, storage);
|
|
|
|
|
|
|
|
if(lfs_handle_is_open(handle)) {
|
|
|
|
if(from_start) {
|
|
|
|
file->internal_error_id =
|
|
|
|
lfs_file_seek(lfs, lfs_handle_get_file(handle), offset, LFS_SEEK_SET);
|
|
|
|
} else {
|
|
|
|
file->internal_error_id =
|
|
|
|
lfs_file_seek(lfs, lfs_handle_get_file(handle), offset, LFS_SEEK_CUR);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
file->internal_error_id = LFS_ERR_BADF;
|
|
|
|
}
|
|
|
|
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
return (file->error_id == FSE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint64_t storage_int_file_tell(void* ctx, File* file) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
LFSHandle* handle = storage_get_storage_file_data(file, storage);
|
|
|
|
|
|
|
|
if(lfs_handle_is_open(handle)) {
|
|
|
|
file->internal_error_id = lfs_file_tell(lfs, lfs_handle_get_file(handle));
|
|
|
|
} else {
|
|
|
|
file->internal_error_id = LFS_ERR_BADF;
|
|
|
|
}
|
|
|
|
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
|
|
|
|
int32_t position = 0;
|
|
|
|
if(file->error_id == FSE_OK) {
|
|
|
|
position = file->internal_error_id;
|
|
|
|
file->internal_error_id = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return position;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool storage_int_file_truncate(void* ctx, File* file) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
LFSHandle* handle = storage_get_storage_file_data(file, storage);
|
|
|
|
|
|
|
|
if(lfs_handle_is_open(handle)) {
|
|
|
|
file->internal_error_id = lfs_file_tell(lfs, lfs_handle_get_file(handle));
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
|
|
|
|
if(file->error_id == FSE_OK) {
|
|
|
|
uint32_t position = file->internal_error_id;
|
|
|
|
file->internal_error_id =
|
|
|
|
lfs_file_truncate(lfs, lfs_handle_get_file(handle), position);
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
file->internal_error_id = LFS_ERR_BADF;
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
return (file->error_id == FSE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool storage_int_file_sync(void* ctx, File* file) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
LFSHandle* handle = storage_get_storage_file_data(file, storage);
|
|
|
|
|
|
|
|
if(lfs_handle_is_open(handle)) {
|
|
|
|
file->internal_error_id = lfs_file_sync(lfs, lfs_handle_get_file(handle));
|
|
|
|
} else {
|
|
|
|
file->internal_error_id = LFS_ERR_BADF;
|
|
|
|
}
|
|
|
|
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
return (file->error_id == FSE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint64_t storage_int_file_size(void* ctx, File* file) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
LFSHandle* handle = storage_get_storage_file_data(file, storage);
|
|
|
|
|
|
|
|
if(lfs_handle_is_open(handle)) {
|
|
|
|
file->internal_error_id = lfs_file_size(lfs, lfs_handle_get_file(handle));
|
|
|
|
} else {
|
|
|
|
file->internal_error_id = LFS_ERR_BADF;
|
|
|
|
}
|
|
|
|
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
|
|
|
|
uint32_t size = 0;
|
|
|
|
if(file->error_id == FSE_OK) {
|
|
|
|
size = file->internal_error_id;
|
|
|
|
file->internal_error_id = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool storage_int_file_eof(void* ctx, File* file) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
LFSHandle* handle = storage_get_storage_file_data(file, storage);
|
|
|
|
|
|
|
|
bool eof = true;
|
|
|
|
|
|
|
|
if(lfs_handle_is_open(handle)) {
|
|
|
|
int32_t position = lfs_file_tell(lfs, lfs_handle_get_file(handle));
|
|
|
|
int32_t size = lfs_file_size(lfs, lfs_handle_get_file(handle));
|
|
|
|
|
|
|
|
if(position < 0) {
|
|
|
|
file->internal_error_id = position;
|
|
|
|
} else if(size < 0) {
|
|
|
|
file->internal_error_id = size;
|
|
|
|
} else {
|
|
|
|
file->internal_error_id = LFS_ERR_OK;
|
|
|
|
eof = (position >= size);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
file->internal_error_id = LFS_ERR_BADF;
|
|
|
|
}
|
|
|
|
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
return eof;
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************* Dir Functions *******************/
|
|
|
|
|
|
|
|
static bool storage_int_dir_open(void* ctx, File* file, const char* path) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
|
|
|
|
LFSHandle* handle = lfs_handle_alloc_dir();
|
|
|
|
storage_set_storage_file_data(file, handle, storage);
|
|
|
|
|
|
|
|
file->internal_error_id = lfs_dir_open(lfs, lfs_handle_get_dir(handle), path);
|
|
|
|
if(file->internal_error_id >= LFS_ERR_OK) {
|
|
|
|
lfs_handle_set_open(handle);
|
|
|
|
}
|
|
|
|
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
return (file->error_id == FSE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool storage_int_dir_close(void* ctx, File* file) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
LFSHandle* handle = storage_get_storage_file_data(file, storage);
|
|
|
|
|
|
|
|
if(lfs_handle_is_open(handle)) {
|
|
|
|
file->internal_error_id = lfs_dir_close(lfs, lfs_handle_get_dir(handle));
|
|
|
|
} else {
|
|
|
|
file->internal_error_id = LFS_ERR_BADF;
|
|
|
|
}
|
|
|
|
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
lfs_handle_free(handle);
|
|
|
|
return (file->error_id == FSE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool storage_int_dir_read(
|
|
|
|
void* ctx,
|
|
|
|
File* file,
|
|
|
|
FileInfo* fileinfo,
|
|
|
|
char* name,
|
|
|
|
const uint16_t name_length) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
LFSHandle* handle = storage_get_storage_file_data(file, storage);
|
|
|
|
|
|
|
|
if(lfs_handle_is_open(handle)) {
|
|
|
|
struct lfs_info _fileinfo;
|
|
|
|
|
|
|
|
// LFS returns virtual directories "." and "..", so we read until we get something meaningful or an empty string
|
|
|
|
do {
|
|
|
|
file->internal_error_id = lfs_dir_read(lfs, lfs_handle_get_dir(handle), &_fileinfo);
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
} while(strcmp(_fileinfo.name, ".") == 0 || strcmp(_fileinfo.name, "..") == 0);
|
|
|
|
|
|
|
|
if(fileinfo != NULL) {
|
|
|
|
fileinfo->size = _fileinfo.size;
|
|
|
|
fileinfo->flags = 0;
|
|
|
|
if(_fileinfo.type & LFS_TYPE_DIR) fileinfo->flags |= FSF_DIRECTORY;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(name != NULL) {
|
|
|
|
snprintf(name, name_length, "%s", _fileinfo.name);
|
|
|
|
}
|
|
|
|
|
|
|
|
// set FSE_NOT_EXIST error on end of directory
|
|
|
|
if(file->internal_error_id == 0) {
|
|
|
|
file->error_id = FSE_NOT_EXIST;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
file->internal_error_id = LFS_ERR_BADF;
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
return (file->error_id == FSE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool storage_int_dir_rewind(void* ctx, File* file) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
LFSHandle* handle = storage_get_storage_file_data(file, storage);
|
|
|
|
|
|
|
|
if(lfs_handle_is_open(handle)) {
|
|
|
|
file->internal_error_id = lfs_dir_rewind(lfs, lfs_handle_get_dir(handle));
|
|
|
|
} else {
|
|
|
|
file->internal_error_id = LFS_ERR_BADF;
|
|
|
|
}
|
|
|
|
|
|
|
|
file->error_id = storage_int_parse_error(file->internal_error_id);
|
|
|
|
return (file->error_id == FSE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************* Common FS Functions *******************/
|
|
|
|
|
|
|
|
static FS_Error storage_int_common_stat(void* ctx, const char* path, FileInfo* fileinfo) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
struct lfs_info _fileinfo;
|
|
|
|
int result = lfs_stat(lfs, path, &_fileinfo);
|
|
|
|
|
|
|
|
if(fileinfo != NULL) {
|
|
|
|
fileinfo->size = _fileinfo.size;
|
|
|
|
fileinfo->flags = 0;
|
|
|
|
if(_fileinfo.type & LFS_TYPE_DIR) fileinfo->flags |= FSF_DIRECTORY;
|
|
|
|
}
|
|
|
|
|
|
|
|
return storage_int_parse_error(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
static FS_Error storage_int_common_remove(void* ctx, const char* path) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
int result = lfs_remove(lfs, path);
|
|
|
|
return storage_int_parse_error(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
static FS_Error storage_int_common_rename(void* ctx, const char* old_path, const char* new_path) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
int result = lfs_rename(lfs, old_path, new_path);
|
|
|
|
return storage_int_parse_error(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
static FS_Error storage_int_common_mkdir(void* ctx, const char* path) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
int result = lfs_mkdir(lfs, path);
|
|
|
|
return storage_int_parse_error(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
static FS_Error storage_int_common_fs_info(
|
|
|
|
void* ctx,
|
|
|
|
const char* fs_path,
|
|
|
|
uint64_t* total_space,
|
|
|
|
uint64_t* free_space) {
|
|
|
|
StorageData* storage = ctx;
|
|
|
|
|
|
|
|
lfs_t* lfs = lfs_get_from_storage(storage);
|
|
|
|
LFSData* lfs_data = lfs_data_get_from_storage(storage);
|
|
|
|
|
|
|
|
*total_space = lfs_data->config.block_size * lfs_data->config.block_count;
|
|
|
|
|
|
|
|
lfs_ssize_t result = lfs_fs_size(lfs);
|
|
|
|
if(result >= 0) {
|
|
|
|
*free_space = *total_space - (result * lfs_data->config.block_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
return storage_int_parse_error(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************* Init Storage *******************/
|
|
|
|
|
|
|
|
void storage_int_init(StorageData* storage) {
|
|
|
|
FURI_LOG_I(TAG, "Starting");
|
|
|
|
LFSData* lfs_data = storage_int_lfs_data_alloc();
|
|
|
|
FURI_LOG_I(
|
|
|
|
TAG,
|
|
|
|
"Config: start %p, read %d, write %d, page size: %d, page count: %d, cycles: %d",
|
|
|
|
lfs_data->start_address,
|
|
|
|
lfs_data->config.read_size,
|
|
|
|
lfs_data->config.prog_size,
|
|
|
|
lfs_data->config.block_size,
|
|
|
|
lfs_data->config.block_count,
|
|
|
|
lfs_data->config.block_cycles);
|
|
|
|
|
|
|
|
storage_int_lfs_mount(lfs_data, storage);
|
|
|
|
|
|
|
|
storage->data = lfs_data;
|
|
|
|
storage->api.tick = NULL;
|
|
|
|
storage->fs_api.file.open = storage_int_file_open;
|
|
|
|
storage->fs_api.file.close = storage_int_file_close;
|
|
|
|
storage->fs_api.file.read = storage_int_file_read;
|
|
|
|
storage->fs_api.file.write = storage_int_file_write;
|
|
|
|
storage->fs_api.file.seek = storage_int_file_seek;
|
|
|
|
storage->fs_api.file.tell = storage_int_file_tell;
|
|
|
|
storage->fs_api.file.truncate = storage_int_file_truncate;
|
|
|
|
storage->fs_api.file.size = storage_int_file_size;
|
|
|
|
storage->fs_api.file.sync = storage_int_file_sync;
|
|
|
|
storage->fs_api.file.eof = storage_int_file_eof;
|
|
|
|
|
|
|
|
storage->fs_api.dir.open = storage_int_dir_open;
|
|
|
|
storage->fs_api.dir.close = storage_int_dir_close;
|
|
|
|
storage->fs_api.dir.read = storage_int_dir_read;
|
|
|
|
storage->fs_api.dir.rewind = storage_int_dir_rewind;
|
|
|
|
|
|
|
|
storage->fs_api.common.stat = storage_int_common_stat;
|
|
|
|
storage->fs_api.common.mkdir = storage_int_common_mkdir;
|
|
|
|
storage->fs_api.common.rename = storage_int_common_rename;
|
|
|
|
storage->fs_api.common.remove = storage_int_common_remove;
|
|
|
|
storage->fs_api.common.fs_info = storage_int_common_fs_info;
|
|
|
|
}
|