From 04e91b8c449d3951282f0e0f21ccf015fff672d2 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 25 Apr 2022 14:18:49 +0800 Subject: [PATCH] xous: messages: add `set_id()` to set Message ID Allow setting a message's ID by adding a `set_id(&mut self, ...)` function. This can be used when regifting a message. Signed-off-by: Sean Cross --- xous-rs/src/definitions/messages/mod.rs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/xous-rs/src/definitions/messages/mod.rs b/xous-rs/src/definitions/messages/mod.rs index 79dc428e6..0e29634d3 100644 --- a/xous-rs/src/definitions/messages/mod.rs +++ b/xous-rs/src/definitions/messages/mod.rs @@ -9,7 +9,7 @@ pub use sender::Sender as MessageSender; pub mod id; pub use id::Id as MessageId; -use super::{MemoryRange, MemoryAddress, MemorySize}; +use super::{MemoryAddress, MemoryRange, MemorySize}; #[repr(C)] #[derive(Debug, PartialEq)] @@ -246,10 +246,18 @@ impl Message { } /// Return the ID of this message - pub fn id(&self) -> usize { - match &self { - &Message::MutableBorrow(mem) | &Message::Borrow(mem) | &Message::Move(mem) => mem.id, - &Message::Scalar(s) | &Message::BlockingScalar(s) => s.id, + pub fn id(&self) -> MessageId { + match self { + Message::MutableBorrow(mem) | Message::Borrow(mem) | Message::Move(mem) => mem.id, + Message::Scalar(s) | Message::BlockingScalar(s) => s.id, + } + } + + /// Set the ID or opcode of this message + pub fn set_id(&mut self, id: MessageId) { + match self { + Message::MutableBorrow(mem) | Message::Borrow(mem) | Message::Move(mem) => mem.id = id, + Message::Scalar(s) | Message::BlockingScalar(s) => s.id = id, } } }