mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-04-25 03:29:58 -07:00
Merge branch 'dev' of https://github.com/DarkFlippers/unleashed-firmware into xfw-dev --nobuild
This commit is contained in:
@@ -449,12 +449,38 @@ static FS_Error storage_process_sd_format(Storage* app) {
|
||||
static FS_Error storage_process_sd_unmount(Storage* app) {
|
||||
FS_Error ret = FSE_OK;
|
||||
|
||||
if(storage_data_status(&app->storage[ST_EXT]) == StorageStatusNotReady) {
|
||||
ret = FSE_NOT_READY;
|
||||
} else {
|
||||
sd_unmount_card(&app->storage[ST_EXT]);
|
||||
storage_data_timestamp(&app->storage[ST_EXT]);
|
||||
}
|
||||
do {
|
||||
StorageData* storage = &app->storage[ST_EXT];
|
||||
if(storage_data_status(storage) == StorageStatusNotReady) {
|
||||
ret = FSE_NOT_READY;
|
||||
break;
|
||||
}
|
||||
|
||||
if(storage_open_files_count(storage)) {
|
||||
ret = FSE_DENIED;
|
||||
break;
|
||||
}
|
||||
|
||||
sd_unmount_card(storage);
|
||||
storage_data_timestamp(storage);
|
||||
} while(false);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static FS_Error storage_process_sd_mount(Storage* app) {
|
||||
FS_Error ret = FSE_OK;
|
||||
|
||||
do {
|
||||
StorageData* storage = &app->storage[ST_EXT];
|
||||
if(storage_data_status(storage) != StorageStatusNotReady) {
|
||||
ret = FSE_NOT_READY;
|
||||
break;
|
||||
}
|
||||
|
||||
ret = sd_mount_card(storage, true);
|
||||
storage_data_timestamp(storage);
|
||||
} while(false);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -688,6 +714,9 @@ void storage_process_message_internal(Storage* app, StorageMessage* message) {
|
||||
case StorageCommandSDUnmount:
|
||||
message->return_data->error_value = storage_process_sd_unmount(app);
|
||||
break;
|
||||
case StorageCommandSDMount:
|
||||
message->return_data->error_value = storage_process_sd_mount(app);
|
||||
break;
|
||||
case StorageCommandSDInfo:
|
||||
message->return_data->error_value =
|
||||
storage_process_sd_info(app, message->data->sdinfo.info);
|
||||
|
||||
Reference in New Issue
Block a user