diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-06-08 16:08:40 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-06-08 18:00:48 +0200 |
| commit | 921780e6bfb9bcb2cd087b8aa8b094d792c99fa2 (patch) | |
| tree | bd21fba9800471b860ca44e05567588dcc1afef7 /embassy-stm32/src/dma | |
| parent | 87ad66f2b4a5bfd36dfc8d8aad5492e9e3f915e6 (diff) | |
Make interrupt module more standard.
- Move typelevel interrupts to a special-purpose mod: `embassy_xx::interrupt::typelevel`.
- Reexport the PAC interrupt enum in `embassy_xx::interrupt`.
This has a few advantages:
- The `embassy_xx::interrupt` module is now more "standard".
- It works with `cortex-m` functions for manipulating interrupts, for example.
- It works with RTIC.
- the interrupt enum allows holding value that can be "any interrupt at runtime", this can't be done with typelevel irqs.
- When "const-generics on enums" is stable, we can remove the typelevel interrupts without disruptive changes to `embassy_xx::interrupt`.
Diffstat (limited to 'embassy-stm32/src/dma')
| -rw-r--r-- | embassy-stm32/src/dma/bdma.rs | 6 | ||||
| -rw-r--r-- | embassy-stm32/src/dma/dma.rs | 6 | ||||
| -rw-r--r-- | embassy-stm32/src/dma/gpdma.rs | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/embassy-stm32/src/dma/bdma.rs b/embassy-stm32/src/dma/bdma.rs index 7a1ecda35..83ab4b18f 100644 --- a/embassy-stm32/src/dma/bdma.rs +++ b/embassy-stm32/src/dma/bdma.rs | |||
| @@ -14,7 +14,7 @@ use super::ringbuffer::{DmaCtrl, DmaRingBuffer, OverrunError}; | |||
| 14 | use super::word::{Word, WordSize}; | 14 | use super::word::{Word, WordSize}; |
| 15 | use super::Dir; | 15 | use super::Dir; |
| 16 | use crate::_generated::BDMA_CHANNEL_COUNT; | 16 | use crate::_generated::BDMA_CHANNEL_COUNT; |
| 17 | use crate::interrupt::Interrupt; | 17 | use crate::interrupt::typelevel::Interrupt; |
| 18 | use crate::pac; | 18 | use crate::pac; |
| 19 | use crate::pac::bdma::{regs, vals}; | 19 | use crate::pac::bdma::{regs, vals}; |
| 20 | 20 | ||
| @@ -70,8 +70,8 @@ static STATE: State = State::new(); | |||
| 70 | pub(crate) unsafe fn init(irq_priority: Priority) { | 70 | pub(crate) unsafe fn init(irq_priority: Priority) { |
| 71 | foreach_interrupt! { | 71 | foreach_interrupt! { |
| 72 | ($peri:ident, bdma, $block:ident, $signal_name:ident, $irq:ident) => { | 72 | ($peri:ident, bdma, $block:ident, $signal_name:ident, $irq:ident) => { |
| 73 | crate::interrupt::$irq::set_priority(irq_priority); | 73 | crate::interrupt::typelevel::$irq::set_priority(irq_priority); |
| 74 | crate::interrupt::$irq::enable(); | 74 | crate::interrupt::typelevel::$irq::enable(); |
| 75 | }; | 75 | }; |
| 76 | } | 76 | } |
| 77 | crate::_generated::init_bdma(); | 77 | crate::_generated::init_bdma(); |
diff --git a/embassy-stm32/src/dma/dma.rs b/embassy-stm32/src/dma/dma.rs index 3b602b991..17313b310 100644 --- a/embassy-stm32/src/dma/dma.rs +++ b/embassy-stm32/src/dma/dma.rs | |||
| @@ -13,7 +13,7 @@ use super::ringbuffer::{DmaCtrl, DmaRingBuffer, OverrunError}; | |||
| 13 | use super::word::{Word, WordSize}; | 13 | use super::word::{Word, WordSize}; |
| 14 | use super::Dir; | 14 | use super::Dir; |
| 15 | use crate::_generated::DMA_CHANNEL_COUNT; | 15 | use crate::_generated::DMA_CHANNEL_COUNT; |
| 16 | use crate::interrupt::Interrupt; | 16 | use crate::interrupt::typelevel::Interrupt; |
| 17 | use crate::pac::dma::{regs, vals}; | 17 | use crate::pac::dma::{regs, vals}; |
| 18 | use crate::{interrupt, pac}; | 18 | use crate::{interrupt, pac}; |
| 19 | 19 | ||
| @@ -149,8 +149,8 @@ static STATE: State = State::new(); | |||
| 149 | pub(crate) unsafe fn init(irq_priority: Priority) { | 149 | pub(crate) unsafe fn init(irq_priority: Priority) { |
| 150 | foreach_interrupt! { | 150 | foreach_interrupt! { |
| 151 | ($peri:ident, dma, $block:ident, $signal_name:ident, $irq:ident) => { | 151 | ($peri:ident, dma, $block:ident, $signal_name:ident, $irq:ident) => { |
| 152 | interrupt::$irq::set_priority(irq_priority); | 152 | interrupt::typelevel::$irq::set_priority(irq_priority); |
| 153 | interrupt::$irq::enable(); | 153 | interrupt::typelevel::$irq::enable(); |
| 154 | }; | 154 | }; |
| 155 | } | 155 | } |
| 156 | crate::_generated::init_dma(); | 156 | crate::_generated::init_dma(); |
diff --git a/embassy-stm32/src/dma/gpdma.rs b/embassy-stm32/src/dma/gpdma.rs index 7f8b82b46..07fef360f 100644 --- a/embassy-stm32/src/dma/gpdma.rs +++ b/embassy-stm32/src/dma/gpdma.rs | |||
| @@ -56,8 +56,8 @@ static STATE: State = State::new(); | |||
| 56 | pub(crate) unsafe fn init(irq_priority: Priority) { | 56 | pub(crate) unsafe fn init(irq_priority: Priority) { |
| 57 | foreach_interrupt! { | 57 | foreach_interrupt! { |
| 58 | ($peri:ident, gpdma, $block:ident, $signal_name:ident, $irq:ident) => { | 58 | ($peri:ident, gpdma, $block:ident, $signal_name:ident, $irq:ident) => { |
| 59 | crate::interrupt::$irq::set_priority(irq_priority); | 59 | crate::interrupt::typelevel::$irq::set_priority(irq_priority); |
| 60 | crate::interrupt::$irq::enable(); | 60 | crate::interrupt::typelevel::$irq::enable(); |
| 61 | }; | 61 | }; |
| 62 | } | 62 | } |
| 63 | crate::_generated::init_gpdma(); | 63 | crate::_generated::init_gpdma(); |
