add new

Author: ZR233

any-uart/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "any-uart"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2024"
 authors = ["周睿 <[email protected]>"]
 description = "Init early console from device tree, mostly for Arm"
@@ -18,3 +18,4 @@ alloc = []
 fdt-parser = "0.4"
 embedded-hal-nb = "1.0"
 bitflags = "2.8"
+link-boot = "0.2"

any-uart/src/lib.rs

@@ -16,7 +16,8 @@ pub use embedded_hal_nb::nb::block;
 pub use embedded_hal_nb::serial::ErrorKind;
 
 use aux_mini::AuxMini;
-use fdt_parser::{Chosen, Fdt, Node};
+pub use fdt_parser::Node;
+use fdt_parser::{Chosen, Fdt};
 use ns16550::Ns16550;
 use pl011::Pl011;
 
@@ -35,7 +36,7 @@ pub struct Uart {
 }
 
 impl Uart {
-    fn new<C: Console>(data: UartData) -> Self {
+    fn _new<C: Console>(data: UartData) -> Self {
         let op = C::to_op();
 
         Self {
@@ -46,6 +47,33 @@ impl Uart {
         }
     }
 
+    pub fn new_by_fdt_node(node: &Node<'_>, f: FnPhysToVirt) -> Option<Self> {
+        let reg = node.reg()?.next()?;
+
+        let io_kind = IoKind::Mmio32;
+
+        // TODO: support io kind detect
+
+        let uart = UartData::new(reg.address, io_kind, f);
+
+        for c in node.compatibles() {
+            macro_rules! of_uart {
+                ($name:ty, $compatible:expr) => {
+                    for want in $compatible {
+                        if c.contains(want) {
+                            return Some(Uart::_new::<$name>(uart));
+                        }
+                    }
+                };
+            }
+
+            of_uart!(AuxMini, ["brcm,bcm2835-aux-uart"]);
+            of_uart!(Pl011, ["arm,pl011", "arm,primecell"]);
+            of_uart!(Ns16550, ["snps,dw-apb-uart"]);
+        }
+        None
+    }
+
     pub fn set_irq_enable(&mut self, enable: bool) {
         (self.op.set_irq_enable)(self.data, enable);
     }
@@ -226,14 +254,14 @@ pub fn init(fdt_addr: NonNull<u8>, fn_phys_to_virt: FnPhysToVirt) -> Option<Uart
     let uart = UartData::new(reg.address, io_kind, fn_phys_to_virt);
 
     if is_8250 {
-        return Some(Uart::new::<Ns16550>(uart));
+        return Some(Uart::_new::<Ns16550>(uart));
     } else {
         for c in node.compatibles() {
             macro_rules! of_uart {
                 ($name:ty, $compatible:expr) => {
                     for want in $compatible {
                         if c.contains(want) {
-                            return Some(Uart::new::<$name>(uart));
+                            return Some(Uart::_new::<$name>(uart));
                         }
                     }
                 };