move dma impls in subdir

stm32-rs · Jun 27, 2023 · e6befe3 · e6befe3
1 parent c288909
commit e6befe3
Show file tree

Hide file tree

Showing 4 changed files with 640 additions and 595 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -99,20 +99,20 @@ rt = [] # deprecated
 stm32f401 = ["stm32f4/stm32f401", "device-selected", "gpio-f401",]
 stm32f405 = ["stm32f4/stm32f405", "device-selected", "gpio-f417"]
 stm32f407 = ["stm32f4/stm32f407", "device-selected", "gpio-f417"]
-stm32f415 = ["stm32f4/stm32f405", "device-selected", "gpio-f417"]
-stm32f417 = ["stm32f4/stm32f407", "device-selected", "gpio-f417"]
+stm32f415 = ["stm32f4/stm32f405", "device-selected", "gpio-f417", "cryp"]
+stm32f417 = ["stm32f4/stm32f407", "device-selected", "gpio-f417", "cryp"]
 stm32f410 = ["stm32f4/stm32f410", "device-selected", "gpio-f410"]
 stm32f411 = ["stm32f4/stm32f411", "device-selected", "gpio-f411"]
 stm32f412 = ["stm32f4/stm32f412", "device-selected", "gpio-f412"]
 stm32f413 = ["stm32f4/stm32f413", "device-selected", "gpio-f413"]
-stm32f423 = ["stm32f4/stm32f413", "device-selected", "gpio-f413"]
+stm32f423 = ["stm32f4/stm32f413", "device-selected", "gpio-f413", "aes"]
 stm32f427 = ["stm32f4/stm32f427", "device-selected", "gpio-f427", "fsmc"]
 stm32f429 = ["stm32f4/stm32f429", "device-selected", "gpio-f427", "fmc"]
-stm32f437 = ["stm32f4/stm32f427", "device-selected", "gpio-f427", "fsmc"]
-stm32f439 = ["stm32f4/stm32f429", "device-selected", "gpio-f427", "fmc"]
+stm32f437 = ["stm32f4/stm32f427", "device-selected", "gpio-f427", "fsmc", "cryp"]
+stm32f439 = ["stm32f4/stm32f429", "device-selected", "gpio-f427", "fmc", "cryp"]
 stm32f446 = ["stm32f4/stm32f446", "device-selected", "gpio-f446"]
 stm32f469 = ["stm32f4/stm32f469", "device-selected", "gpio-f469"]
-stm32f479 = ["stm32f4/stm32f469", "device-selected", "gpio-f469"]
+stm32f479 = ["stm32f4/stm32f469", "device-selected", "gpio-f469", "cryp"]
 
 gpio-f401 = [
     "gpiod", "gpioe",
@@ -259,12 +259,15 @@ fsmc_lcd = ["display-interface"]
 
 defmt = ["dep:defmt", "fugit/defmt", "nb/defmt-0-3"]
 dfsdm = []
+sai = []
 
 adc2 = []
 adc3 = []
+aes = []
 can1 = []
 can2 = []
 can3 = []
+cryp = []
 dac = []
 dcmi = []
 dfsdm1 = ["dfsdm"]
@@ -288,8 +291,8 @@ quadspi = []
 otg-fs = []
 otg-hs = []
 rng = []
-sai1 = []
-sai2 = []
+sai1 = ["sai"]
+sai2 = ["sai"]
 sdio = []
 spi3 = []
 spi4 = []

diff --git a/src/dma/mod.rs b/src/dma/mod.rs
@@ -22,8 +22,8 @@ use crate::{pac, rcc};
 pub mod traits;
 use crate::serial::RxISR;
 use traits::{
-    sealed::{Bits, Sealed},
-    Channel, DMASet, Direction, Instance, PeriAddress, SafePeripheralRead, Stream, StreamISR,
+    sealed::Bits, Channel, DMASet, Direction, Instance, PeriAddress, SafePeripheralRead, Stream,
+    StreamISR,
 };
 
 /// Errors.
@@ -241,14 +241,14 @@ pub type Stream6<DMA> = StreamX<DMA, 6>;
 /// Stream 7 on the DMA controller.
 pub type Stream7<DMA> = StreamX<DMA, 7>;
 
-impl<DMA> Sealed for StreamX<DMA, 0> {}
-impl<DMA> Sealed for StreamX<DMA, 1> {}
-impl<DMA> Sealed for StreamX<DMA, 2> {}
-impl<DMA> Sealed for StreamX<DMA, 3> {}
-impl<DMA> Sealed for StreamX<DMA, 4> {}
-impl<DMA> Sealed for StreamX<DMA, 5> {}
-impl<DMA> Sealed for StreamX<DMA, 6> {}
-impl<DMA> Sealed for StreamX<DMA, 7> {}
+impl<DMA> crate::Sealed for StreamX<DMA, 0> {}
+impl<DMA> crate::Sealed for StreamX<DMA, 1> {}
+impl<DMA> crate::Sealed for StreamX<DMA, 2> {}
+impl<DMA> crate::Sealed for StreamX<DMA, 3> {}
+impl<DMA> crate::Sealed for StreamX<DMA, 4> {}
+impl<DMA> crate::Sealed for StreamX<DMA, 5> {}
+impl<DMA> crate::Sealed for StreamX<DMA, 6> {}
+impl<DMA> crate::Sealed for StreamX<DMA, 7> {}
 
 /// Alias for a tuple with all DMA streams.
 pub struct StreamsTuple<DMA>(
@@ -284,7 +284,7 @@ impl<DMA: rcc::Enable + rcc::Reset> StreamsTuple<DMA> {
 
 impl<I: Instance, const S: u8> Stream for StreamX<I, S>
 where
-    Self: Sealed + StreamISR,
+    Self: crate::Sealed + StreamISR,
 {
     const NUMBER: usize = S as usize;
 
@@ -523,7 +523,7 @@ macro_rules! dma_stream {
         $feif:ident, $isr:ident, $tcisr:ident, $htisr:ident, $teisr:ident, $feisr:ident, $dmeisr:ident)),+
         $(,)*) => {
         $(
-            impl<I: Instance> StreamISR for StreamX<I, $number> where Self: Sealed {
+            impl<I: Instance> StreamISR for StreamX<I, $number> where Self: crate::Sealed {
 
                 #[inline(always)]
                 fn clear_interrupts(&mut self) {