nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-21 22:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

make len method take mut self and remove sync index calls

Browse Source
This commit is contained in:
Alexandros Liarokapis 2024-09-23 16:50:26 +03:00
parent 85fb890b00
commit 8271225216
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
embassy-stm32/src/dma/ringbuffer/mod.rs
View File

@ -99,7 +99,10 @@ impl<'a, W: Word> ReadableDmaRingBuffer<'a, W> {
} }
/// Get the available readable dma samples. /// Get the available readable dma samples.
pub fn len(&self) -> Result<usize, OverrunError> { pub fn len(&mut self, dma: &mut impl DmaCtrl) -> Result<usize, OverrunError> {
self.write_index.dma_sync(self.cap(), dma);
DmaIndex::normalize(&mut self.write_index, &mut self.read_index);
let diff: usize = self.write_index.diff(self.cap(), &self.read_index).try_into().unwrap(); let diff: usize = self.write_index.diff(self.cap(), &self.read_index).try_into().unwrap();
if diff > self.cap() { if diff > self.cap() {
@ -155,13 +158,11 @@ impl<'a, W: Word> ReadableDmaRingBuffer<'a, W> {
} }
fn read_raw(&mut self, dma: &mut impl DmaCtrl, buf: &mut [W]) -> Result<(usize, usize), OverrunError> { fn read_raw(&mut self, dma: &mut impl DmaCtrl, buf: &mut [W]) -> Result<(usize, usize), OverrunError> {
self.sync_write_index(dma); let readable = self.len(dma)?.min(buf.len());
let readable = self.len()?.min(buf.len());
for i in 0..readable { for i in 0..readable {
buf[i] = self.read_buf(i); buf[i] = self.read_buf(i);
} }
self.sync_write_index(dma); let available = self.len(dma)?;
let available = self.len()?;
self.read_index.advance(self.cap(), readable); self.read_index.advance(self.cap(), readable);
Ok((readable, available - readable)) Ok((readable, available - readable))
} }
@ -175,11 +176,6 @@ impl<'a, W: Word> ReadableDmaRingBuffer<'a, W> {
) )
} }
} }
fn sync_write_index(&mut self, dma: &mut impl DmaCtrl) {
self.write_index.dma_sync(self.cap(), dma);
DmaIndex::normalize(&mut self.write_index, &mut self.read_index);
}
} }
pub struct WritableDmaRingBuffer<'a, W: Word> { pub struct WritableDmaRingBuffer<'a, W: Word> {
@ -212,7 +208,10 @@ impl<'a, W: Word> WritableDmaRingBuffer<'a, W> {
} }
/// Get the remaining writable dma samples. /// Get the remaining writable dma samples.
pub fn len(&self) -> Result<usize, OverrunError> { pub fn len(&mut self, dma: &mut impl DmaCtrl) -> Result<usize, OverrunError> {
self.read_index.dma_sync(self.cap(), dma);
DmaIndex::normalize(&mut self.read_index, &mut self.write_index);
let diff = self.write_index.diff(self.cap(), &self.read_index); let diff = self.write_index.diff(self.cap(), &self.read_index);
if diff < 0 { if diff < 0 {
@ -271,13 +270,11 @@ impl<'a, W: Word> WritableDmaRingBuffer<'a, W> {
} }
pub fn write_raw(&mut self, dma: &mut impl DmaCtrl, buf: &[W]) -> Result<(usize, usize), OverrunError> { pub fn write_raw(&mut self, dma: &mut impl DmaCtrl, buf: &[W]) -> Result<(usize, usize), OverrunError> {
self.sync_read_index(dma); let writable = self.len(dma)?.min(buf.len());
let writable = self.len()?.min(buf.len());
for i in 0..writable { for i in 0..writable {
self.write_buf(i, buf[i]); self.write_buf(i, buf[i]);
} }
self.sync_read_index(dma); let available = self.len(dma)?;
let available = self.len()?;
self.write_index.advance(self.cap(), writable); self.write_index.advance(self.cap(), writable);
Ok((writable, available - writable)) Ok((writable, available - writable))
} }
@ -292,11 +289,6 @@ impl<'a, W: Word> WritableDmaRingBuffer<'a, W> {
) )
} }
} }
fn sync_read_index(&mut self, dma: &mut impl DmaCtrl) {
self.read_index.dma_sync(self.cap(), dma);
DmaIndex::normalize(&mut self.read_index, &mut self.write_index);
}
} }
#[cfg(test)] #[cfg(test)]