mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
xous: implement ReturnScalar and ReturnScalar2
Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
446fe17273
commit
d8edcb8b9e
2 changed files with 37 additions and 10 deletions
|
|
@ -55,7 +55,7 @@ impl<'a> Carton<'a> {
|
||||||
|
|
||||||
/// Perform an immutable lend of this Carton to the specified server.
|
/// Perform an immutable lend of this Carton to the specified server.
|
||||||
/// This function will block until the server returns.
|
/// This function will block until the server returns.
|
||||||
pub fn lend(&self, connection: CID, id: usize) -> Result<(), Error> {
|
pub fn lend(&self, connection: CID, id: usize) -> Result<crate::Result, Error> {
|
||||||
let msg = MemoryMessage {
|
let msg = MemoryMessage {
|
||||||
id,
|
id,
|
||||||
buf: self.valid,
|
buf: self.valid,
|
||||||
|
|
@ -66,7 +66,7 @@ impl<'a> Carton<'a> {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Perform a mutable lend of this Carton to the server.
|
/// Perform a mutable lend of this Carton to the server.
|
||||||
pub fn lend_mut(&mut self, connection: CID, id: usize) -> Result<(), Error> {
|
pub fn lend_mut(&mut self, connection: CID, id: usize) -> Result<crate::Result, Error> {
|
||||||
let msg = MemoryMessage {
|
let msg = MemoryMessage {
|
||||||
id,
|
id,
|
||||||
buf: self.valid,
|
buf: self.valid,
|
||||||
|
|
|
||||||
|
|
@ -246,9 +246,15 @@ pub enum SysCall {
|
||||||
/// Try to send a message to a server
|
/// Try to send a message to a server
|
||||||
TrySendMessage(CID, Message),
|
TrySendMessage(CID, Message),
|
||||||
|
|
||||||
/// Return a Borrowed memory region to a sender
|
/// Return a Borrowed memory region to the sender
|
||||||
ReturnMemory(MessageSender, MemoryRange),
|
ReturnMemory(MessageSender, MemoryRange),
|
||||||
|
|
||||||
|
/// Return a scalar to the sender
|
||||||
|
ReturnScalar1(MessageSender, usize),
|
||||||
|
|
||||||
|
/// Return two scalars to the sender
|
||||||
|
ReturnScalar2(MessageSender, usize, usize),
|
||||||
|
|
||||||
/// Spawn a new thread
|
/// Spawn a new thread
|
||||||
CreateThread(ThreadInit),
|
CreateThread(ThreadInit),
|
||||||
|
|
||||||
|
|
@ -293,6 +299,8 @@ pub enum SysCallNumber {
|
||||||
Shutdown = 23,
|
Shutdown = 23,
|
||||||
TrySendMessage = 24,
|
TrySendMessage = 24,
|
||||||
TryConnect = 25,
|
TryConnect = 25,
|
||||||
|
ReturnScalar1 = 26,
|
||||||
|
ReturnScalar2 = 27,
|
||||||
Invalid,
|
Invalid,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -324,6 +332,8 @@ impl SysCallNumber {
|
||||||
23 => Shutdown,
|
23 => Shutdown,
|
||||||
24 => TrySendMessage,
|
24 => TrySendMessage,
|
||||||
25 => TryConnect,
|
25 => TryConnect,
|
||||||
|
26 => ReturnScalar1,
|
||||||
|
27 => ReturnScalar2,
|
||||||
_ => Invalid,
|
_ => Invalid,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -570,6 +580,8 @@ impl SysCall {
|
||||||
sc.arg4,
|
sc.arg4,
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
SysCall::ReturnScalar1(sender, arg1) => [SysCallNumber::ReturnScalar1 as usize, *sender, *arg1, 0, 0, 0, 0, 0],
|
||||||
|
SysCall::ReturnScalar2(sender, arg1, arg2) => [SysCallNumber::ReturnScalar2 as usize, *sender, *arg1, *arg2, 0, 0, 0, 0],
|
||||||
SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7) => [
|
SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7) => [
|
||||||
SysCallNumber::Invalid as usize,
|
SysCallNumber::Invalid as usize,
|
||||||
*a1,
|
*a1,
|
||||||
|
|
@ -752,6 +764,8 @@ 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::ReturnScalar2 => SysCall::ReturnScalar2(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),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
@ -836,6 +850,19 @@ pub fn return_memory(sender: MessageSender, mem: MemoryRange) -> core::result::R
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Map the given physical address to the given virtual address.
|
||||||
|
/// The `size` field must be page-aligned.
|
||||||
|
pub fn return_scalar(sender: MessageSender, val: usize) -> core::result::Result<(), Error> {
|
||||||
|
let result = rsyscall(SysCall::ReturnScalar1(sender, val))?;
|
||||||
|
if let crate::Result::Ok = result {
|
||||||
|
Ok(())
|
||||||
|
} else if let Result::Error(e) = result {
|
||||||
|
Err(e)
|
||||||
|
} else {
|
||||||
|
Err(Error::InternalError)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Claim a hardware interrupt for this process.
|
/// Claim a hardware interrupt for this process.
|
||||||
pub fn claim_interrupt(
|
pub fn claim_interrupt(
|
||||||
irq_no: usize,
|
irq_no: usize,
|
||||||
|
|
@ -930,14 +957,14 @@ pub fn receive_message(server: SID) -> core::result::Result<MessageEnvelope, Err
|
||||||
/// * **BadAddress**: The client tried to pass a Memory message using an address it doesn't own
|
/// * **BadAddress**: The client tried to pass a Memory message using an address it doesn't own
|
||||||
/// * **ServerQueueFull**: The queue in the server is full, and this call would block
|
/// * **ServerQueueFull**: The queue in the server is full, and this call would block
|
||||||
/// * **Timeout**: The timeout limit has been reached
|
/// * **Timeout**: The timeout limit has been reached
|
||||||
pub fn try_send_message(connection: CID, message: Message) -> core::result::Result<(), Error> {
|
pub fn try_send_message(connection: CID, message: Message) -> core::result::Result<Result, Error> {
|
||||||
let result = rsyscall(SysCall::TrySendMessage(connection, message));
|
let result = rsyscall(SysCall::TrySendMessage(connection, message));
|
||||||
if let Ok(Result::Ok) = result {
|
match result {
|
||||||
Ok(())
|
Ok(Result::Ok) => Ok(Result::Ok),
|
||||||
} else if let Err(e) = result {
|
Ok(Result::Scalar1(a)) => Ok(Result::Scalar1(a)),
|
||||||
Err(e)
|
Ok(Result::Scalar2(a, b)) => Ok(Result::Scalar2(a, b)),
|
||||||
} else {
|
Err(e) => Err(e),
|
||||||
panic!("Unexpected return value: {:?}", result);
|
v => panic!("Unexpected return value: {:?}", v),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue