mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
Merge branch 'hardware'
This commit is contained in:
commit
e175d922f0
2 changed files with 3 additions and 3 deletions
|
|
@ -352,7 +352,7 @@ fn listen_thread(
|
||||||
enum ClientMessage {
|
enum ClientMessage {
|
||||||
NewConnection(TcpStream),
|
NewConnection(TcpStream),
|
||||||
Exit,
|
Exit,
|
||||||
};
|
}
|
||||||
let (sender, receiver) = unbounded();
|
let (sender, receiver) = unbounded();
|
||||||
let tcp_sender = sender.clone();
|
let tcp_sender = sender.clone();
|
||||||
let exit_sender = sender;
|
let exit_sender = sender;
|
||||||
|
|
|
||||||
|
|
@ -170,7 +170,7 @@ fn connect_for_process() {
|
||||||
} else {
|
} else {
|
||||||
panic!("Unexpected return value");
|
panic!("Unexpected return value");
|
||||||
};
|
};
|
||||||
xous_kernel::return_scalar(envelope.sender, new_cid).expect("couldn't return scalar");
|
xous_kernel::return_scalar(envelope.sender, new_cid as usize).expect("couldn't return scalar");
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.expect("couldn't spawn client process");
|
.expect("couldn't spawn client process");
|
||||||
|
|
@ -247,7 +247,7 @@ fn connect_for_process() {
|
||||||
|
|
||||||
// Send a message to the server we were just connected to.
|
// Send a message to the server we were just connected to.
|
||||||
xous_kernel::try_send_message(
|
xous_kernel::try_send_message(
|
||||||
other_conn,
|
other_conn as u32,
|
||||||
xous_kernel::Message::Scalar(xous_kernel::ScalarMessage {
|
xous_kernel::Message::Scalar(xous_kernel::ScalarMessage {
|
||||||
id: 15,
|
id: 15,
|
||||||
arg1: 21,
|
arg1: 21,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue