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

stm32/dma: fix condition check

Browse source
This commit is contained in:
xoviat 2023-07-30 20:22:14 -05:00
parent c38c85ef1f
commit ffa0c08140
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
embassy-stm32/src/dma/ringbuffer.rs
View file

@ -230,9 +230,10 @@ impl<'a, W: Word> WritableDmaRingBuffer<'a, W> {
let start = self.pos(dma.get_remaining_transfers()); let start = self.pos(dma.get_remaining_transfers());
if start > self.end { if start > self.end {
trace!( trace!(
"[1]: start, end, complete_count: {}, {}, {}", "[1]: start, end, len, complete_count: {}, {}, {}, {}",
start, start,
self.end, self.end,
buf.len(),
dma.get_complete_count() dma.get_complete_count()
); );
@ -242,8 +243,9 @@ impl<'a, W: Word> WritableDmaRingBuffer<'a, W> {
compiler_fence(Ordering::SeqCst); compiler_fence(Ordering::SeqCst);
// Confirm that the DMA is not inside data we could have written // Confirm that the DMA is not inside data we could have written
let pos = self.pos(dma.get_remaining_transfers()); let (pos, complete_count) =
if (pos > self.end && pos <= start) || dma.get_complete_count() > 0 { critical_section::with(|_| (self.pos(dma.get_remaining_transfers()), dma.get_complete_count()));
if (pos >= self.end && pos < start) || (complete_count > 0 && pos >= start) || complete_count > 1 {
Err(OverrunError) Err(OverrunError)
} else { } else {
self.end = (self.end + len) % self.cap(); self.end = (self.end + len) % self.cap();
@ -252,18 +254,20 @@ impl<'a, W: Word> WritableDmaRingBuffer<'a, W> {
} }
} else if start == self.end && dma.get_complete_count() == 0 { } else if start == self.end && dma.get_complete_count() == 0 {
trace!( trace!(
"[2]: start, end, complete_count: {}, {}, {}", "[2]: start, end, len, complete_count: {}, {}, {}, {}",
start, start,
self.end, self.end,
buf.len(),
dma.get_complete_count() dma.get_complete_count()
); );
Ok((0, 0)) Ok((0, 0))
} else if start <= self.end && self.end + buf.len() < self.cap() { } else if start <= self.end && self.end + buf.len() < self.cap() {
trace!( trace!(
"[3]: start, end, complete_count: {}, {}, {}", "[3]: start, end, len, complete_count: {}, {}, {}, {}",
start, start,
self.end, self.end,
buf.len(),
dma.get_complete_count() dma.get_complete_count()
); );
@ -286,9 +290,10 @@ impl<'a, W: Word> WritableDmaRingBuffer<'a, W> {
} }
} else { } else {
trace!( trace!(
"[4]: start, end, complete_count: {}, {}, {}", "[4]: start, end, len, complete_count: {}, {}, {}, {}",
start, start,
self.end, self.end,
buf.len(),
dma.get_complete_count() dma.get_complete_count()
); );