rename

Author: ZR233

Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
-members = ["dtb-early-console", "hello"]
+members = ["any-uart", "hello"]
 resolver = "3"

README.md

@@ -1,4 +1,4 @@
-# DTB Early console
+# Any Uart
 
 [![Check, Build and Test](https://github.com/rcore-os/dtb-earyly-console/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/rcore-os/dtb-earyly-console/actions/workflows/ci.yml)
 
@@ -25,7 +25,7 @@ fn phys_to_virt(addr: usize) -> *mut u8 {
     addr as *mut u8
 }
 
-if let Some((mut tx, _rx)) = dtb_early_console::init(NonNull::new(dtb_addr).unwrap(), phys_to_virt) {
+if let Some((mut tx, _rx)) = any_uart::init(NonNull::new(dtb_addr).unwrap(), phys_to_virt) {
     let _ = tx.write_str_blocking("Hello, world!\n");
 }
 ```

dtb-early-console/Cargo.toml any-uart/Cargo.tomldtb-early-console/Cargo.toml renamed to any-uart/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
-name = "dtb-early-console"
+name = "any-uart"
 version = "0.1.0"
 edition = "2024"
 authors = ["周睿 <zrufo747@outlook.com>"]
 description = "Init early console from device tree, mostly for Arm"
 keywords = ["pl011", "no-std", "earlycon", "dtb", "arm"]
 license = "MIT"
 categories = ["no-std", "embedded", "hardware-support"]
-repository = "https://github.com/rcore-os/dtb-earyly-console"
+repository = "https://github.com/rcore-os/any-uart"
 readme = "../README.md"
 
 [dependencies]

dtb-early-console/src/aux_mini.rs any-uart/src/aux_mini.rsdtb-early-console/src/aux_mini.rs renamed to any-uart/src/aux_mini.rs

@@ -75,17 +75,25 @@ pub fn init(fdt_addr: NonNull<u8>, fn_phys_to_virt: FnPhysToVirt) -> Option<(Sen
 pub(crate) struct UartData {
     pub base: usize,
     pub io_kind: IoKind,
-    pub phys_to_virt: FnPhysToVirt,
 }
 
 impl UartData {
+    fn new(base: u64, io_kind: IoKind, f: FnPhysToVirt) -> Self {
+        let mmio = f(base as _);
+
+        Self {
+            base: mmio as _,
+            io_kind,
+        }
+    }
+
     pub fn reg_u8(&self, offset: usize) -> *mut u8 {
         self.reg(offset)
     }
 
     pub fn reg<T: Sized>(&self, offset: usize) -> *mut T {
         unsafe {
-            let ptr = (self.phys_to_virt)(self.base) as *mut T;
+            let ptr = self.base as *mut T;
             ptr.add(offset)
         }
     }
@@ -95,12 +103,7 @@ fn fdt_stdout(chosen: &Chosen<'_>, f: FnPhysToVirt) -> Option<(Sender, Receiver)
     let stdout = chosen.stdout()?;
     let reg = stdout.node.reg()?.next()?;
     let io_kind = IoKind::Mmio32;
-    let mmio = reg.address as usize;
-    let uart = UartData {
-        base: mmio,
-        io_kind,
-        phys_to_virt: f,
-    };
+    let uart = UartData::new(reg.address, io_kind, f);
 
     for c in stdout.node.compatibles() {
         macro_rules! of_uart {
@@ -189,12 +192,8 @@ fn fdt_bootargs(chosen: &Chosen<'_>, f: FnPhysToVirt) -> Option<(Sender, Receive
         IoKind::from(param2)
     };
 
-    let mmio = u64::from_str_radix(addr_str.trim_start_matches("0x"), 16).ok()? as usize;
-    let uart = UartData {
-        base: mmio,
-        io_kind,
-        phys_to_virt: f,
-    };
+    let mmio = u64::from_str_radix(addr_str.trim_start_matches("0x"), 16).ok()?;
+    let uart = UartData::new(mmio, io_kind, f);
 
     if name.contains("8250") || name.contains("16550") {
         return Some(Ns16550::to_uart(uart));

dtb-early-console/src/lib.rs any-uart/src/lib.rsdtb-early-console/src/lib.rs renamed to any-uart/src/lib.rs

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-dtb-early-console = { path = "../dtb-early-console" }
+any-uart = { path = "../any-uart" }
 fdt-parser = "0.4"
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]

dtb-early-console/src/ns16550.rs any-uart/src/ns16550.rsdtb-early-console/src/ns16550.rs renamed to any-uart/src/ns16550.rs

@@ -79,7 +79,7 @@ fn rust_entry(_text_va: usize, fdt: *mut u8) -> ! {
     clean_bss();
     enable_fp();
 
-    if let Some((mut tx, _rx)) = dtb_early_console::init(NonNull::new(fdt).unwrap(), phys_to_virt) {
+    if let Some((mut tx, _rx)) = any_uart::init(NonNull::new(fdt).unwrap(), phys_to_virt) {
         let _ = tx.write_str_blocking("Hello, world!\n");
 
         let _ = tx.write_str_blocking("All tests passed!\n");