feat: 更新版本号至 0.1.1，添加 Fdt 结构的 chosen 和 memory 方法，增强测试用例

Author: ZR233

fdt-raw/Cargo.toml

@@ -11,7 +11,7 @@ name = "fdt-raw"
 readme = "README.md"
 homepage = "https://github.com/drivercraft/fdt-parser"
 repository = "https://github.com/drivercraft/fdt-parser"
-version = "0.1.0"
+version = "0.1.1"
 
 [dependencies]
 heapless = "0.9"

fdt-raw/src/fdt.rs

@@ -1,6 +1,8 @@
 use core::fmt;
 
-use crate::{FdtError, MemoryReservation, data::Bytes, header::Header, iter::FdtIter};
+use crate::{
+    Chosen, FdtError, Memory, MemoryReservation, Node, data::Bytes, header::Header, iter::FdtIter,
+};
 
 /// Memory reservation block iterator
 pub struct MemoryReservationIter<'a> {
@@ -102,6 +104,24 @@ impl<'a> Fdt<'a> {
             offset: self.header.off_mem_rsvmap as usize,
         }
     }
+
+    pub fn chosen(&self) -> Option<Chosen<'a>> {
+        for node in self.all_nodes() {
+            if let Node::Chosen(c) = node {
+                return Some(c);
+            }
+        }
+        None
+    }
+
+    pub fn memory(&self) -> Option<Memory<'a>> {
+        for node in self.all_nodes() {
+            if let Node::Memory(m) = node {
+                return Some(m);
+            }
+        }
+        None
+    }
 }
 
 impl fmt::Display for Fdt<'_> {

fdt-raw/src/node/mod.rs

@@ -1,6 +1,6 @@
-use core::ffi::CStr;
 use core::fmt;
 use core::ops::Deref;
+use core::{ffi::CStr, fmt::Debug};
 
 use crate::{
     FdtError, Token,
@@ -156,31 +156,6 @@ pub enum Node<'a> {
     Memory(Memory<'a>),
 }
 
-impl<'a> Node<'a> {
-    /// 获取底层的 NodeBase 引用
-    pub fn as_base(&self) -> &NodeBase<'a> {
-        self.deref()
-    }
-
-    /// 尝试转换为 Chosen 节点
-    pub fn as_chosen(&self) -> Option<&Chosen<'a>> {
-        if let Node::Chosen(c) = self {
-            Some(c)
-        } else {
-            None
-        }
-    }
-
-    /// 尝试转换为 Memory 节点
-    pub fn as_memory(&self) -> Option<&Memory<'a>> {
-        if let Node::Memory(m) = self {
-            Some(m)
-        } else {
-            None
-        }
-    }
-}
-
 impl<'a> From<NodeBase<'a>> for Node<'a> {
     fn from(node: NodeBase<'a>) -> Self {
         if node.is_chosen() {
@@ -207,7 +182,7 @@ impl<'a> Deref for Node<'a> {
 
 impl fmt::Display for Node<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.as_base().fmt(f)
+        Debug::fmt(self, f)
     }
 }
 

fdt-raw/tests/classify.rs

@@ -0,0 +1,32 @@
+use std::sync::Once;
+
+use dtb_file::fdt_qemu;
+use fdt_raw::Fdt;
+
+fn init_logging() {
+    static INIT: Once = Once::new();
+    INIT.call_once(|| {
+        let _ = env_logger::builder()
+            .is_test(true)
+            .filter_level(log::LevelFilter::Trace)
+            .try_init();
+    });
+}
+
+#[test]
+fn test_chosen() {
+    init_logging();
+    let raw = fdt_qemu();
+    let fdt = Fdt::from_bytes(&raw).unwrap();
+    let chosen = fdt.chosen().unwrap();
+    println!("Chosen node: {:?}", chosen);
+}
+
+#[test]
+fn test_memory() {
+    init_logging();
+    let raw = fdt_qemu();
+    let fdt = Fdt::from_bytes(&raw).unwrap();
+    let memory = fdt.memory().unwrap();
+    println!("Memory node: {:#x?}", memory);
+}