From a05258654cc2a9833b69bccf8b146f49d13aba1f Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 24 Mar 2020 15:26:25 +0800 Subject: [PATCH] xous: rename WaitMessage -> ReceiveMessage It might not wait. The name `ReceiveMessage` better reflects the operation. Signed-off-by: Sean Cross --- xous-rs/src/definitions.rs | 3 ++- xous-rs/src/syscall.rs | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xous-rs/src/definitions.rs b/xous-rs/src/definitions.rs index 746a48575..d7c7f6c57 100644 --- a/xous-rs/src/definitions.rs +++ b/xous-rs/src/definitions.rs @@ -36,7 +36,8 @@ pub enum Error { ProcessTerminated = 12, Timeout = 13, InternalError = 14, - UnhandledSyscall = 15, + ServerQueueFull = 15, + UnhandledSyscall = 16, } #[repr(C)] diff --git a/xous-rs/src/syscall.rs b/xous-rs/src/syscall.rs index 0ba96910a..e808c318e 100644 --- a/xous-rs/src/syscall.rs +++ b/xous-rs/src/syscall.rs @@ -144,9 +144,9 @@ pub enum SysCall { WaitEvent, /// This context will now wait for a message with the given server ID.. - /// You can set up a pool by having multiple threads call `WaitMessage` + /// You can set up a pool by having multiple threads call `ReceiveMessage` /// with the same SID. - WaitMessage(SID), + ReceiveMessage(SID), /// Stop running the given process. Suspend(PID, CpuID), @@ -270,7 +270,7 @@ enum SysCallNumber { UpdateMemoryFlags = 12, SetMemRegion = 13, CreateServer = 14, - WaitMessage = 15, + ReceiveMessage = 15, SendMessage = 16, Connect = 17, Invalid, @@ -299,8 +299,8 @@ impl SysCall { ], SysCall::Yield => [SysCallNumber::Yield as usize, 0, 0, 0, 0, 0, 0, 0], SysCall::WaitEvent => [SysCallNumber::WaitEvent as usize, 0, 0, 0, 0, 0, 0, 0], - SysCall::WaitMessage(sid) => [ - SysCallNumber::WaitMessage as usize, + SysCall::ReceiveMessage(sid) => [ + SysCallNumber::ReceiveMessage as usize, sid.0, sid.1, sid.2, @@ -455,7 +455,7 @@ impl SysCall { ), Some(SysCallNumber::Yield) => SysCall::Yield, Some(SysCallNumber::WaitEvent) => SysCall::WaitEvent, - Some(SysCallNumber::WaitMessage) => SysCall::WaitMessage((a1, a2, a3, a4)), + Some(SysCallNumber::ReceiveMessage) => SysCall::ReceiveMessage((a1, a2, a3, a4)), Some(SysCallNumber::Suspend) => SysCall::Suspend(a1 as PID, a2), Some(SysCallNumber::ClaimInterrupt) => { SysCall::ClaimInterrupt(a1, a2 as *mut usize, a3 as *mut usize) @@ -674,7 +674,7 @@ pub fn connect(server: SID) -> core::result::Result { /// # Errors /// pub fn receive_message(server: SID) -> core::result::Result { - let result = rsyscall(SysCall::WaitMessage(server)).expect("Couldn't call watimessage"); + let result = rsyscall(SysCall::ReceiveMessage(server)).expect("Couldn't call watimessage"); Err(Error::UnhandledSyscall) }