max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

peripheralmutex: separate interrupt registration to own method.

Browse Source
This commit is contained in:
Dario Nieuwenhuis
2021-03-18 02:29:03 +01:00
parent 0cd19a58c3
commit b57489eb5d
3 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
embassy-extras/src/peripheral.rs
View File

@ -32,32 +32,33 @@ impl<S: PeripheralState> PeripheralMutex<S> {
}
}
/// safety: self must be pinned.
unsafe fn setup(&mut self) {
self.irq.disable();
pub fn register_interrupt(self: Pin<&mut Self>) {
let this = unsafe { self.get_unchecked_mut() };
if this.irq_setup_done {
return;
}
this.irq.disable();
compiler_fence(Ordering::SeqCst);
self.irq.set_handler(|p| {
this.irq.set_handler(|p| {
// Safety: it's OK to get a &mut to the state, since
// - We're in the IRQ, no one else can't preempt us
// - We can't have preempted a with() call because the irq is disabled during it.
let state = &mut *(p as *mut S);
let state = unsafe { &mut *(p as *mut S) };
state.on_interrupt();
});
self.irq
.set_handler_context((&mut self.state) as *mut _ as *mut ());
this.irq
.set_handler_context((&mut this.state) as *mut _ as *mut ());
compiler_fence(Ordering::SeqCst);
self.irq.enable();
this.irq.enable();
self.irq_setup_done = true;
this.irq_setup_done = true;
}
pub fn with<R>(self: Pin<&mut Self>, f: impl FnOnce(&mut S, &mut S::Interrupt) -> R) -> R {
let this = unsafe { self.get_unchecked_mut() };
if !this.irq_setup_done {
unsafe { this.setup() }
}
this.irq.disable();
compiler_fence(Ordering::SeqCst);