Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-12 20:08:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Random cleanup and housekeeping

Browse Source
This commit is contained in:
Willy-JL
2023-06-01 01:46:19 +01:00
parent 8a317a793c
commit df8b7cbe48
7 changed files with 44 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
applications/services/storage/storages/storage_int.c
View File

@@ -193,47 +193,15 @@ static void storage_int_lfs_mount(LFSData* lfs_data, StorageData* storage) {
was_fingerprint_outdated;
if(need_format) {
// Backup U2F keys
// lfs_file_t file;
// uint8_t* key = NULL;
// uint32_t key_size;
// if(lfs_mount(lfs, &lfs_data->config) == 0) {
// FURI_LOG_I(TAG, "Factory reset: Mounted for backup");
// if(lfs_file_open(lfs, &file, ".key.u2f", LFS_O_RDONLY) == 0) {
// key_size = file.ctz.size;
// key = malloc(key_size);
// if(lfs_file_read(lfs, &file, key, key_size) != (int32_t)key_size) {
// free(key);
// key = NULL;
// }
// lfs_file_close(lfs, &file);
// }
// if(lfs_unmount(lfs) == 0) {
// FURI_LOG_E(TAG, "Factory reset: Unmounted after backup");
// } else {
// FURI_LOG_E(TAG, "Factory reset: Unmount after backup failed");
// }
// } else {
// FURI_LOG_E(TAG, "Factory reset: Mount for backup failed");
// }
// Format storage
if(lfs_format(lfs, &lfs_data->config) == 0) {
err = lfs_format(lfs, &lfs_data->config);
if(err == 0) {
FURI_LOG_I(TAG, "Factory reset: Format successful, trying to mount");
furi_hal_rtc_reset_flag(FuriHalRtcFlagFactoryReset);
if(lfs_mount(lfs, &lfs_data->config) == 0) {
err = lfs_mount(lfs, &lfs_data->config);
if(err == 0) {
FURI_LOG_I(TAG, "Factory reset: Mounted");
storage->status = StorageStatusOK;
// Restore U2F keys
// if(key != NULL) {
// if(lfs_file_open(lfs, &file, ".key.u2f", LFS_O_WRONLY | LFS_O_CREAT) == 0) {
// lfs_file_write(lfs, &file, key, key_size);
// lfs_file_close(lfs, &file);
// }
// }
} else {
FURI_LOG_E(TAG, "Factory reset: Mount after format failed");
storage->status = StorageStatusNotMounted;
@@ -242,7 +210,6 @@ static void storage_int_lfs_mount(LFSData* lfs_data, StorageData* storage) {
FURI_LOG_E(TAG, "Factory reset: Format failed");
storage->status = StorageStatusNoFS;
}
// if(key != NULL) free(key);
} else {
// Normal
err = lfs_mount(lfs, &lfs_data->config);