metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Add MailboxOps trait

This commit is contained in:
Berkus Decker 2020-10-21 16:19:20 +03:00
parent e6d4bf6095
commit 6ae59124a6
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nucleus/src/platform/rpi3/mailbox.rs
View File

@ -97,6 +97,18 @@ impl core::fmt::Display for MailboxError {
pub type Result<T> = ::core::result::Result<T, MailboxError>; pub type Result<T> = ::core::result::Result<T, MailboxError>;
/// Typical operations with a mailbox.
pub trait MailboxOps {
/// Deref from self to a mailbox RegisterBlock. Used by Deref implementations.
fn ptr(&self) -> *const RegisterBlock;
fn write(&self, channel: u32) -> Result<()>;
fn read(&self, channel: u32) -> Result<()>;
fn call(&self, channel: u32) -> Result<()> {
self.write(channel)?;
self.read(channel)
}
}
/* /*
* Source https://elinux.org/RPi_Framebuffer * Source https://elinux.org/RPi_Framebuffer
* Source for channels 8 and 9: https://github.com/raspberrypi/firmware/wiki/Mailboxes * Source for channels 8 and 9: https://github.com/raspberrypi/firmware/wiki/Mailboxes
@ -438,18 +450,18 @@ impl Mailbox {
} }
} }
impl PreparedMailbox { impl MailboxOps for PreparedMailbox {
/// Returns a pointer to the register block /// Returns a pointer to the register block
fn ptr(&self) -> *const RegisterBlock { fn ptr(&self) -> *const RegisterBlock {
self.0.base_addr as *const _ self.0.base_addr as *const _
} }
pub fn write(&self, channel: u32) -> Result<()> { fn write(&self, channel: u32) -> Result<()> {
write(self, self.0.buffer.as_ptr() as *const _, channel) write(self, self.0.buffer.as_ptr() as *const _, channel)
} }
// @todo read() should probably consume PreparedMailbox completely ? // @todo read() should probably consume PreparedMailbox completely ?
pub fn read(&self, channel: u32) -> Result<()> { fn read(&self, channel: u32) -> Result<()> {
// SAFETY: buffer is HW-mutable in the read call below! // SAFETY: buffer is HW-mutable in the read call below!
read( read(
self, self,
@ -473,11 +485,6 @@ impl PreparedMailbox {
} }
} }
} }
pub fn call(&self, channel: u32) -> Result<()> {
self.write(channel)?;
self.read(channel)
}
} }
#[cfg(test)] #[cfg(test)]