Merge #313

313: update embedded dma -> 0.2.0 r=richardeoin a=andrewgazelka



Co-authored-by: Andrew Gazelka <andrew.gazelka@gmail.com>

Author: bors[bot]

Cargo.toml

@@ -27,7 +27,7 @@ targets = ["thumbv7em-none-eabihf"]
 [dependencies]
 fugit = "0.3.3"
 embedded-hal = { version = "0.2.6", features = ["unproven"] }
-embedded-dma = "0.1.2"
+embedded-dma = "0.2.0"
 cortex-m = "^0.7.4"
 defmt = { version = ">=0.2.0,<0.4", optional = true }
 stm32h7 = { version = "^0.14.0", default-features = false }

src/dma/mod.rs

@@ -97,7 +97,13 @@ use core::{
     ptr,
     sync::atomic::{fence, Ordering},
 };
-use embedded_dma::{StaticReadBuffer, StaticWriteBuffer};
+
+use embedded_dma::{ReadBuffer, WriteBuffer};
+
+use traits::{
+    sealed::Bits, Direction, DoubleBufferedConfig, DoubleBufferedStream,
+    MasterStream, Stream, TargetAddress,
+};
 
 #[macro_use]
 mod macros;
@@ -110,10 +116,6 @@ pub mod bdma;
 pub mod mdma;
 
 pub mod traits;
-use traits::{
-    sealed::Bits, Direction, DoubleBufferedConfig, DoubleBufferedStream,
-    MasterStream, Stream, TargetAddress,
-};
 
 /// Errors.
 #[derive(PartialEq, Debug, Copy, Clone)]
@@ -757,8 +759,8 @@ macro_rules! db_transfer_def {
     };
 }
 
-db_transfer_def!(DBTransfer, init, StaticWriteBuffer, write_buffer, mut;);
-db_transfer_def!(ConstDBTransfer, init_const, StaticReadBuffer, read_buffer;
+db_transfer_def!(DBTransfer, init, WriteBuffer, write_buffer, mut;);
+db_transfer_def!(ConstDBTransfer, init_const, ReadBuffer, read_buffer;
                  assert!(DIR::direction() != DmaDirection::PeripheralToMemory));
 
 impl<STREAM, CONFIG, PERIPHERAL, DIR, BUF, TXFRT>
@@ -873,8 +875,8 @@ where
     STREAM: MasterStream + Stream<Config = mdma::MdmaConfig>,
     DIR: Direction,
     PERIPHERAL: TargetAddress<DIR>,
-    BUF: StaticWriteBuffer<Word = BUF_WORD>, // Buf can be sized independently
-                                             // from the peripheral
+    BUF: WriteBuffer<Word = BUF_WORD>, // Buf can be sized independently
+                                       // from the peripheral
 {
     /// For a given configuration, determine the size and offset for the source
     /// and destination