mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
Merge remote-tracking branch 'origin/master' into ux-refactor
This commit is contained in:
commit
96ca0eb8a1
2 changed files with 11 additions and 0 deletions
|
|
@ -1936,6 +1936,16 @@ impl SystemServices {
|
||||||
server.discard_messages_for_pid(target_pid);
|
server.discard_messages_for_pid(target_pid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Now that the server has been "Disconnected", free the server entry.
|
||||||
|
for server in self.servers.iter_mut() {
|
||||||
|
if let Some(server_inner) = server {
|
||||||
|
if server_inner.pid == target_pid {
|
||||||
|
*server = None;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let process = self.get_process_mut(target_pid)?;
|
let process = self.get_process_mut(target_pid)?;
|
||||||
process.activate()?;
|
process.activate()?;
|
||||||
let parent_pid = process.ppid;
|
let parent_pid = process.ppid;
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@ enum ExecutionType {
|
||||||
NonBlocking,
|
NonBlocking,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(baremetal)]
|
||||||
pub fn reset_switchto_caller() {
|
pub fn reset_switchto_caller() {
|
||||||
unsafe { SWITCHTO_CALLER = None };
|
unsafe { SWITCHTO_CALLER = None };
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue