diff options
author | William Wilgus <wilgus.william@gmail.com> | 2024-07-24 23:37:53 -0400 |
---|---|---|
committer | William Wilgus <me.theuser@yahoo.com> | 2024-07-24 23:43:36 -0400 |
commit | 67db38e7667f724e6036b6bf00fe2a29edb5fad0 (patch) | |
tree | a4fe2aa3cee83f7d67732219d4a49158a3175932 | |
parent | bcaeaa135a535d6a0216daa0f079db58b6bfe556 (diff) | |
download | rockbox-67db38e7667f724e6036b6bf00fe2a29edb5fad0.tar.gz rockbox-67db38e7667f724e6036b6bf00fe2a29edb5fad0.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.c | 4 | ||||
-rw-r--r-- | uisimulator/common/sim_tasks.c | 2 |
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] = | |||
113 | /* builds a list of drive/volume specifiers <volstr#> */ | 113 | /* builds a list of drive/volume specifiers <volstr#> */ |
114 | void init_volume_names(void) | 114 | void init_volume_names(void) |
115 | { | 115 | { |
116 | DEBUGF("%s: ", __func__); | ||
116 | FOR_EACH_VOLUME(-1, volume) | 117 | FOR_EACH_VOLUME(-1, volume) |
117 | { | 118 | { |
118 | const char *voldec = ""; | 119 | const char *voldec = ""; |
@@ -124,8 +125,9 @@ void init_volume_names(void) | |||
124 | voldec = storage_dec_names[storage_dec_indexes[type]]; | 125 | voldec = storage_dec_names[storage_dec_indexes[type]]; |
125 | snprintf(buffer, VOL_MAX_LEN + 1, "%c%s%d%c", | 126 | snprintf(buffer, VOL_MAX_LEN + 1, "%c%s%d%c", |
126 | VOL_START_TOK, voldec, volume, VOL_END_TOK); | 127 | VOL_START_TOK, voldec, volume, VOL_END_TOK); |
127 | DEBUGF("%s: vol: %d %s", __func__, volume, buffer); | 128 | DEBUGF("vol<%d> = %s ", volume, buffer); |
128 | } | 129 | } |
130 | DEBUGF("\n"); | ||
129 | } | 131 | } |
130 | 132 | ||
131 | /* Returns on which volume this is and sets *nameptr to the portion of the | 133 | /* 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 @@ | |||
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 | #include "pathfuncs.h" | ||
33 | #ifdef WIN32 | 34 | #ifdef WIN32 |
34 | #include <windows.h> | 35 | #include <windows.h> |
35 | #endif | 36 | #endif |
@@ -133,6 +134,7 @@ void sim_thread(void) | |||
133 | 134 | ||
134 | void sim_tasks_init(void) | 135 | void sim_tasks_init(void) |
135 | { | 136 | { |
137 | init_volume_names(); | ||
136 | queue_init(&sim_queue, false); | 138 | queue_init(&sim_queue, false); |
137 | 139 | ||
138 | create_thread(sim_thread, sim_thread_stack, sizeof(sim_thread_stack), 0, | 140 | create_thread(sim_thread, sim_thread_stack, sizeof(sim_thread_stack), 0, |