feat: 更新 rdif-intc 版本至 0.13，优化中断处理逻辑

Author: ZR233

examples/enumerate/Cargo.toml

@@ -8,4 +8,4 @@ version = "0.1.0"
 env_logger = "0.11"
 log = "0.4"
 rdrive = {path = "../../rdrive"}
-rdif-intc = { version = "0.12", path = "../../interface/rdif-intc"}
+rdif-intc = { version = "0.13", path = "../../interface/rdif-intc"}

examples/enumerate/src/blk.rs

@@ -27,7 +27,20 @@ fn probe(info: FdtInfo<'_>, _dev: PlatformDevice) -> Result<(), OnProbeError> {
 
     if let Some(irq) = _dev.descriptor.irq_parent {
         let intc = rdrive::get::<Intc>(irq).unwrap();
-        println!("parent intc: {:?}", intc.descriptor());
+
+        if let Some(irqs) = info.node.interrupts() {
+            for irq_prop in irqs {
+                let irq_prop: Vec<u32> = irq_prop.collect();
+                let irq_id = intc.lock().unwrap().setup_irq_by_fdt(&irq_prop);
+                debug!(
+                    "virtio mmio device [{}] setup irq: {:?}",
+                    info.node.name(),
+                    irq_id
+                );
+            }
+        }
+
+        println!("parent intc: {:?}", intc.descriptor().name);
     }
 
     let base_reg = reg.next().unwrap();

examples/enumerate/src/intc.rs

@@ -31,19 +31,12 @@ impl rdrive::DriverGeneric for IrqTest {
 }
 
 impl Interface for IrqTest {
-    fn parse_dtb_fn(&self) -> Option<rdif_intc::FuncFdtParseConfig> {
-        Some(fdt_parse)
+    fn setup_irq_by_fdt(&mut self, irq_prop: &[u32]) -> IrqId {
+        debug!("IrqTest setup_irq_by_fdt: {:?}", irq_prop);
+        42.into()
     }
 }
 
-fn fdt_parse(_prop_interrupts_one_cell: &[u32]) -> Result<IrqConfig, String> {
-    Ok(IrqConfig {
-        irq: 0.into(),
-        trigger: Trigger::EdgeBoth,
-        is_private: false,
-    })
-}
-
 fn probe_intc(fdt: FdtInfo<'_>, plat_dev: PlatformDevice) -> Result<(), OnProbeError> {
     debug!(
         "on_probe: {}, parent intc {:?}",

interface/rdif-intc/Cargo.toml

@@ -1,15 +1,14 @@
 [package]
-name = "rdif-intc"
-version = "0.12.1"
-edition.workspace = true
 authors = ["周睿 <zrufo747@outlook.com>"]
-repository.workspace = true
-license = "MIT"
+categories = ["embedded", "no-std"]
 description = "Driver Interface of interrupt controller."
+edition.workspace = true
 keywords = ["os", "driver"]
-categories = ["embedded", "no-std"]
+license = "MIT"
+name = "rdif-intc"
+repository.workspace = true
+version = "0.13.0"
 
 [dependencies]
-rdif-base = { workspace = true }
 cfg-if = "1.0"
-thiserror = { version = "2", default-features = false }
+rdif-base = {workspace = true}

interface/rdif-intc/src/lib.rs

@@ -2,18 +2,12 @@
 
 extern crate alloc;
 
-use alloc::string::String;
-
 pub use rdif_base::_rdif_prelude::*;
 use rdif_base::def_driver;
 
-/// Fdt 解析 `interrupts` 函数，一次解析一个`cell`
-pub type FuncFdtParseConfig = fn(prop_interrupts_one_cell: &[u32]) -> Result<IrqConfig, String>;
-
 pub trait Interface: DriverGeneric {
-    /// If not supported, returns None
-    fn parse_dtb_fn(&self) -> Option<FuncFdtParseConfig> {
-        None
+    fn setup_irq_by_fdt(&mut self, _irq_prop: &[u32]) -> IrqId {
+        unimplemented!();
     }
 }
 

rdrive/Cargo.toml

@@ -24,5 +24,5 @@ rdrive-macros = {version = "0.4", path = "../rdrive-macros"}
 rdif-pcie = {workspace = true}
 
 [dev-dependencies]
-rdif-intc = { version = "0.12", path = "../interface/rdif-intc"}
+rdif-intc = { version = "0.13", path = "../interface/rdif-intc"}
 rdif-clk = { version = "0.4", path = "../interface/rdif-clk"}