diff options
Diffstat (limited to 'uisimulator')
| -rw-r--r-- | uisimulator/common/filesystem-sim.c | 2 | ||||
| -rw-r--r-- | uisimulator/common/sim_tasks.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/uisimulator/common/filesystem-sim.c b/uisimulator/common/filesystem-sim.c index 8d7fb14931..0a5df0c742 100644 --- a/uisimulator/common/filesystem-sim.c +++ b/uisimulator/common/filesystem-sim.c @@ -309,6 +309,8 @@ int sim_get_os_path(char *buffer, const char *path, size_t bufsize) const char *next; volume = path_strip_volume(p, &next, true); + if (volume == ROOT_VOLUME) + volume = 0; /* FIXME: root no longer implies volume 0 */ if (next > p) { diff --git a/uisimulator/common/sim_tasks.c b/uisimulator/common/sim_tasks.c index 8c1f193080..c53b9990fd 100644 --- a/uisimulator/common/sim_tasks.c +++ b/uisimulator/common/sim_tasks.c @@ -92,7 +92,9 @@ void sim_thread(void) last_broadcast_tick = current_tick; } - num_acks_to_expect += queue_broadcast(SYS_USB_CONNECTED, 0) - 1; + /* NOTE: Unlike the USB code, we do not subtract one here + * because the sim_queue is not registered for broadcasts! */ + num_acks_to_expect += queue_broadcast(SYS_USB_CONNECTED, 0); DEBUGF("USB inserted. Waiting for %d acks...\n", num_acks_to_expect); break; |