itsscb/embassy
1
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2025-10-02 14:44:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: use register wrappers instead of u32 for LinearItem

Browse Source 
Since the register structs are no-field structs with
`repr(transparent)`, we can use them in the LinearItem with `repr(C)`.
This allows the user to call the convenient named setter functions for
the registers instead of manually changing the bits of the u32.
This commit is contained in:
etiennecollin 2025-08-25 21:10:59 +02:00 committed by Dario Nieuwenhuis
parent 50e2e2ec60
commit 47bb14514f
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
embassy-stm32/src/dma/gpdma/linked_list.rs
View File

@ -25,17 +25,17 @@ pub enum RunMode {
#[repr(C)] #[repr(C)]
pub struct LinearItem { pub struct LinearItem {
/// Transfer register 1. /// Transfer register 1.
pub tr1: u32, pub tr1: regs::ChTr1,
/// Transfer register 2. /// Transfer register 2.
pub tr2: u32, pub tr2: regs::ChTr2,
/// Block register 2. /// Block register 2.
pub br1: u32, pub br1: regs::ChBr1,
/// Source address register. /// Source address register.
pub sar: u32, pub sar: u32,
/// Destination address register. /// Destination address register.
pub dar: u32, pub dar: u32,
/// Linked-list address register. /// Linked-list address register.
pub llr: u32, pub llr: regs::ChLlr,
} }
impl LinearItem { impl LinearItem {
@ -106,12 +106,12 @@ impl LinearItem {
let llr = regs::ChLlr(0); let llr = regs::ChLlr(0);
Self { Self {
tr1: tr1.0, tr1,
tr2: tr2.0, tr2,
br1: br1.0, br1,
sar, sar,
dar, dar,
llr: llr.0, llr,
} }
} }
@ -131,23 +131,20 @@ impl LinearItem {
// Lower two bits are ignored: 32 bit aligned. // Lower two bits are ignored: 32 bit aligned.
llr.set_la(next >> 2); llr.set_la(next >> 2);
self.llr = llr.0; self.llr = llr;
} }
/// Unlink the next linear item. /// Unlink the next linear item.
/// ///
/// Disables channel update bits. /// Disables channel update bits.
fn unlink(&mut self) { fn unlink(&mut self) {
self.llr = regs::ChLlr(0).0; self.llr = regs::ChLlr(0);
} }
/// The item's transfer count in number of words. /// The item's transfer count in number of words.
fn transfer_count(&self) -> usize { fn transfer_count(&self) -> usize {
let br1 = regs::ChBr1(self.br1); let word_size: WordSize = self.tr1.ddw().into();
let tr1 = regs::ChTr1(self.tr1); self.br1.bndt() as usize / word_size.bytes()
let word_size: WordSize = tr1.ddw().into();
br1.bndt() as usize / word_size.bytes()
} }
} }