mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
xous: make MessageSender a struct
This is now an object instead of an alias for `usize`, in preparation for adding a `.pid()` function. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
1f1a535801
commit
1fa83d1d94
4 changed files with 54 additions and 11 deletions
|
|
@ -237,7 +237,7 @@ fn handle_connection(
|
||||||
| xous_kernel::Message::BlockingScalar(_) => (),
|
| xous_kernel::Message::BlockingScalar(_) => (),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SysCall::ReturnMemory(_sender, ref mut buf) => {
|
SysCall::ReturnMemory(ref _sender, ref mut buf) => {
|
||||||
let sliced_data = data.into_boxed_slice();
|
let sliced_data = data.into_boxed_slice();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
sliced_data.len(),
|
sliced_data.len(),
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
pub use crate::arch::process::Thread;
|
pub use crate::arch::process::Thread;
|
||||||
use core::mem;
|
use core::mem;
|
||||||
use xous_kernel::{MemoryAddress, MemoryRange, MemorySize, Message, PID, SID, TID};
|
use xous_kernel::{MemoryAddress, MemoryRange, MemorySize, Message, MessageSender, PID, SID, TID};
|
||||||
|
|
||||||
pub struct SenderID {
|
pub struct SenderID {
|
||||||
/// The index of the server within the SystemServices table
|
/// The index of the server within the SystemServices table
|
||||||
|
|
@ -24,6 +24,18 @@ impl Into<usize> for SenderID {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl From<MessageSender> for SenderID {
|
||||||
|
fn from(item: MessageSender) -> SenderID {
|
||||||
|
SenderID::from(item.to_usize())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Into<MessageSender> for SenderID {
|
||||||
|
fn into(self) -> MessageSender {
|
||||||
|
MessageSender::from_usize(self.into())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub enum WaitingMessage {
|
pub enum WaitingMessage {
|
||||||
/// There is no waiting message.
|
/// There is no waiting message.
|
||||||
|
|
|
||||||
|
|
@ -7,9 +7,34 @@ pub type StackPointer = usize;
|
||||||
pub type MessageId = usize;
|
pub type MessageId = usize;
|
||||||
|
|
||||||
pub type PID = NonZeroU8;
|
pub type PID = NonZeroU8;
|
||||||
pub type MessageSender = usize;
|
|
||||||
pub type Connection = usize;
|
pub type Connection = usize;
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq, Eq, Ord, PartialOrd, Copy, Clone)]
|
||||||
|
pub struct MessageSender {
|
||||||
|
data: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MessageSender {
|
||||||
|
pub fn to_usize(&self) -> usize {
|
||||||
|
self.data
|
||||||
|
}
|
||||||
|
pub fn from_usize(data: usize) -> Self {
|
||||||
|
MessageSender { data }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl core::default::Default for MessageSender {
|
||||||
|
fn default() -> Self {
|
||||||
|
MessageSender { data: 0 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl core::fmt::Display for MessageSender {
|
||||||
|
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
|
||||||
|
write!(f, "data: {}", self.data)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Server ID
|
/// Server ID
|
||||||
#[derive(Debug, Copy, Clone, PartialEq)]
|
#[derive(Debug, Copy, Clone, PartialEq)]
|
||||||
pub struct SID((u32, u32, u32, u32));
|
pub struct SID((u32, u32, u32, u32));
|
||||||
|
|
@ -343,7 +368,7 @@ impl MessageEnvelope {
|
||||||
Message::BlockingScalar(m) => (4, m.to_usize()),
|
Message::BlockingScalar(m) => (4, m.to_usize()),
|
||||||
};
|
};
|
||||||
[
|
[
|
||||||
self.sender,
|
self.sender.to_usize(),
|
||||||
ret.0,
|
ret.0,
|
||||||
ret.1[0],
|
ret.1[0],
|
||||||
ret.1[1],
|
ret.1[1],
|
||||||
|
|
@ -574,7 +599,7 @@ impl Result {
|
||||||
_ => return Result::Error(Error::InternalError),
|
_ => return Result::Error(Error::InternalError),
|
||||||
};
|
};
|
||||||
Result::Message(MessageEnvelope {
|
Result::Message(MessageEnvelope {
|
||||||
sender,
|
sender: MessageSender::from_usize(sender),
|
||||||
body: message,
|
body: message,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -558,7 +558,7 @@ impl SysCall {
|
||||||
},
|
},
|
||||||
SysCall::ReturnMemory(sender, buf) => [
|
SysCall::ReturnMemory(sender, buf) => [
|
||||||
SysCallNumber::ReturnMemory as usize,
|
SysCallNumber::ReturnMemory as usize,
|
||||||
*sender,
|
sender.to_usize(),
|
||||||
buf.as_ptr() as usize,
|
buf.as_ptr() as usize,
|
||||||
buf.len(),
|
buf.len(),
|
||||||
0,
|
0,
|
||||||
|
|
@ -620,7 +620,7 @@ impl SysCall {
|
||||||
},
|
},
|
||||||
SysCall::ReturnScalar1(sender, arg1) => [
|
SysCall::ReturnScalar1(sender, arg1) => [
|
||||||
SysCallNumber::ReturnScalar1 as usize,
|
SysCallNumber::ReturnScalar1 as usize,
|
||||||
*sender,
|
sender.to_usize(),
|
||||||
*arg1,
|
*arg1,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
|
|
@ -630,7 +630,7 @@ impl SysCall {
|
||||||
],
|
],
|
||||||
SysCall::ReturnScalar2(sender, arg1, arg2) => [
|
SysCall::ReturnScalar2(sender, arg1, arg2) => [
|
||||||
SysCallNumber::ReturnScalar2 as usize,
|
SysCallNumber::ReturnScalar2 as usize,
|
||||||
*sender,
|
sender.to_usize(),
|
||||||
*arg1,
|
*arg1,
|
||||||
*arg2,
|
*arg2,
|
||||||
0,
|
0,
|
||||||
|
|
@ -762,7 +762,9 @@ impl SysCall {
|
||||||
),
|
),
|
||||||
_ => SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7),
|
_ => SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7),
|
||||||
},
|
},
|
||||||
SysCallNumber::ReturnMemory => SysCall::ReturnMemory(a1, MemoryRange::new(a2, a3)?),
|
SysCallNumber::ReturnMemory => {
|
||||||
|
SysCall::ReturnMemory(MessageSender::from_usize(a1), MemoryRange::new(a2, a3)?)
|
||||||
|
}
|
||||||
SysCallNumber::CreateThread => {
|
SysCallNumber::CreateThread => {
|
||||||
SysCall::CreateThread(crate::arch::args_to_thread(a1, a2, a3, a4, a5, a6, a7)?)
|
SysCall::CreateThread(crate::arch::args_to_thread(a1, a2, a3, a4, a5, a6, a7)?)
|
||||||
}
|
}
|
||||||
|
|
@ -824,8 +826,12 @@ impl SysCall {
|
||||||
),
|
),
|
||||||
_ => SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7),
|
_ => SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7),
|
||||||
},
|
},
|
||||||
SysCallNumber::ReturnScalar1 => SysCall::ReturnScalar1(a1, a2),
|
SysCallNumber::ReturnScalar1 => {
|
||||||
SysCallNumber::ReturnScalar2 => SysCall::ReturnScalar2(a1, a2, a3),
|
SysCall::ReturnScalar1(MessageSender::from_usize(a1), a2)
|
||||||
|
}
|
||||||
|
SysCallNumber::ReturnScalar2 => {
|
||||||
|
SysCall::ReturnScalar2(MessageSender::from_usize(a1), a2, a3)
|
||||||
|
}
|
||||||
SysCallNumber::Invalid => SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7),
|
SysCallNumber::Invalid => SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue