From 0230ccb25207695bc60878cdac3ebb75e21fafac Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Fri, 2 Apr 2021 17:30:32 +0800 Subject: [PATCH] xous: syscall: add definitions for Disconnect and DestroyServer Signed-off-by: Sean Cross --- xous-rs/src/syscall.rs | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/xous-rs/src/syscall.rs b/xous-rs/src/syscall.rs index 1d0a5592d..47939c4d4 100644 --- a/xous-rs/src/syscall.rs +++ b/xous-rs/src/syscall.rs @@ -310,6 +310,14 @@ pub enum SysCall { /// Get the current Process ID GetProcessId, + /// Destroys the given Server ID. All clients that are waiting will be woken + /// up and will receive a `ServerNotFound` response. + DestroyServer(SID), + + /// Disconnects from a Server. This invalidates the CID, which may be reused + /// in a future reconnection. + Disconnect(CID), + /// This syscall does not exist. It captures all possible /// arguments so detailed analysis can be performed. Invalid(usize, usize, usize, usize, usize, usize, usize), @@ -349,6 +357,8 @@ pub enum SysCallNumber { CreateServerId = 31, GetThreadId = 32, GetProcessId = 33, + DestroyServer = 34, + Disconnect = 35, Invalid, } @@ -388,6 +398,8 @@ impl SysCallNumber { 31 => CreateServerId, 32 => GetThreadId, 33 => GetProcessId, + 34 => DestroyServer, + 35 => Disconnect, _ => Invalid, } } @@ -686,6 +698,29 @@ impl SysCall { ], SysCall::GetThreadId => [SysCallNumber::GetThreadId as usize, 0, 0, 0, 0, 0, 0, 0], SysCall::GetProcessId => [SysCallNumber::GetProcessId as usize, 0, 0, 0, 0, 0, 0, 0], + SysCall::DestroyServer(sid) => { + let s = sid.to_u32(); + [ + SysCallNumber::DestroyServer as usize, + s.0 as _, + s.1 as _, + s.2 as _, + s.3 as _, + 0, + 0, + 0, + ] + } + SysCall::Disconnect(cid) => [ + SysCallNumber::Disconnect as usize, + *cid as usize, + 0, + 0, + 0, + 0, + 0, + 0, + ], SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7) => [ SysCallNumber::Invalid as usize, *a1, @@ -843,6 +878,10 @@ impl SysCall { SysCallNumber::CreateServerId => SysCall::CreateServerId, SysCallNumber::GetThreadId => SysCall::GetThreadId, SysCallNumber::GetProcessId => SysCall::GetProcessId, + SysCallNumber::DestroyServer => { + SysCall::DestroyServer(SID::from_u32(a1 as _, a2 as _, a3 as _, a4 as _)) + } + SysCallNumber::Disconnect => SysCall::Disconnect(a1 as _), SysCallNumber::Invalid => SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7), }) }