Skip to content

Commit 3e60d1d

Browse files
committed
UART embedded-io fixes
1 parent 3bc2ee4 commit 3e60d1d

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

va108xx-hal/src/uart/mod.rs

+17-1
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,15 @@ impl<Uart: Instance> embedded_hal_nb::serial::Read<u8> for Rx<Uart> {
892892

893893
impl<Uart: Instance> embedded_io::Read for Rx<Uart> {
894894
fn read(&mut self, buf: &mut [u8]) -> Result<usize, Self::Error> {
895+
if buf.is_empty() {
896+
return Ok(0);
897+
}
895898
let mut read = 0;
899+
loop {
900+
if self.0.rxstatus().read().rdavl().bit_is_set() {
901+
break;
902+
}
903+
}
896904
for byte in buf.iter_mut() {
897905
match <Self as embedded_hal_nb::serial::Read<u8>>::read(self) {
898906
Ok(w) => {
@@ -1058,6 +1066,14 @@ impl<Uart: Instance> embedded_hal_nb::serial::Write<u8> for Tx<Uart> {
10581066

10591067
impl<Uart: Instance> embedded_io::Write for Tx<Uart> {
10601068
fn write(&mut self, buf: &[u8]) -> Result<usize, Self::Error> {
1069+
if buf.is_empty() {
1070+
return Ok(0);
1071+
}
1072+
loop {
1073+
if self.0.txstatus().read().wrrdy().bit_is_set() {
1074+
break;
1075+
}
1076+
}
10611077
let mut written = 0;
10621078
for byte in buf.iter() {
10631079
match <Self as embedded_hal_nb::serial::Write<u8>>::write(self, *byte) {
@@ -1066,7 +1082,7 @@ impl<Uart: Instance> embedded_io::Write for Tx<Uart> {
10661082
}
10671083
}
10681084

1069-
Ok(buf.len())
1085+
Ok(written)
10701086
}
10711087

10721088
fn flush(&mut self) -> Result<(), Self::Error> {

0 commit comments

Comments
 (0)