mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
fix previous commit
Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
d5b5a83445
commit
abb1455fe6
1 changed files with 11 additions and 0 deletions
|
|
@ -372,12 +372,19 @@ fn return_memory(
|
||||||
// execution from the new thread. Instead it continues in the old
|
// execution from the new thread. Instead it continues in the old
|
||||||
// thread. Therefore, we need to instruct the client to resume, and
|
// thread. Therefore, we need to instruct the client to resume, and
|
||||||
// return to the server.
|
// return to the server.
|
||||||
|
#[cfg(not(baremetal))]
|
||||||
|
ss.switch_to_thread(client_pid, Some(client_tid))?;
|
||||||
|
|
||||||
// In a baremetal environment, the opposite is true -- we instruct
|
// In a baremetal environment, the opposite is true -- we instruct
|
||||||
// the server to resume and return to the client.
|
// the server to resume and return to the client.
|
||||||
ss.set_thread_result(client_pid, client_tid, return_value)?;
|
ss.set_thread_result(client_pid, client_tid, return_value)?;
|
||||||
Ok(xous_kernel::Result::Ok)
|
Ok(xous_kernel::Result::Ok)
|
||||||
} else {
|
} else {
|
||||||
// Switch away from the server, but leave it as Runnable
|
// Switch away from the server, but leave it as Runnable
|
||||||
|
if cfg!(baremetal) {
|
||||||
|
ss.unschedule_thread(server_pid, server_tid)?;
|
||||||
|
ss.ready_thread(server_pid, server_tid)?
|
||||||
|
}
|
||||||
ss.set_thread_result(server_pid, server_tid, xous_kernel::Result::Ok)?;
|
ss.set_thread_result(server_pid, server_tid, xous_kernel::Result::Ok)?;
|
||||||
|
|
||||||
// Switch to the client
|
// Switch to the client
|
||||||
|
|
@ -444,6 +451,10 @@ fn return_result(
|
||||||
ss.set_thread_result(client_pid, client_tid, return_value)?;
|
ss.set_thread_result(client_pid, client_tid, return_value)?;
|
||||||
Ok(xous_kernel::Result::Ok)
|
Ok(xous_kernel::Result::Ok)
|
||||||
} else {
|
} else {
|
||||||
|
if cfg!(baremetal) {
|
||||||
|
ss.unschedule_thread(server_pid, server_tid)?;
|
||||||
|
ss.ready_thread(server_pid, server_tid)?
|
||||||
|
}
|
||||||
// Switch away from the server, but leave it as Runnable
|
// Switch away from the server, but leave it as Runnable
|
||||||
ss.set_thread_result(server_pid, server_tid, xous_kernel::Result::Ok)?;
|
ss.set_thread_result(server_pid, server_tid, xous_kernel::Result::Ok)?;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue