metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

refactor(cleanup): 📦 Clean up MiniUART code

This commit is contained in:
Berkus Decker 2023-07-31 21:28:09 +03:00 committed by Berkus Decker
parent d0e4334afe
commit 77d04d3d67
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
machine/src/platform/rpi3/device_driver/mini_uart.rs
View File

@ -184,9 +184,7 @@ impl crate::drivers::interface::DeviceDriver for MiniUart {
impl MiniUart { impl MiniUart {
pub const COMPATIBLE: &'static str = "BCM MINI UART"; pub const COMPATIBLE: &'static str = "BCM MINI UART";
}
impl MiniUart {
/// Create an instance. /// Create an instance.
/// ///
/// # Safety /// # Safety
@ -226,9 +224,7 @@ impl MiniUartInner {
registers: Registers::new(base_addr), registers: Registers::new(base_addr),
} }
} }
}
impl MiniUartInner {
/// Set baud rate and characteristics (115200 8N1) and map to GPIO /// Set baud rate and characteristics (115200 8N1) and map to GPIO
pub fn prepare(&self) -> Result<(), &'static str> { pub fn prepare(&self) -> Result<(), &'static str> {
use tock_registers::interfaces::Writeable; use tock_registers::interfaces::Writeable;
@ -256,6 +252,11 @@ impl MiniUartInner {
Ok(()) Ok(())
} }
fn flush_internal(&self) {
use tock_registers::interfaces::Readable;
crate::arch::loop_until(|| self.registers.AUX_MU_STAT.is_set(AUX_MU_STAT::TX_DONE));
}
} }
impl Drop for MiniUartInner { impl Drop for MiniUartInner {
@ -298,8 +299,7 @@ impl SerialOps for MiniUartInner {
/// Wait until the TX FIFO is empty, aka all characters have been put on the /// Wait until the TX FIFO is empty, aka all characters have been put on the
/// line. /// line.
fn flush(&self) { fn flush(&self) {
use tock_registers::interfaces::Readable; self.flush_internal();
crate::arch::loop_until(|| self.registers.AUX_MU_STAT.is_set(AUX_MU_STAT::TX_DONE));
} }
/// Consume input until RX FIFO is empty, aka all pending characters have been /// Consume input until RX FIFO is empty, aka all pending characters have been