max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rp/uart: extract fifo draining from blocking_read

Browse Source 
this will also be needed for dma operations.
This commit is contained in:
pennae 2023-04-30 11:30:55 +02:00
parent be66e0f7ce
commit 1d5adb8974
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
embassy-rp/src/uart/mod.rs
View File

@ -238,16 +238,22 @@ impl<'d, T: Instance, M: Mode> UartRx<'d, T, M> {
}
}
pub fn blocking_read(&mut self, buffer: &mut [u8]) -> Result<(), Error> {
let r = T::regs();
unsafe {
for b in buffer {
*b = loop {
if r.uartfr().read().rxfe() {
continue;
pub fn blocking_read(&mut self, mut buffer: &mut [u8]) -> Result<(), Error> {
while buffer.len() > 0 {
let received = self.drain_fifo(buffer)?;
buffer = &mut buffer[received..];
}
Ok(())
}
let dr = r.uartdr().read();
fn drain_fifo(&mut self, buffer: &mut [u8]) -> Result<usize, Error> {
let r = T::regs();
for (i, b) in buffer.iter_mut().enumerate() {
if unsafe { r.uartfr().read().rxfe() } {
return Ok(i);
}
let dr = unsafe { r.uartdr().read() };
if dr.oe() {
return Err(Error::Overrun);
@ -258,12 +264,10 @@ impl<'d, T: Instance, M: Mode> UartRx<'d, T, M> {
} else if dr.fe() {
return Err(Error::Framing);
} else {
break dr.data();
}
};
*b = dr.data();
}
}
Ok(())
Ok(buffer.len())
}
}