From 8aa2d7ab2a4c61c186e649711da75e1d542527ff Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Tue, 23 Jul 2024 19:59:01 +0000 Subject: [PATCH] devices: use byte strings directly Signed-off-by: Wei Liu --- devices/src/legacy/serial.rs | 23 ++++++++++------------- devices/src/legacy/uart_pl011.rs | 15 ++++++--------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/devices/src/legacy/serial.rs b/devices/src/legacy/serial.rs index a46a89578..f97b93f66 100644 --- a/devices/src/legacy/serial.rs +++ b/devices/src/legacy/serial.rs @@ -411,14 +411,11 @@ mod tests { None, ); - serial.write(0, DATA as u64, &[b'x', b'y']); - serial.write(0, DATA as u64, &[b'a']); - serial.write(0, DATA as u64, &[b'b']); - serial.write(0, DATA as u64, &[b'c']); - assert_eq!( - serial_out.buf.lock().unwrap().as_slice(), - &[b'a', b'b', b'c'] - ); + serial.write(0, DATA as u64, b"xy"); + serial.write(0, DATA as u64, b"a"); + serial.write(0, DATA as u64, b"b"); + serial.write(0, DATA as u64, b"c"); + assert_eq!(serial_out.buf.lock().unwrap().as_slice(), b"abc"); } #[test] @@ -436,7 +433,7 @@ mod tests { // counter doesn't change (for 0 it blocks) assert!(intr_evt.write(1).is_ok()); serial.write(0, IER as u64, &[IER_RECV_BIT]); - serial.queue_input_bytes(&[b'a', b'b', b'c']).unwrap(); + serial.queue_input_bytes(b"abc").unwrap(); assert_eq!(intr_evt.read().unwrap(), 2); @@ -473,7 +470,7 @@ mod tests { // counter doesn't change (for 0 it blocks) assert!(intr_evt.write(1).is_ok()); serial.write(0, IER as u64, &[IER_THR_BIT]); - serial.write(0, DATA as u64, &[b'a']); + serial.write(0, DATA as u64, b"a"); assert_eq!(intr_evt.read().unwrap(), 2); let mut data = [0u8]; @@ -515,9 +512,9 @@ mod tests { ); serial.write(0, MCR as u64, &[MCR_LOOP_BIT]); - serial.write(0, DATA as u64, &[b'a']); - serial.write(0, DATA as u64, &[b'b']); - serial.write(0, DATA as u64, &[b'c']); + serial.write(0, DATA as u64, b"a"); + serial.write(0, DATA as u64, b"b"); + serial.write(0, DATA as u64, b"c"); let mut data = [0u8]; serial.read(0, MSR as u64, &mut data[..]); diff --git a/devices/src/legacy/uart_pl011.rs b/devices/src/legacy/uart_pl011.rs index 7f26cfd4f..d2c4a8f80 100644 --- a/devices/src/legacy/uart_pl011.rs +++ b/devices/src/legacy/uart_pl011.rs @@ -524,14 +524,11 @@ mod tests { None, ); - pl011.write(0, UARTDR, &[b'x', b'y']); - pl011.write(0, UARTDR, &[b'a']); - pl011.write(0, UARTDR, &[b'b']); - pl011.write(0, UARTDR, &[b'c']); - assert_eq!( - pl011_out.buf.lock().unwrap().as_slice(), - &[b'x', b'a', b'b', b'c'] - ); + pl011.write(0, UARTDR, b"xy"); + pl011.write(0, UARTDR, b"a"); + pl011.write(0, UARTDR, b"b"); + pl011.write(0, UARTDR, b"c"); + assert_eq!(pl011_out.buf.lock().unwrap().as_slice(), b"xabc"); } #[test] @@ -549,7 +546,7 @@ mod tests { // write 1 to the interrupt event fd, so that read doesn't block in case the event fd // counter doesn't change (for 0 it blocks) assert!(intr_evt.write(1).is_ok()); - pl011.queue_input_bytes(&[b'a', b'b', b'c']).unwrap(); + pl011.queue_input_bytes(b"abc").unwrap(); assert_eq!(intr_evt.read().unwrap(), 2);