diff --git a/xous-rs/src/definitions.rs b/xous-rs/src/definitions.rs index 4dd422818..c550fc6b4 100644 --- a/xous-rs/src/definitions.rs +++ b/xous-rs/src/definitions.rs @@ -385,14 +385,23 @@ impl Message { } pub fn memory(&self) -> Option<&MemoryRange> { + self.memory_message().map(|msg| &msg.buf) + } + + pub fn memory_message(&self) -> Option<&MemoryMessage> { match self { - Message::MutableBorrow(mem) | Message::Borrow(mem) | Message::Move(mem) => { - Some(&mem.buf) - } + Message::MutableBorrow(mem) | Message::Borrow(mem) | Message::Move(mem) => Some(&mem), Message::BlockingScalar(_) | Message::Scalar(_) => None, } } + pub fn memory_message_mut(&mut self) -> Option<&mut MemoryMessage> { + match self { + Message::MutableBorrow(mem) | Message::Move(mem) => Some(mem), + Message::BlockingScalar(_) | Message::Scalar(_) | Message::Borrow(_) => None, + } + } + pub(crate) fn message_type(&self) -> usize { match *self { Message::MutableBorrow(_) => 1,