A little more cleanup

This commit is contained in:
James Munns 2023-12-20 14:17:24 +01:00
parent 032744ab6a
commit 04b5e60e08

View File

@ -251,13 +251,16 @@ impl<'d, T: Instance, M: Mode> UartRx<'d, T, M> {
} }
pub fn blocking_read(&mut self, mut buffer: &mut [u8]) -> Result<(), Error> { pub fn blocking_read(&mut self, mut buffer: &mut [u8]) -> Result<(), Error> {
while buffer.len() > 0 { while !buffer.is_empty() {
let received = self.drain_fifo(buffer).map_err(|(_i, e)| e)?; let received = self.drain_fifo(buffer).map_err(|(_i, e)| e)?;
buffer = &mut buffer[received..]; buffer = &mut buffer[received..];
} }
Ok(()) Ok(())
} }
/// Returns Ok(len) if no errors occurred. Returns Err((len, err)) if an error was
/// encountered. in both cases, `len` is the number of *good* bytes copied into
/// `buffer`.
fn drain_fifo(&mut self, buffer: &mut [u8]) -> Result<usize, (usize, Error)> { fn drain_fifo(&mut self, buffer: &mut [u8]) -> Result<usize, (usize, Error)> {
let r = T::regs(); let r = T::regs();
for (i, b) in buffer.iter_mut().enumerate() { for (i, b) in buffer.iter_mut().enumerate() {