Skip to content

Commit c8211f5

Browse files
committed
move dma impls in subdir
1 parent a182c2a commit c8211f5

File tree

4 files changed

+640
-595
lines changed

4 files changed

+640
-595
lines changed

Cargo.toml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,20 @@ rt = [] # deprecated
9999
stm32f401 = ["stm32f4/stm32f401", "device-selected", "gpio-f401",]
100100
stm32f405 = ["stm32f4/stm32f405", "device-selected", "gpio-f417"]
101101
stm32f407 = ["stm32f4/stm32f407", "device-selected", "gpio-f417"]
102-
stm32f415 = ["stm32f4/stm32f405", "device-selected", "gpio-f417"]
103-
stm32f417 = ["stm32f4/stm32f407", "device-selected", "gpio-f417"]
102+
stm32f415 = ["stm32f4/stm32f405", "device-selected", "gpio-f417", "cryp"]
103+
stm32f417 = ["stm32f4/stm32f407", "device-selected", "gpio-f417", "cryp"]
104104
stm32f410 = ["stm32f4/stm32f410", "device-selected", "gpio-f410"]
105105
stm32f411 = ["stm32f4/stm32f411", "device-selected", "gpio-f411"]
106106
stm32f412 = ["stm32f4/stm32f412", "device-selected", "gpio-f412"]
107107
stm32f413 = ["stm32f4/stm32f413", "device-selected", "gpio-f413"]
108-
stm32f423 = ["stm32f4/stm32f413", "device-selected", "gpio-f413"]
108+
stm32f423 = ["stm32f4/stm32f413", "device-selected", "gpio-f413", "aes"]
109109
stm32f427 = ["stm32f4/stm32f427", "device-selected", "gpio-f427", "fsmc"]
110110
stm32f429 = ["stm32f4/stm32f429", "device-selected", "gpio-f427", "fmc"]
111-
stm32f437 = ["stm32f4/stm32f427", "device-selected", "gpio-f427", "fsmc"]
112-
stm32f439 = ["stm32f4/stm32f429", "device-selected", "gpio-f427", "fmc"]
111+
stm32f437 = ["stm32f4/stm32f427", "device-selected", "gpio-f427", "fsmc", "cryp"]
112+
stm32f439 = ["stm32f4/stm32f429", "device-selected", "gpio-f427", "fmc", "cryp"]
113113
stm32f446 = ["stm32f4/stm32f446", "device-selected", "gpio-f446"]
114114
stm32f469 = ["stm32f4/stm32f469", "device-selected", "gpio-f469"]
115-
stm32f479 = ["stm32f4/stm32f469", "device-selected", "gpio-f469"]
115+
stm32f479 = ["stm32f4/stm32f469", "device-selected", "gpio-f469", "cryp"]
116116

117117
gpio-f401 = [
118118
"gpiod", "gpioe",
@@ -259,12 +259,15 @@ fsmc_lcd = ["display-interface"]
259259

260260
defmt = ["dep:defmt", "fugit/defmt", "nb/defmt-0-3"]
261261
dfsdm = []
262+
sai = []
262263

263264
adc2 = []
264265
adc3 = []
266+
aes = []
265267
can1 = []
266268
can2 = []
267269
can3 = []
270+
cryp = []
268271
dac = []
269272
dcmi = []
270273
dfsdm1 = ["dfsdm"]
@@ -288,8 +291,8 @@ quadspi = []
288291
otg-fs = []
289292
otg-hs = []
290293
rng = []
291-
sai1 = []
292-
sai2 = []
294+
sai1 = ["sai"]
295+
sai2 = ["sai"]
293296
sdio = []
294297
spi3 = []
295298
spi4 = []

src/dma/mod.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ use crate::{pac, rcc};
2222
pub mod traits;
2323
use crate::serial::RxISR;
2424
use traits::{
25-
sealed::{Bits, Sealed},
26-
Channel, DMASet, Direction, Instance, PeriAddress, SafePeripheralRead, Stream, StreamISR,
25+
sealed::Bits, Channel, DMASet, Direction, Instance, PeriAddress, SafePeripheralRead, Stream,
26+
StreamISR,
2727
};
2828

2929
/// Errors.
@@ -241,14 +241,14 @@ pub type Stream6<DMA> = StreamX<DMA, 6>;
241241
/// Stream 7 on the DMA controller.
242242
pub type Stream7<DMA> = StreamX<DMA, 7>;
243243

244-
impl<DMA> Sealed for StreamX<DMA, 0> {}
245-
impl<DMA> Sealed for StreamX<DMA, 1> {}
246-
impl<DMA> Sealed for StreamX<DMA, 2> {}
247-
impl<DMA> Sealed for StreamX<DMA, 3> {}
248-
impl<DMA> Sealed for StreamX<DMA, 4> {}
249-
impl<DMA> Sealed for StreamX<DMA, 5> {}
250-
impl<DMA> Sealed for StreamX<DMA, 6> {}
251-
impl<DMA> Sealed for StreamX<DMA, 7> {}
244+
impl<DMA> crate::Sealed for StreamX<DMA, 0> {}
245+
impl<DMA> crate::Sealed for StreamX<DMA, 1> {}
246+
impl<DMA> crate::Sealed for StreamX<DMA, 2> {}
247+
impl<DMA> crate::Sealed for StreamX<DMA, 3> {}
248+
impl<DMA> crate::Sealed for StreamX<DMA, 4> {}
249+
impl<DMA> crate::Sealed for StreamX<DMA, 5> {}
250+
impl<DMA> crate::Sealed for StreamX<DMA, 6> {}
251+
impl<DMA> crate::Sealed for StreamX<DMA, 7> {}
252252

253253
/// Alias for a tuple with all DMA streams.
254254
pub struct StreamsTuple<DMA>(
@@ -284,7 +284,7 @@ impl<DMA: rcc::Enable + rcc::Reset> StreamsTuple<DMA> {
284284

285285
impl<I: Instance, const S: u8> Stream for StreamX<I, S>
286286
where
287-
Self: Sealed + StreamISR,
287+
Self: crate::Sealed + StreamISR,
288288
{
289289
const NUMBER: usize = S as usize;
290290

@@ -523,7 +523,7 @@ macro_rules! dma_stream {
523523
$feif:ident, $isr:ident, $tcisr:ident, $htisr:ident, $teisr:ident, $feisr:ident, $dmeisr:ident)),+
524524
$(,)*) => {
525525
$(
526-
impl<I: Instance> StreamISR for StreamX<I, $number> where Self: Sealed {
526+
impl<I: Instance> StreamISR for StreamX<I, $number> where Self: crate::Sealed {
527527

528528
#[inline(always)]
529529
fn clear_interrupts(&mut self) {

0 commit comments

Comments
 (0)