summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2024-07-24 23:37:53 -0400
committerWilliam Wilgus <me.theuser@yahoo.com>2024-07-24 23:43:36 -0400
commit67db38e7667f724e6036b6bf00fe2a29edb5fad0 (patch)
treea4fe2aa3cee83f7d67732219d4a49158a3175932
parentbcaeaa135a535d6a0216daa0f079db58b6bfe556 (diff)
downloadrockbox-67db38e766.tar.gz
rockbox-67db38e766.zip
[Bugfix] initialize the volume names for the sim
init_volume_names() wasn't being called by the sim Change-Id: Ife0d345cf29bd4a0a658ed194ee85ca4852bc92f
-rw-r--r--firmware/common/pathfuncs.c4
-rw-r--r--uisimulator/common/sim_tasks.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/firmware/common/pathfuncs.c b/firmware/common/pathfuncs.c
index d4f4415526..db1935db8b 100644
--- a/firmware/common/pathfuncs.c
+++ b/firmware/common/pathfuncs.c
@@ -113,6 +113,7 @@ static const unsigned char storage_dec_indexes[STORAGE_NUM_TYPES+1] =
/* builds a list of drive/volume specifiers <volstr#> */
void init_volume_names(void)
{
+ DEBUGF("%s: ", __func__);
FOR_EACH_VOLUME(-1, volume)
{
const char *voldec = "";
@@ -124,8 +125,9 @@ void init_volume_names(void)
voldec = storage_dec_names[storage_dec_indexes[type]];
snprintf(buffer, VOL_MAX_LEN + 1, "%c%s%d%c",
VOL_START_TOK, voldec, volume, VOL_END_TOK);
- DEBUGF("%s: vol: %d %s", __func__, volume, buffer);
+ DEBUGF("vol<%d> = %s ", volume, buffer);
}
+ DEBUGF("\n");
}
/* Returns on which volume this is and sets *nameptr to the portion of the
diff --git a/uisimulator/common/sim_tasks.c b/uisimulator/common/sim_tasks.c
index e5646e62d3..0e5f7fbe7a 100644
--- a/uisimulator/common/sim_tasks.c
+++ b/uisimulator/common/sim_tasks.c
@@ -30,6 +30,7 @@
#include "usb.h"
#include "mv.h"
#include "ata_idle_notify.h"
+#include "pathfuncs.h"
#ifdef WIN32
#include <windows.h>
#endif
@@ -133,6 +134,7 @@ void sim_thread(void)
void sim_tasks_init(void)
{
+ init_volume_names();
queue_init(&sim_queue, false);
create_thread(sim_thread, sim_thread_stack, sizeof(sim_thread_stack), 0,