Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Storage: Fix VirtualMount APIs 'not ready' error

Browse Source
This commit is contained in:
Willy-JL
2024-08-23 03:08:14 +02:00
parent 8f7562718c
commit d6f0776902
3 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/services/storage/storage_processing.c
View File

@@ -793,7 +793,8 @@ void storage_process_message_internal(Storage* app, StorageMessage* message) {
case StorageCommandVirtualInit:
File* image = message->data->virtualinit.image;
StorageData* image_storage = get_storage_by_file(image, app->storage);
message->return_data->error_value = storage_process_virtual_init(image_storage, image);
message->return_data->error_value =
storage_process_virtual_init(&app->storage[ST_MNT], image, image_storage);
break;
case StorageCommandVirtualFormat:
message->return_data->error_value = storage_process_virtual_format(&app->storage[ST_MNT]);

33
applications/services/storage/storages/storage_ext.c
View File

@@ -792,18 +792,26 @@ void storage_ext_init(StorageData* storage) {
#endif
}
/*
* Virtual Mount API for Disk Images on /mnt
*/
#include "fatfs/ff_gen_drv.h"
#define SCSI_BLOCK_SIZE (0x200UL)
static File* mnt_image = NULL;
static StorageData* mnt_image_storage = NULL;
bool mnt_mounted = false;
;
// We use 3 states:
// StorageStatusNotReady: no image provided yet
// StorageStatusNotMounted: image provided but not mounted
// StorageStatusOK: image provided and mounted
FS_Error storage_process_virtual_init(StorageData* image_storage, File* image) {
if(mnt_image) return FSE_ALREADY_OPEN;
FS_Error
storage_process_virtual_init(StorageData* storage, File* image, StorageData* image_storage) {
if(storage->status != StorageStatusNotReady) return FSE_ALREADY_OPEN;
mnt_image = image;
mnt_image_storage = image_storage;
storage->status = StorageStatusNotMounted;
return FSE_OK;
}
@@ -812,7 +820,8 @@ FS_Error storage_process_virtual_format(StorageData* storage) {
UNUSED(storage);
return FSE_NOT_READY;
#else
if(!mnt_image) return FSE_NOT_READY;
if(storage->status == StorageStatusOK) return FSE_ALREADY_OPEN;
if(storage->status != StorageStatusNotMounted) return FSE_NOT_READY;
SDData* sd_data = storage->data;
uint8_t* work = malloc(_MAX_SS);
SDError error = f_mkfs(sd_data->path, FM_ANY, 0, work, _MAX_SS);
@@ -837,29 +846,31 @@ FS_Error storage_process_virtual_format(StorageData* storage) {
}
FS_Error storage_process_virtual_mount(StorageData* storage) {
if(!mnt_image) return FSE_NOT_READY;
if(storage->status == StorageStatusOK) return FSE_ALREADY_OPEN;
if(storage->status != StorageStatusNotMounted) return FSE_NOT_READY;
SDData* sd_data = storage->data;
SDError error = f_mount(sd_data->fs, sd_data->path, 1);
if(error == FR_NO_FILESYSTEM) return FSE_INVALID_PARAMETER;
if(error != FR_OK) return FSE_INTERNAL;
mnt_mounted = true;
storage->status = StorageStatusOK;
return FSE_OK;
}
FS_Error storage_process_virtual_unmount(StorageData* storage) {
if(!mnt_image) return FSE_NOT_READY;
if(storage->status != StorageStatusOK) return FSE_NOT_READY;
SDData* sd_data = storage->data;
SDError error = f_mount(0, sd_data->path, 0);
if(error != FR_OK) return FSE_INTERNAL;
mnt_mounted = false;
storage->status = StorageStatusNotMounted;
return FSE_OK;
}
FS_Error storage_process_virtual_quit(StorageData* storage) {
if(!mnt_image) return FSE_NOT_READY;
if(mnt_mounted) storage_process_virtual_unmount(storage);
if(storage->status == StorageStatusOK) storage_process_virtual_unmount(storage);
if(storage->status != StorageStatusNotMounted) return FSE_NOT_READY;
mnt_image = NULL;
mnt_image_storage = NULL;
storage->status = StorageStatusNotReady;
return FSE_OK;
}

4
applications/services/storage/storages/storage_ext.h
View File

@@ -12,8 +12,10 @@ FS_Error sd_mount_card(StorageData* storage, bool notify);
FS_Error sd_unmount_card(StorageData* storage);
FS_Error sd_format_card(StorageData* storage);
FS_Error sd_card_info(StorageData* storage, SDInfo* sd_info);
void storage_mnt_init(StorageData* storage);
FS_Error storage_process_virtual_init(StorageData* image_storage, File* image);
FS_Error
storage_process_virtual_init(StorageData* storage, File* image, StorageData* image_storage);
FS_Error storage_process_virtual_format(StorageData* storage);
FS_Error storage_process_virtual_mount(StorageData* storage);
FS_Error storage_process_virtual_unmount(StorageData* storage);