Merge #341

341: Dma cleanups r=thalesfragoso a=burrbull



Co-authored-by: Andrey Zgarbul <zgarbul.andrey@gmail.com>

Author: bors[bot]

CHANGELOG.md

@@ -44,6 +44,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+- Split `Stream` trait on `Stream` and `StreamISR`.
+  Use const generics for `Stream` and `Channel`.
 - [breaking-change] `Timer::new` now just initializes peripheral.
   Use `.start_count_down` to start count, `pwm` or `delay` on `Timer` struct.
 - Add `Spi::new`, `I2s::new, `spi::Instance` and deprecate `Spi:spix`,

examples/adc_dma_rtic.rs

@@ -11,7 +11,7 @@ use stm32f4xx_hal::{
         config::{AdcConfig, Dma, SampleTime, Scan, Sequence},
         Adc, Temperature,
     },
-    dma::{config::DmaConfig, Channel0, PeripheralToMemory, Stream0, StreamsTuple, Transfer},
+    dma::{config::DmaConfig, PeripheralToMemory, Stream0, StreamsTuple, Transfer},
     prelude::*,
     signature::{VtempCal110, VtempCal30},
     stm32,
@@ -20,8 +20,7 @@ use stm32f4xx_hal::{
 
 const POLLING_PERIOD: u32 = 168_000_000 / 2;
 
-type DMATransfer =
-    Transfer<Stream0<DMA2>, Channel0, Adc<ADC1>, PeripheralToMemory, &'static mut [u16; 2]>;
+type DMATransfer = Transfer<Stream0<DMA2>, Adc<ADC1>, PeripheralToMemory, &'static mut [u16; 2], 0>;
 
 #[rtic::app(device = stm32f4xx_hal::stm32, peripherals = true, monotonic = rtic::cyccnt::CYCCNT)]
 const APP: () = {

examples/i2s-audio-out-dma.rs

@@ -51,7 +51,7 @@ use stm32_i2s_v12x::{MasterClock, MasterConfig, Polarity, TransmitMode};
 use stm32f4xx_hal::delay::Delay;
 use stm32f4xx_hal::dma::config::DmaConfig;
 use stm32f4xx_hal::dma::MemoryToPeripheral;
-use stm32f4xx_hal::dma::{Channel0, Stream5, StreamsTuple, Transfer};
+use stm32f4xx_hal::dma::{Stream5, StreamsTuple, Transfer};
 use stm32f4xx_hal::gpio::gpioa::PA4;
 use stm32f4xx_hal::gpio::gpioc::{PC10, PC12, PC7};
 use stm32f4xx_hal::gpio::Alternate;
@@ -212,7 +212,6 @@ fn main() -> ! {
 
 type I2sDmaTransfer = Transfer<
     Stream5<DMA1>,
-    Channel0,
     stm32_i2s_v12x::I2s<
         I2s<
             SPI3,
@@ -227,6 +226,7 @@ type I2sDmaTransfer = Transfer<
     >,
     MemoryToPeripheral,
     &'static mut [u16; SINE_SAMPLES * 2],
+    0,
 >;
 
 /// DMA transfer handoff from main() to interrupt handler