len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

init_volume_names() has to be called AFTER storage_init()

Browse source 
...So just move that call into storage_init and be done with it!

Hopefully this doesn't cause any functional regressions.

Change-Id: I08700fbd1613638606a23ee3a0c2149123c2c24a
This commit is contained in:
Solomon Peachy 2024-07-28 21:15:41 -04:00
parent 2363c7b095
commit e722334ab1
2 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
firmware/common/file_internal.c
View file

@ -761,7 +761,4 @@ void filesystem_init(void)
mrsw_init(&file_internal_mrsw); mrsw_init(&file_internal_mrsw);
dc_init(); dc_init();
fileobj_mgr_init(); fileobj_mgr_init();
#ifdef HAVE_MULTIVOLUME
init_volume_names();
#endif
} }

5
firmware/storage.c
View file

@ -23,6 +23,7 @@
#include "ata_idle_notify.h" #include "ata_idle_notify.h"
#include "usb.h" #include "usb.h"
#include "disk.h" #include "disk.h"
#include "pathfuncs.h"
#ifdef CONFIG_STORAGE_MULTI #ifdef CONFIG_STORAGE_MULTI
@ -334,6 +335,10 @@ int storage_init(void)
rc = STORAGE_FUNCTION(init)(); rc = STORAGE_FUNCTION(init)();
#endif /* CONFIG_STORAGE_MULTI */ #endif /* CONFIG_STORAGE_MULTI */
#ifdef HAVE_MULTIVOLUME
init_volume_names();
#endif
storage_thread_init(); storage_thread_init();
return rc; return rc;
} }