From 013792b9442b4ef6ca4d6ddc6ee631d4491dbfbd Mon Sep 17 00:00:00 2001 From: Thales Fragoso Date: Thu, 24 Jun 2021 20:00:51 -0300 Subject: Separate exti into v1 and v2 --- embassy-stm32/src/exti.rs | 274 ------------------------------------------ embassy-stm32/src/exti/mod.rs | 111 +++++++++++++++++ embassy-stm32/src/exti/v1.rs | 171 ++++++++++++++++++++++++++ embassy-stm32/src/exti/v2.rs | 1 + embassy-stm32/src/lib.rs | 4 +- 5 files changed, 285 insertions(+), 276 deletions(-) delete mode 100644 embassy-stm32/src/exti.rs create mode 100644 embassy-stm32/src/exti/mod.rs create mode 100644 embassy-stm32/src/exti/v1.rs create mode 100644 embassy-stm32/src/exti/v2.rs diff --git a/embassy-stm32/src/exti.rs b/embassy-stm32/src/exti.rs deleted file mode 100644 index 90d4afd56..000000000 --- a/embassy-stm32/src/exti.rs +++ /dev/null @@ -1,274 +0,0 @@ -#![macro_use] -use core::convert::Infallible; -use core::future::Future; -use core::marker::PhantomData; -use core::pin::Pin; -use core::task::{Context, Poll}; -use embassy::traits::gpio::{WaitForAnyEdge, WaitForFallingEdge, WaitForRisingEdge}; -use embassy::util::{AtomicWaker, Unborrow}; -use embassy_extras::unsafe_impl_unborrow; -use embedded_hal::digital::v2::InputPin; -use pac::exti::{regs, vals}; - -use crate::gpio::{AnyPin, Input, Pin as GpioPin}; -use crate::pac; -use crate::pac::{EXTI, SYSCFG}; -use crate::peripherals; - -const EXTI_COUNT: usize = 16; -const NEW_AW: AtomicWaker = AtomicWaker::new(); -static EXTI_WAKERS: [AtomicWaker; EXTI_COUNT] = [NEW_AW; EXTI_COUNT]; - -pub unsafe fn on_irq() { - let bits = EXTI.pr().read().0; - - // Mask all the channels that fired. - EXTI.imr().modify(|w| w.0 &= !bits); - - // Wake the tasks - for pin in BitIter(bits) { - EXTI_WAKERS[pin as usize].wake(); - } - - // Clear pending - EXTI.pr().write_value(regs::Pr(bits)); -} - -struct BitIter(u32); - -impl Iterator for BitIter { - type Item = u32; - - fn next(&mut self) -> Option { - match self.0.trailing_zeros() { - 32 => None, - b => { - self.0 &= !(1 << b); - Some(b) - } - } - } -} - -/// EXTI input driver -pub struct ExtiInput<'d, T: GpioPin> { - pin: Input<'d, T>, -} - -impl<'d, T: GpioPin> Unpin for ExtiInput<'d, T> {} - -impl<'d, T: GpioPin> ExtiInput<'d, T> { - pub fn new(pin: Input<'d, T>, _ch: impl Unborrow + 'd) -> Self { - Self { pin } - } -} - -impl<'d, T: GpioPin> InputPin for ExtiInput<'d, T> { - type Error = Infallible; - - fn is_high(&self) -> Result { - self.pin.is_high() - } - - fn is_low(&self) -> Result { - self.pin.is_low() - } -} - -impl<'d, T: GpioPin> WaitForRisingEdge for ExtiInput<'d, T> { - type Future<'a> = ExtiInputFuture<'a>; - - fn wait_for_rising_edge<'a>(&'a mut self) -> Self::Future<'a> { - ExtiInputFuture::new( - self.pin.pin.pin(), - self.pin.pin.port(), - vals::Tr::ENABLED, - vals::Tr::DISABLED, - ) - } -} - -impl<'d, T: GpioPin> WaitForFallingEdge for ExtiInput<'d, T> { - type Future<'a> = ExtiInputFuture<'a>; - - fn wait_for_falling_edge<'a>(&'a mut self) -> Self::Future<'a> { - ExtiInputFuture::new( - self.pin.pin.pin(), - self.pin.pin.port(), - vals::Tr::DISABLED, - vals::Tr::ENABLED, - ) - } -} - -impl<'d, T: GpioPin> WaitForAnyEdge for ExtiInput<'d, T> { - type Future<'a> = ExtiInputFuture<'a>; - - fn wait_for_any_edge<'a>(&'a mut self) -> Self::Future<'a> { - ExtiInputFuture::new( - self.pin.pin.pin(), - self.pin.pin.port(), - vals::Tr::ENABLED, - vals::Tr::ENABLED, - ) - } -} - -pub struct ExtiInputFuture<'a> { - pin: u8, - phantom: PhantomData<&'a mut AnyPin>, -} - -impl<'a> ExtiInputFuture<'a> { - fn new(pin: u8, port: u8, rising: vals::Tr, falling: vals::Tr) -> Self { - cortex_m::interrupt::free(|_| unsafe { - let pin = pin as usize; - SYSCFG.exticr(pin / 4).modify(|w| w.set_exti(pin % 4, port)); - EXTI.rtsr().modify(|w| w.set_tr(pin, rising)); - EXTI.ftsr().modify(|w| w.set_tr(pin, falling)); - EXTI.pr().write(|w| w.set_pr(pin, true)); // clear pending bit - EXTI.imr().modify(|w| w.set_mr(pin, vals::Mr::UNMASKED)); - }); - - Self { - pin, - phantom: PhantomData, - } - } -} - -impl<'a> Drop for ExtiInputFuture<'a> { - fn drop(&mut self) { - cortex_m::interrupt::free(|_| unsafe { - let pin = self.pin as _; - EXTI.imr().modify(|w| w.set_mr(pin, vals::Mr::MASKED)); - }); - } -} - -impl<'a> Future for ExtiInputFuture<'a> { - type Output = (); - - fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { - EXTI_WAKERS[self.pin as usize].register(cx.waker()); - - if unsafe { EXTI.imr().read().mr(self.pin as _) == vals::Mr::MASKED } { - Poll::Ready(()) - } else { - Poll::Pending - } - } -} - -pub(crate) mod sealed { - pub trait Channel {} -} - -pub trait Channel: sealed::Channel + Sized { - fn number(&self) -> usize; - fn degrade(self) -> AnyChannel { - AnyChannel { - number: self.number() as u8, - } - } -} - -pub struct AnyChannel { - number: u8, -} -unsafe_impl_unborrow!(AnyChannel); -impl sealed::Channel for AnyChannel {} -impl Channel for AnyChannel { - fn number(&self) -> usize { - self.number as usize - } -} - -macro_rules! impl_exti { - ($type:ident, $number:expr) => { - impl sealed::Channel for peripherals::$type {} - impl Channel for peripherals::$type { - fn number(&self) -> usize { - $number as usize - } - } - }; -} - -impl_exti!(EXTI0, 0); -impl_exti!(EXTI1, 1); -impl_exti!(EXTI2, 2); -impl_exti!(EXTI3, 3); -impl_exti!(EXTI4, 4); -impl_exti!(EXTI5, 5); -impl_exti!(EXTI6, 6); -impl_exti!(EXTI7, 7); -impl_exti!(EXTI8, 8); -impl_exti!(EXTI9, 9); -impl_exti!(EXTI10, 10); -impl_exti!(EXTI11, 11); -impl_exti!(EXTI12, 12); -impl_exti!(EXTI13, 13); -impl_exti!(EXTI14, 14); -impl_exti!(EXTI15, 15); - -macro_rules! foreach_exti_irq { - ($action:ident) => { - crate::pac::interrupts!( - (EXTI0) => { $action!(EXTI0); }; - (EXTI1) => { $action!(EXTI1); }; - (EXTI2) => { $action!(EXTI2); }; - (EXTI3) => { $action!(EXTI3); }; - (EXTI4) => { $action!(EXTI4); }; - (EXTI5) => { $action!(EXTI5); }; - (EXTI6) => { $action!(EXTI6); }; - (EXTI7) => { $action!(EXTI7); }; - (EXTI8) => { $action!(EXTI8); }; - (EXTI9) => { $action!(EXTI9); }; - (EXTI10) => { $action!(EXTI10); }; - (EXTI11) => { $action!(EXTI11); }; - (EXTI12) => { $action!(EXTI12); }; - (EXTI13) => { $action!(EXTI13); }; - (EXTI14) => { $action!(EXTI14); }; - (EXTI15) => { $action!(EXTI15); }; - - // plus the weird ones - (EXTI0_1) => { $action!( EXTI0_1 ); }; - (EXTI15_10) => { $action!(EXTI15_10); }; - (EXTI15_4) => { $action!(EXTI15_4); }; - (EXTI1_0) => { $action!(EXTI1_0); }; - (EXTI2_3) => { $action!(EXTI2_3); }; - (EXTI2_TSC) => { $action!(EXTI2_TSC); }; - (EXTI3_2) => { $action!(EXTI3_2); }; - (EXTI4_15) => { $action!(EXTI4_15); }; - (EXTI9_5) => { $action!(EXTI9_5); }; - ); - }; -} - -macro_rules! enable_irq { - ($e:ident) => { - crate::interrupt::$e::steal().enable(); - }; -} - -/// safety: must be called only once -pub(crate) unsafe fn init() { - use embassy::interrupt::Interrupt; - use embassy::interrupt::InterruptExt; - - foreach_exti_irq!(enable_irq); -} - -use crate::interrupt; - -macro_rules! impl_irq { - ($e:ident) => { - #[interrupt] - unsafe fn $e() { - on_irq() - } - }; -} - -foreach_exti_irq!(impl_irq); diff --git a/embassy-stm32/src/exti/mod.rs b/embassy-stm32/src/exti/mod.rs new file mode 100644 index 000000000..126a6fb64 --- /dev/null +++ b/embassy-stm32/src/exti/mod.rs @@ -0,0 +1,111 @@ +#![macro_use] + +macro_rules! foreach_exti_irq { + ($action:ident) => { + crate::pac::interrupts!( + (EXTI0) => { $action!(EXTI0); }; + (EXTI1) => { $action!(EXTI1); }; + (EXTI2) => { $action!(EXTI2); }; + (EXTI3) => { $action!(EXTI3); }; + (EXTI4) => { $action!(EXTI4); }; + (EXTI5) => { $action!(EXTI5); }; + (EXTI6) => { $action!(EXTI6); }; + (EXTI7) => { $action!(EXTI7); }; + (EXTI8) => { $action!(EXTI8); }; + (EXTI9) => { $action!(EXTI9); }; + (EXTI10) => { $action!(EXTI10); }; + (EXTI11) => { $action!(EXTI11); }; + (EXTI12) => { $action!(EXTI12); }; + (EXTI13) => { $action!(EXTI13); }; + (EXTI14) => { $action!(EXTI14); }; + (EXTI15) => { $action!(EXTI15); }; + + // plus the weird ones + (EXTI0_1) => { $action!( EXTI0_1 ); }; + (EXTI15_10) => { $action!(EXTI15_10); }; + (EXTI15_4) => { $action!(EXTI15_4); }; + (EXTI1_0) => { $action!(EXTI1_0); }; + (EXTI2_3) => { $action!(EXTI2_3); }; + (EXTI2_TSC) => { $action!(EXTI2_TSC); }; + (EXTI3_2) => { $action!(EXTI3_2); }; + (EXTI4_15) => { $action!(EXTI4_15); }; + (EXTI9_5) => { $action!(EXTI9_5); }; + ); + }; +} + +#[cfg_attr(exti_v1, path = "v1.rs")] +#[cfg_attr(exti_wb55, path = "v2.rs")] +mod _version; + +#[allow(unused)] +pub use _version::*; + +use crate::peripherals; +use embassy_extras::unsafe_impl_unborrow; + +pub(crate) mod sealed { + pub trait Channel {} +} + +pub trait Channel: sealed::Channel + Sized { + fn number(&self) -> usize; + fn degrade(self) -> AnyChannel { + AnyChannel { + number: self.number() as u8, + } + } +} + +pub struct AnyChannel { + number: u8, +} +unsafe_impl_unborrow!(AnyChannel); +impl sealed::Channel for AnyChannel {} +impl Channel for AnyChannel { + fn number(&self) -> usize { + self.number as usize + } +} + +macro_rules! impl_exti { + ($type:ident, $number:expr) => { + impl sealed::Channel for peripherals::$type {} + impl Channel for peripherals::$type { + fn number(&self) -> usize { + $number as usize + } + } + }; +} + +impl_exti!(EXTI0, 0); +impl_exti!(EXTI1, 1); +impl_exti!(EXTI2, 2); +impl_exti!(EXTI3, 3); +impl_exti!(EXTI4, 4); +impl_exti!(EXTI5, 5); +impl_exti!(EXTI6, 6); +impl_exti!(EXTI7, 7); +impl_exti!(EXTI8, 8); +impl_exti!(EXTI9, 9); +impl_exti!(EXTI10, 10); +impl_exti!(EXTI11, 11); +impl_exti!(EXTI12, 12); +impl_exti!(EXTI13, 13); +impl_exti!(EXTI14, 14); +impl_exti!(EXTI15, 15); + +macro_rules! enable_irq { + ($e:ident) => { + crate::interrupt::$e::steal().enable(); + }; +} + +/// safety: must be called only once +pub(crate) unsafe fn init() { + use embassy::interrupt::Interrupt; + use embassy::interrupt::InterruptExt; + + foreach_exti_irq!(enable_irq); +} diff --git a/embassy-stm32/src/exti/v1.rs b/embassy-stm32/src/exti/v1.rs new file mode 100644 index 000000000..caf457605 --- /dev/null +++ b/embassy-stm32/src/exti/v1.rs @@ -0,0 +1,171 @@ +use core::convert::Infallible; +use core::future::Future; +use core::marker::PhantomData; +use core::pin::Pin; +use core::task::{Context, Poll}; +use embassy::traits::gpio::{WaitForAnyEdge, WaitForFallingEdge, WaitForRisingEdge}; +use embassy::util::{AtomicWaker, Unborrow}; +use embedded_hal::digital::v2::InputPin; +use pac::exti::{regs, vals}; + +use crate::gpio::{AnyPin, Input, Pin as GpioPin}; +use crate::pac; +use crate::pac::{EXTI, SYSCFG}; + +const EXTI_COUNT: usize = 16; +const NEW_AW: AtomicWaker = AtomicWaker::new(); +static EXTI_WAKERS: [AtomicWaker; EXTI_COUNT] = [NEW_AW; EXTI_COUNT]; + +pub unsafe fn on_irq() { + let bits = EXTI.pr().read().0; + + // Mask all the channels that fired. + EXTI.imr().modify(|w| w.0 &= !bits); + + // Wake the tasks + for pin in BitIter(bits) { + EXTI_WAKERS[pin as usize].wake(); + } + + // Clear pending + EXTI.pr().write_value(regs::Pr(bits)); +} + +struct BitIter(u32); + +impl Iterator for BitIter { + type Item = u32; + + fn next(&mut self) -> Option { + match self.0.trailing_zeros() { + 32 => None, + b => { + self.0 &= !(1 << b); + Some(b) + } + } + } +} + +/// EXTI input driver +pub struct ExtiInput<'d, T: GpioPin> { + pin: Input<'d, T>, +} + +impl<'d, T: GpioPin> Unpin for ExtiInput<'d, T> {} + +impl<'d, T: GpioPin> ExtiInput<'d, T> { + pub fn new(pin: Input<'d, T>, _ch: impl Unborrow + 'd) -> Self { + Self { pin } + } +} + +impl<'d, T: GpioPin> InputPin for ExtiInput<'d, T> { + type Error = Infallible; + + fn is_high(&self) -> Result { + self.pin.is_high() + } + + fn is_low(&self) -> Result { + self.pin.is_low() + } +} + +impl<'d, T: GpioPin> WaitForRisingEdge for ExtiInput<'d, T> { + type Future<'a> = ExtiInputFuture<'a>; + + fn wait_for_rising_edge<'a>(&'a mut self) -> Self::Future<'a> { + ExtiInputFuture::new( + self.pin.pin.pin(), + self.pin.pin.port(), + vals::Tr::ENABLED, + vals::Tr::DISABLED, + ) + } +} + +impl<'d, T: GpioPin> WaitForFallingEdge for ExtiInput<'d, T> { + type Future<'a> = ExtiInputFuture<'a>; + + fn wait_for_falling_edge<'a>(&'a mut self) -> Self::Future<'a> { + ExtiInputFuture::new( + self.pin.pin.pin(), + self.pin.pin.port(), + vals::Tr::DISABLED, + vals::Tr::ENABLED, + ) + } +} + +impl<'d, T: GpioPin> WaitForAnyEdge for ExtiInput<'d, T> { + type Future<'a> = ExtiInputFuture<'a>; + + fn wait_for_any_edge<'a>(&'a mut self) -> Self::Future<'a> { + ExtiInputFuture::new( + self.pin.pin.pin(), + self.pin.pin.port(), + vals::Tr::ENABLED, + vals::Tr::ENABLED, + ) + } +} + +pub struct ExtiInputFuture<'a> { + pin: u8, + phantom: PhantomData<&'a mut AnyPin>, +} + +impl<'a> ExtiInputFuture<'a> { + fn new(pin: u8, port: u8, rising: vals::Tr, falling: vals::Tr) -> Self { + cortex_m::interrupt::free(|_| unsafe { + let pin = pin as usize; + SYSCFG.exticr(pin / 4).modify(|w| w.set_exti(pin % 4, port)); + EXTI.rtsr().modify(|w| w.set_tr(pin, rising)); + EXTI.ftsr().modify(|w| w.set_tr(pin, falling)); + EXTI.pr().write(|w| w.set_pr(pin, true)); // clear pending bit + EXTI.imr().modify(|w| w.set_mr(pin, vals::Mr::UNMASKED)); + }); + + Self { + pin, + phantom: PhantomData, + } + } +} + +impl<'a> Drop for ExtiInputFuture<'a> { + fn drop(&mut self) { + cortex_m::interrupt::free(|_| unsafe { + let pin = self.pin as _; + EXTI.imr().modify(|w| w.set_mr(pin, vals::Mr::MASKED)); + }); + } +} + +impl<'a> Future for ExtiInputFuture<'a> { + type Output = (); + + fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { + EXTI_WAKERS[self.pin as usize].register(cx.waker()); + + if unsafe { EXTI.imr().read().mr(self.pin as _) == vals::Mr::MASKED } { + Poll::Ready(()) + } else { + Poll::Pending + } + } +} + +use crate::interrupt; + +macro_rules! impl_irq { + ($e:ident) => { + #[interrupt] + unsafe fn $e() { + on_irq() + } + }; +} + +foreach_exti_irq!(impl_irq); diff --git a/embassy-stm32/src/exti/v2.rs b/embassy-stm32/src/exti/v2.rs new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/embassy-stm32/src/exti/v2.rs @@ -0,0 +1 @@ + diff --git a/embassy-stm32/src/lib.rs b/embassy-stm32/src/lib.rs index 383843d04..9ba7bbe4c 100644 --- a/embassy-stm32/src/lib.rs +++ b/embassy-stm32/src/lib.rs @@ -30,7 +30,7 @@ pub mod dac; pub mod dma; #[cfg(all(eth, feature = "net"))] pub mod eth; -#[cfg(exti_v1)] +#[cfg(exti)] pub mod exti; #[cfg(i2c)] pub mod i2c; @@ -86,7 +86,7 @@ pub fn init(config: Config) -> Peripherals { unsafe { #[cfg(dma)] dma::init(); - #[cfg(exti_v1)] + #[cfg(exti)] exti::init(); rcc::init(config.rcc); } -- cgit