Skip to content

Commit d06ed4d

Browse files
committed
Change to embedded-dma
1 parent 9365f12 commit d06ed4d

File tree

4 files changed

+5
-254
lines changed

4 files changed

+5
-254
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1717
- [breaking-change] Changed sdio::{read, write}_block buf argument to &[u8; 512].
1818
- Voltage regulator overdrive is enabled where supported and required for selected HCLK.
1919
- I2C driver updated to detect and clear all error condition flags.
20+
- Allow for skipping an ongoing DMA transfer if not using double buffering.
21+
- Change DMA traits to `embedded-dma`.
2022

2123
### Added
2224

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ rand_core = "0.5.1"
3333
stm32f4 = "0.11"
3434
synopsys-usb-otg = { version = "0.2.0", features = ["cortex-m"], optional = true }
3535
sdio-host = { version = "0.5.0", optional = true }
36-
stable_deref_trait = { version = "1.2.0", default-features = false }
36+
embedded-dma = "0.1.0"
3737

3838
[dependencies.bare-metal]
3939
version = "0.2.5"

src/dma/buffer.rs

Lines changed: 0 additions & 250 deletions
This file was deleted.

src/dma/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ use core::{
1515
ptr,
1616
sync::atomic::{compiler_fence, Ordering},
1717
};
18+
use embedded_dma::WriteBuffer;
1819

19-
pub mod buffer;
2020
pub mod traits;
21-
use buffer::WriteBuffer;
2221
use traits::{
2322
sealed::{Bits, Sealed},
2423
Channel, DMASet, Direction, Instance, PeriAddress, RccEnable, Stream,
@@ -1072,7 +1071,7 @@ where
10721071
self.stream.disable();
10731072
self.stream.clear_transfer_complete_interrupt();
10741073

1075-
// "Subsequent reads and writes cannot be moved ahead of preceding reads."
1074+
// "No re-ordering of reads and writes across this point is allowed"
10761075
compiler_fence(Ordering::SeqCst);
10771076

10781077
// NOTE(unsafe) We now own this buffer and we won't call any &mut methods on it until

0 commit comments

Comments
 (0)