deps: bump uart_16550 to 0.6.0 + streamline as workspace dep

Author: phip1611

Cargo.lock

@@ -19,6 +19,7 @@ members = [
     "tests/runner",
 ]
 exclude = ["examples/basic", "examples/test_framework", "tests/test_kernels/*"]
+resolver = "3"
 
 [workspace.package]
 # don't forget to update `workspace.dependencies` below
@@ -31,6 +32,7 @@ bootloader_api = { version = "0.11.15", path = "api" }
 bootloader-x86_64-common = { version = "0.11.15", path = "common" }
 bootloader-boot-config = { version = "0.11.15", path = "common/config" }
 bootloader-x86_64-bios-common = { version = "0.11.15", path = "bios/common" }
+uart_16550 = "0.6.0"
 
 [features]
 default = ["bios", "uefi"]

Cargo.toml

@@ -19,7 +19,7 @@ xmas-elf = "0.8.0"
 raw-cpuid = "10.2.0"
 rand = { version = "0.8.6", default-features = false }
 rand_hc = "0.3.1"
-uart_16550 = "0.3.2"
+uart_16550.workspace = true
 log = "0.4.17"
 
 [dependencies.noto-sans-mono-bitmap]

common/Cargo.toml

@@ -1,16 +1,19 @@
 use core::fmt;
+use uart_16550::backend::PioBackend;
 
 pub struct SerialPort {
-    port: uart_16550::SerialPort,
+    port: uart_16550::Uart16550<PioBackend>,
 }
 
 impl SerialPort {
     /// # Safety
     ///
     /// unsafe because this function must only be called once
     pub unsafe fn init() -> Self {
-        let mut port = unsafe { uart_16550::SerialPort::new(0x3F8) };
-        port.init();
+        let mut port =
+            unsafe { uart_16550::Uart16550::new_port(0x3F8) }.expect("should be valid port");
+        port.init(uart_16550::Config::default())
+            .expect("should init successfully");
         Self { port }
     }
 }
@@ -19,8 +22,8 @@ impl fmt::Write for SerialPort {
     fn write_str(&mut self, s: &str) -> fmt::Result {
         for char in s.bytes() {
             match char {
-                b'\n' => self.port.write_str("\r\n").unwrap(),
-                byte => self.port.send(byte),
+                b'\n' => self.port.send_bytes_exact(b"\r\n"),
+                byte => self.port.send_bytes_exact(&[byte]),
             }
         }
         Ok(())

common/src/serial.rs

@@ -5,5 +5,5 @@ edition = "2024"
 
 [dependencies]
 bootloader_api = "0.11.12"
-uart_16550 = "0.4.0"
+uart_16550.workspace = true
 x86_64 = "0.15.2"

examples/basic/kernel/Cargo.toml

@@ -9,4 +9,4 @@ bootloader_api = { path = "../../../api" }
 x86_64 = { version = "0.15.2", default-features = false, features = [
     "instructions",
 ] }
-uart_16550 = "0.2.10"
+uart_16550 = { version = "0.6.0" }

tests/test_kernels/config_file/Cargo.toml

@@ -1,5 +1,8 @@
 #![no_std]
 
+use uart_16550::backend::PioBackend;
+use uart_16550::{Config, Uart16550Tty};
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[repr(u32)]
 pub enum QemuExitCode {
@@ -20,8 +23,7 @@ pub fn exit_qemu(exit_code: QemuExitCode) -> ! {
     }
 }
 
-pub fn serial() -> uart_16550::SerialPort {
-    let mut port = unsafe { uart_16550::SerialPort::new(0x3F8) };
-    port.init();
-    port
+pub fn serial() -> Uart16550Tty<PioBackend> {
+    unsafe { Uart16550Tty::new_port(0x3F8, Config::default()) }
+        .expect("should initialize serial device from valid config and valid port")
 }

tests/test_kernels/config_file/src/lib.rs

@@ -9,4 +9,4 @@ bootloader_api = { path = "../../../api" }
 x86_64 = { version = "0.15.2", default-features = false, features = [
     "instructions",
 ] }
-uart_16550 = "0.2.10"
+uart_16550 = { version = "0.6.0" }

tests/test_kernels/default_settings/Cargo.toml

@@ -1,5 +1,8 @@
 #![no_std]
 
+use uart_16550::backend::PioBackend;
+use uart_16550::{Config, Uart16550Tty};
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[repr(u32)]
 pub enum QemuExitCode {
@@ -20,8 +23,7 @@ pub fn exit_qemu(exit_code: QemuExitCode) -> ! {
     }
 }
 
-pub fn serial() -> uart_16550::SerialPort {
-    let mut port = unsafe { uart_16550::SerialPort::new(0x3F8) };
-    port.init();
-    port
+pub fn serial() -> Uart16550Tty<PioBackend> {
+    unsafe { Uart16550Tty::new_port(0x3F8, Config::default()) }
+        .expect("should initialize serial device from valid config and valid port")
 }

tests/test_kernels/default_settings/src/lib.rs

@@ -8,4 +8,4 @@ bootloader_api = { path = "../../../api" }
 x86_64 = { version = "0.15.2", default-features = false, features = [
     "instructions",
 ] }
-uart_16550 = "0.2.10"
+uart_16550 = { version = "0.6.0" }