devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix multidrive/multivolume hosted builds.

Browse source 
Generalize the fix in 2348779ae6 to apply to hosted as well as simulator
builds.  Original regression introduced in c0ac043c6d

Change-Id: Ia786533cc318555e3bb842eb21a73a1f76888379
This commit is contained in:
Solomon Peachy 2024-07-26 10:44:38 -04:00
parent e94f778f1c
commit 13830439fa
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
apps/main.c
View file

@ -131,6 +131,12 @@
#define MAIN_NORETURN_ATTR #define MAIN_NORETURN_ATTR
#endif #endif
#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
#ifdef HAVE_MULTIVOLUME
#include "pathfuncs.h" /* for init_volume_names */
#endif
#endif
#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) #if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA))
#ifdef SIMULATOR #ifdef SIMULATOR
#include "sim_tasks.h" #include "sim_tasks.h"
@ -381,6 +387,9 @@ static void init(void)
powermgmt_init(); powermgmt_init();
backlight_init(); backlight_init();
unicode_init(); unicode_init();
#ifdef HAVE_MULTIVOLUME
init_volume_names();
#endif
#ifdef SIMULATOR #ifdef SIMULATOR
sim_tasks_init(); sim_tasks_init();
#endif #endif

6
uisimulator/common/sim_tasks.c
View file

@ -30,9 +30,6 @@
#include "usb.h" #include "usb.h"
#include "mv.h" #include "mv.h"
#include "ata_idle_notify.h" #include "ata_idle_notify.h"
#ifdef HAVE_MULTIVOLUME
#include "pathfuncs.h" /* for init_volume_names */
#endif
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
@ -137,9 +134,6 @@ void sim_thread(void)
void sim_tasks_init(void) void sim_tasks_init(void)
{ {
#ifdef HAVE_MULTIVOLUME
init_volume_names();
#endif
queue_init(&sim_queue, false); queue_init(&sim_queue, false);
create_thread(sim_thread, sim_thread_stack, sizeof(sim_thread_stack), 0, create_thread(sim_thread, sim_thread_stack, sizeof(sim_thread_stack), 0,