diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2024-07-26 10:44:38 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2024-07-26 10:54:07 -0400 |
commit | 13830439fae202247626e5ebfd7fe3d57d7c5628 (patch) | |
tree | 793cc66a239b73b794626a272ba1a26d848912fd | |
parent | e94f778f1c5efdc4d11c61dec0e4a4ab073899d7 (diff) | |
download | rockbox-13830439fae202247626e5ebfd7fe3d57d7c5628.tar.gz rockbox-13830439fae202247626e5ebfd7fe3d57d7c5628.zip |
Fix multidrive/multivolume hosted builds.
Generalize the fix in 2348779ae6 to apply to hosted as well as simulator
builds. Original regression introduced in c0ac043c6d
Change-Id: Ia786533cc318555e3bb842eb21a73a1f76888379
-rw-r--r-- | apps/main.c | 9 | ||||
-rw-r--r-- | uisimulator/common/sim_tasks.c | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/apps/main.c b/apps/main.c index 0a104576e1..4c7689ce8c 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -131,6 +131,12 @@ | |||
131 | #define MAIN_NORETURN_ATTR | 131 | #define MAIN_NORETURN_ATTR |
132 | #endif | 132 | #endif |
133 | 133 | ||
134 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) | ||
135 | #ifdef HAVE_MULTIVOLUME | ||
136 | #include "pathfuncs.h" /* for init_volume_names */ | ||
137 | #endif | ||
138 | #endif | ||
139 | |||
134 | #if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) | 140 | #if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) |
135 | #ifdef SIMULATOR | 141 | #ifdef SIMULATOR |
136 | #include "sim_tasks.h" | 142 | #include "sim_tasks.h" |
@@ -381,6 +387,9 @@ static void init(void) | |||
381 | powermgmt_init(); | 387 | powermgmt_init(); |
382 | backlight_init(); | 388 | backlight_init(); |
383 | unicode_init(); | 389 | unicode_init(); |
390 | #ifdef HAVE_MULTIVOLUME | ||
391 | init_volume_names(); | ||
392 | #endif | ||
384 | #ifdef SIMULATOR | 393 | #ifdef SIMULATOR |
385 | sim_tasks_init(); | 394 | sim_tasks_init(); |
386 | #endif | 395 | #endif |
diff --git a/uisimulator/common/sim_tasks.c b/uisimulator/common/sim_tasks.c index 1d933e63a2..1f7e3bffcf 100644 --- a/uisimulator/common/sim_tasks.c +++ b/uisimulator/common/sim_tasks.c | |||
@@ -30,9 +30,6 @@ | |||
30 | #include "usb.h" | 30 | #include "usb.h" |
31 | #include "mv.h" | 31 | #include "mv.h" |
32 | #include "ata_idle_notify.h" | 32 | #include "ata_idle_notify.h" |
33 | #ifdef HAVE_MULTIVOLUME | ||
34 | #include "pathfuncs.h" /* for init_volume_names */ | ||
35 | #endif | ||
36 | 33 | ||
37 | #ifdef WIN32 | 34 | #ifdef WIN32 |
38 | #include <windows.h> | 35 | #include <windows.h> |
@@ -137,9 +134,6 @@ void sim_thread(void) | |||
137 | 134 | ||
138 | void sim_tasks_init(void) | 135 | void sim_tasks_init(void) |
139 | { | 136 | { |
140 | #ifdef HAVE_MULTIVOLUME | ||
141 | init_volume_names(); | ||
142 | #endif | ||
143 | queue_init(&sim_queue, false); | 137 | queue_init(&sim_queue, false); |
144 | 138 | ||
145 | create_thread(sim_thread, sim_thread_stack, sizeof(sim_thread_stack), 0, | 139 | create_thread(sim_thread, sim_thread_stack, sizeof(sim_thread_stack), 0, |