NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2313 from eZioPan/update-metapac6

Browse source 
match up with "DMA cleanup" metapac change
This commit is contained in:
Dario Nieuwenhuis 2023-12-19 15:20:15 +00:00 committed by GitHub
commit 7d9a76da00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
embassy-stm32/Cargo.toml
View file

@ -58,7 +58,7 @@ rand_core = "0.6.3"
sdio-host = "0.5.0" sdio-host = "0.5.0"
embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true }
critical-section = "1.1" critical-section = "1.1"
stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-91cee0d1fdcb4e447b65a09756b506f4af91b7e2" } stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-2234f380f51d16d0398b8e547088b33ea623cc7c" }
vcell = "0.1.3" vcell = "0.1.3"
bxcan = "0.7.0" bxcan = "0.7.0"
nb = "1.0.0" nb = "1.0.0"
@ -76,7 +76,7 @@ critical-section = { version = "1.1", features = ["std"] }
[build-dependencies] [build-dependencies]
proc-macro2 = "1.0.36" proc-macro2 = "1.0.36"
quote = "1.0.15" quote = "1.0.15"
stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-91cee0d1fdcb4e447b65a09756b506f4af91b7e2", default-features = false, features = ["metadata"]} stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-2234f380f51d16d0398b8e547088b33ea623cc7c", default-features = false, features = ["metadata"]}
[features] [features]

20
embassy-stm32/src/dma/bdma.rs
View file

@ -303,20 +303,14 @@ impl<'a, C: Channel> Transfer<'a, C> {
ch.cr().write(|w| { ch.cr().write(|w| {
w.set_psize(data_size.into()); w.set_psize(data_size.into());
w.set_msize(data_size.into()); w.set_msize(data_size.into());
if incr_mem { w.set_minc(incr_mem);
w.set_minc(vals::Inc::ENABLED);
} else {
w.set_minc(vals::Inc::DISABLED);
}
w.set_dir(dir.into()); w.set_dir(dir.into());
w.set_teie(true); w.set_teie(true);
w.set_tcie(options.complete_transfer_ir); w.set_tcie(options.complete_transfer_ir);
w.set_htie(options.half_transfer_ir); w.set_htie(options.half_transfer_ir);
w.set_circ(options.circular);
if options.circular { if options.circular {
w.set_circ(vals::Circ::ENABLED);
debug!("Setting circular mode"); debug!("Setting circular mode");
} else {
w.set_circ(vals::Circ::DISABLED);
} }
w.set_pl(vals::Pl::VERYHIGH); w.set_pl(vals::Pl::VERYHIGH);
w.set_en(true); w.set_en(true);
@ -352,7 +346,7 @@ impl<'a, C: Channel> Transfer<'a, C> {
pub fn is_running(&mut self) -> bool { pub fn is_running(&mut self) -> bool {
let ch = self.channel.regs().ch(self.channel.num()); let ch = self.channel.regs().ch(self.channel.num());
let en = ch.cr().read().en(); let en = ch.cr().read().en();
let circular = ch.cr().read().circ() == vals::Circ::ENABLED; let circular = ch.cr().read().circ();
let tcif = STATE.complete_count[self.channel.index()].load(Ordering::Acquire) != 0; let tcif = STATE.complete_count[self.channel.index()].load(Ordering::Acquire) != 0;
en && (circular || !tcif) en && (circular || !tcif)
} }
@ -467,12 +461,12 @@ impl<'a, C: Channel, W: Word> ReadableRingBuffer<'a, C, W> {
let mut w = regs::Cr(0); let mut w = regs::Cr(0);
w.set_psize(data_size.into()); w.set_psize(data_size.into());
w.set_msize(data_size.into()); w.set_msize(data_size.into());
w.set_minc(vals::Inc::ENABLED); w.set_minc(true);
w.set_dir(dir.into()); w.set_dir(dir.into());
w.set_teie(true); w.set_teie(true);
w.set_htie(true); w.set_htie(true);
w.set_tcie(true); w.set_tcie(true);
w.set_circ(vals::Circ::ENABLED); w.set_circ(true);
w.set_pl(vals::Pl::VERYHIGH); w.set_pl(vals::Pl::VERYHIGH);
w.set_en(true); w.set_en(true);
@ -625,12 +619,12 @@ impl<'a, C: Channel, W: Word> WritableRingBuffer<'a, C, W> {
let mut w = regs::Cr(0); let mut w = regs::Cr(0);
w.set_psize(data_size.into()); w.set_psize(data_size.into());
w.set_msize(data_size.into()); w.set_msize(data_size.into());
w.set_minc(vals::Inc::ENABLED); w.set_minc(true);
w.set_dir(dir.into()); w.set_dir(dir.into());
w.set_teie(true); w.set_teie(true);
w.set_htie(true); w.set_htie(true);
w.set_tcie(true); w.set_tcie(true);
w.set_circ(vals::Circ::ENABLED); w.set_circ(true);
w.set_pl(vals::Pl::VERYHIGH); w.set_pl(vals::Pl::VERYHIGH);
w.set_en(true); w.set_en(true);

27
embassy-stm32/src/dma/dma.rs
View file

@ -382,18 +382,13 @@ impl<'a, C: Channel> Transfer<'a, C> {
w.set_msize(data_size.into()); w.set_msize(data_size.into());
w.set_psize(data_size.into()); w.set_psize(data_size.into());
w.set_pl(vals::Pl::VERYHIGH); w.set_pl(vals::Pl::VERYHIGH);
w.set_minc(match incr_mem { w.set_minc(incr_mem);
true => vals::Inc::INCREMENTED, w.set_pinc(false);
false => vals::Inc::FIXED,
});
w.set_pinc(vals::Inc::FIXED);
w.set_teie(true); w.set_teie(true);
w.set_tcie(options.complete_transfer_ir); w.set_tcie(options.complete_transfer_ir);
w.set_circ(options.circular);
if options.circular { if options.circular {
w.set_circ(vals::Circ::ENABLED);
debug!("Setting circular mode"); debug!("Setting circular mode");
} else {
w.set_circ(vals::Circ::DISABLED);
} }
#[cfg(dma_v1)] #[cfg(dma_v1)]
w.set_trbuff(true); w.set_trbuff(true);
@ -545,8 +540,8 @@ impl<'a, C: Channel, W: Word> DoubleBuffered<'a, C, W> {
w.set_msize(data_size.into()); w.set_msize(data_size.into());
w.set_psize(data_size.into()); w.set_psize(data_size.into());
w.set_pl(vals::Pl::VERYHIGH); w.set_pl(vals::Pl::VERYHIGH);
w.set_minc(vals::Inc::INCREMENTED); w.set_minc(true);
w.set_pinc(vals::Inc::FIXED); w.set_pinc(false);
w.set_teie(true); w.set_teie(true);
w.set_tcie(true); w.set_tcie(true);
#[cfg(dma_v1)] #[cfg(dma_v1)]
@ -703,12 +698,12 @@ impl<'a, C: Channel, W: Word> ReadableRingBuffer<'a, C, W> {
w.set_msize(data_size.into()); w.set_msize(data_size.into());
w.set_psize(data_size.into()); w.set_psize(data_size.into());
w.set_pl(vals::Pl::VERYHIGH); w.set_pl(vals::Pl::VERYHIGH);
w.set_minc(vals::Inc::INCREMENTED); w.set_minc(true);
w.set_pinc(vals::Inc::FIXED); w.set_pinc(false);
w.set_teie(true); w.set_teie(true);
w.set_htie(options.half_transfer_ir); w.set_htie(options.half_transfer_ir);
w.set_tcie(true); w.set_tcie(true);
w.set_circ(vals::Circ::ENABLED); w.set_circ(true);
#[cfg(dma_v1)] #[cfg(dma_v1)]
w.set_trbuff(true); w.set_trbuff(true);
#[cfg(dma_v2)] #[cfg(dma_v2)]
@ -878,12 +873,12 @@ impl<'a, C: Channel, W: Word> WritableRingBuffer<'a, C, W> {
w.set_msize(data_size.into()); w.set_msize(data_size.into());
w.set_psize(data_size.into()); w.set_psize(data_size.into());
w.set_pl(vals::Pl::VERYHIGH); w.set_pl(vals::Pl::VERYHIGH);
w.set_minc(vals::Inc::INCREMENTED); w.set_minc(true);
w.set_pinc(vals::Inc::FIXED); w.set_pinc(false);
w.set_teie(true); w.set_teie(true);
w.set_htie(options.half_transfer_ir); w.set_htie(options.half_transfer_ir);
w.set_tcie(true); w.set_tcie(true);
w.set_circ(vals::Circ::ENABLED); w.set_circ(true);
#[cfg(dma_v1)] #[cfg(dma_v1)]
w.set_trbuff(true); w.set_trbuff(true);
#[cfg(dma_v2)] #[cfg(dma_v2)]