feat: 更新 rdif-intc 版本至 0.12.0，重构中断控制器接口实现

Author: ZR233

examples/enumerate/src/intc.rs

@@ -0,0 +1,56 @@
+use log::debug;
+use rdrive::{
+    PlatformDevice,
+    driver::intc::*,
+    probe::OnProbeError,
+    register::{DriverRegister, FdtInfo, ProbeKind, ProbeLevel, ProbePriority},
+};
+
+pub struct IrqTest {}
+
+pub fn register() -> DriverRegister {
+    DriverRegister {
+        name: "IrqTest",
+        probe_kinds: &[ProbeKind::Fdt {
+            compatibles: &["arm,cortex-a15-gic"],
+            on_probe: probe_intc,
+        }],
+        level: ProbeLevel::PreKernel,
+        priority: ProbePriority::INTC,
+    }
+}
+
+impl rdrive::DriverGeneric for IrqTest {
+    fn open(&mut self) -> Result<(), KError> {
+        Ok(())
+    }
+
+    fn close(&mut self) -> Result<(), KError> {
+        Ok(())
+    }
+}
+
+impl Interface for IrqTest {
+    fn parse_dtb_fn(&self) -> Option<rdrive::driver::intc::FuncFdtParseConfig> {
+        Some(fdt_parse)
+    }
+}
+
+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 {:?}",
+        fdt.node.name(),
+        plat_dev.descriptor.irq_parent,
+    );
+    plat_dev.register_intc(IrqTest {});
+
+    Ok(())
+}

examples/enumerate/src/main.rs

@@ -1,16 +1,15 @@
 #![feature(used_with_arg)]
 
-use std::{error::Error, ptr::NonNull};
+use std::ptr::NonNull;
 
 use log::debug;
-use rdrive::{
-    IrqConfig, IrqId, KError, PlatformDevice, driver, get_list,
-    probe::OnProbeError,
-    register::{DriverRegister, FdtInfo, ProbeKind, ProbeLevel, ProbePriority},
-};
+use rdrive::{driver, get_list};
+
+use crate::intc::IrqTest;
 
 pub mod blk;
 pub mod clk;
+pub mod intc;
 pub mod timer;
 
 fn main() {
@@ -25,17 +24,7 @@ fn main() {
     })
     .unwrap();
 
-    let register = DriverRegister {
-        name: "IrqTest",
-        probe_kinds: &[ProbeKind::Fdt {
-            compatibles: &["arm,cortex-a15-gic"],
-            on_probe: probe_intc,
-        }],
-        level: ProbeLevel::PreKernel,
-        priority: ProbePriority::INTC,
-    };
-
-    rdrive::register_add(register);
+    rdrive::register_add(intc::register());
     rdrive::register_add(timer::register());
     rdrive::register_add(clk::register());
     rdrive::register_add(blk::register());
@@ -50,6 +39,8 @@ fn main() {
 
         let t = g.typed_ref::<IrqTest>();
         debug!("intc: {:?}", g.type_name());
+        
+
 
         assert!(t.is_some(), "Intc should be [IrqTest]");
     }
@@ -60,76 +51,3 @@ fn main() {
 
     println!("phandle 0x8000 to device id: {:?}", id);
 }
-
-struct IrqTest {}
-
-impl rdrive::DriverGeneric for IrqTest {
-    fn open(&mut self) -> Result<(), KError> {
-        Ok(())
-    }
-
-    fn close(&mut self) -> Result<(), KError> {
-        Ok(())
-    }
-}
-
-impl rdrive::driver::intc::Interface for IrqTest {
-    fn irq_enable(&mut self, _irq: IrqId) -> Result<(), rdrive::driver::intc::IntcError> {
-        todo!()
-    }
-
-    fn irq_disable(&mut self, _irq: IrqId) -> Result<(), rdrive::driver::intc::IntcError> {
-        todo!()
-    }
-
-    fn set_priority(
-        &mut self,
-        _irq: IrqId,
-        _priority: usize,
-    ) -> Result<(), rdrive::driver::intc::IntcError> {
-        todo!()
-    }
-
-    fn set_trigger(
-        &mut self,
-        _irq: IrqId,
-        _trigger: rdrive::driver::intc::Trigger,
-    ) -> Result<(), rdrive::driver::intc::IntcError> {
-        todo!()
-    }
-
-    fn set_target_cpu(
-        &mut self,
-        _irq: IrqId,
-        _cpu: rdrive::driver::intc::CpuId,
-    ) -> Result<(), rdrive::driver::intc::IntcError> {
-        todo!()
-    }
-
-    fn cpu_local(&self) -> Option<rdrive::driver::intc::local::Boxed> {
-        todo!()
-    }
-
-    fn parse_dtb_fn(&self) -> Option<rdrive::driver::intc::FuncFdtParseConfig> {
-        Some(fdt_parse)
-    }
-}
-
-fn fdt_parse(_prop_interrupts_one_cell: &[u32]) -> Result<IrqConfig, Box<dyn Error>> {
-    Ok(IrqConfig {
-        irq: 0.into(),
-        trigger: rdrive::driver::intc::Trigger::EdgeBoth,
-        is_private: false,
-    })
-}
-
-fn probe_intc(fdt: FdtInfo<'_>, plat_dev: PlatformDevice) -> Result<(), OnProbeError> {
-    debug!(
-        "on_probe: {}, parent intc {:?}",
-        fdt.node.name(),
-        plat_dev.descriptor.irq_parent,
-    );
-    plat_dev.register_intc(IrqTest {});
-
-    Ok(())
-}

interface/rdif-intc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rdif-intc"
-version = "0.11.0"
+version = "0.12.0"
 edition.workspace = true
 authors = ["周睿 <zrufo747@outlook.com>"]
 repository.workspace = true

interface/rdif-intc/src/lib.rs

@@ -2,80 +2,16 @@
 
 extern crate alloc;
 
-use alloc::boxed::Box;
-use core::error::Error;
+use alloc::string::String;
 
 pub use rdif_base::{CpuId, DriverGeneric, KError, irq::*};
 
-/// CPU local interrupt controller interface
-pub mod local {
-    use super::*;
-
-    /// Boxed interface
-    pub type Boxed = Box<dyn Interface>;
-
-    pub trait Interface: DriverGeneric + Sync {
-        fn ack(&self) -> Option<IrqId>;
-        fn eoi(&self, irq: IrqId);
-
-        cfg_if::cfg_if! {
-            if #[cfg(target_arch = "aarch64")]{
-                fn dir(&self, intid: IrqId);
-                fn set_eoi_mode(&self, b: bool);
-                fn get_eoi_mode(&self) -> bool;
-            }
-        }
-
-        fn capability(&self) -> Capability;
-    }
-
-    /// controller capability
-    pub enum Capability {
-        None,
-        /// Local interface can config local irq.
-        ConfigLocalIrq(cap::BoxedConfigLocalIrq),
-    }
-
-    pub mod cap {
-        use super::*;
-
-        pub type BoxedConfigLocalIrq = Box<dyn ConfigLocalIrq>;
-
-        /// Local interface can config local irq.
-        pub trait ConfigLocalIrq: Send + Sync {
-            fn irq_enable(&self, irq: IrqId) -> Result<(), IntcError>;
-            fn irq_disable(&self, irq: IrqId) -> Result<(), IntcError>;
-            fn set_priority(&self, irq: IrqId, priority: usize) -> Result<(), IntcError>;
-            fn set_trigger(&self, irq: IrqId, trigger: Trigger) -> Result<(), IntcError>;
-        }
-    }
-}
-
 /// Fdt 解析 `interrupts` 函数，一次解析一个`cell`
-pub type FuncFdtParseConfig =
-    fn(prop_interrupts_one_cell: &[u32]) -> Result<IrqConfig, Box<dyn Error>>;
+pub type FuncFdtParseConfig = fn(prop_interrupts_one_cell: &[u32]) -> Result<IrqConfig, String>;
 
 pub trait Interface: DriverGeneric {
-    fn irq_enable(&mut self, irq: IrqId) -> Result<(), IntcError>;
-    fn irq_disable(&mut self, irq: IrqId) -> Result<(), IntcError>;
-    fn set_priority(&mut self, irq: IrqId, priority: usize) -> Result<(), IntcError>;
-    fn set_trigger(&mut self, irq: IrqId, trigger: Trigger) -> Result<(), IntcError>;
-    fn set_target_cpu(&mut self, irq: IrqId, cpu: CpuId) -> Result<(), IntcError>;
-
-    /// Get CPU local interrupt controller, return None if not supported
-    fn cpu_local(&self) -> Option<local::Boxed>;
     /// If not supported, returns None
     fn parse_dtb_fn(&self) -> Option<FuncFdtParseConfig> {
         None
     }
 }
-
-#[derive(thiserror::Error, Debug)]
-pub enum IntcError {
-    #[error("irq `{id:?}` not compatible")]
-    IrqIdNotCompatible { id: IrqId },
-    #[error("not support")]
-    NotSupport,
-    #[error("other error: {0}")]
-    Other(Box<dyn Error>),
-}

rdrive/CHANGELOG.md

@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.15.3](https://github.com/drivercraft/rdrive/compare/rdrive-v0.15.2...rdrive-v0.15.3) - 2025-06-27
+## [0.16.0](https://github.com/drivercraft/rdrive/compare/rdrive-v0.15.2...rdrive-v0.16.0) - 2025-06-27
 
 ### Added
 

rdrive/Cargo.toml

@@ -7,7 +7,7 @@ keywords = ["os", "driver"]
 license = "MIT"
 name = "rdrive"
 repository.workspace = true
-version = "0.15.3"
+version = "0.16.0"
 readme = "../README.md"
 
 [dependencies]
@@ -18,7 +18,7 @@ spin = "0.10"
 thiserror = {version = "2", default-features = false}
 
 rdif-base = {workspace = true}
-rdif-intc = {version = "0.11", path = "../interface/rdif-intc"}
+rdif-intc = { version = "0.12", path = "../interface/rdif-intc"}
 rdif-block = {version = "0.5", path = "../interface/rdif-block"}
 rdif-clk = {version = "0.4", path = "../interface/rdif-clk"}
 rdif-power = {version = "0.6", path = "../interface/rdif-power"}

rdrive/src/manager.rs

@@ -180,43 +180,7 @@ mod tests {
         }
     }
 
-    impl intc::Interface for IrqTest {
-        fn irq_enable(&mut self, _irq: rdif_intc::IrqId) -> Result<(), rdif_intc::IntcError> {
-            todo!()
-        }
-
-        fn irq_disable(&mut self, _irq: rdif_intc::IrqId) -> Result<(), rdif_intc::IntcError> {
-            todo!()
-        }
-
-        fn set_priority(
-            &mut self,
-            _irq: rdif_intc::IrqId,
-            _priority: usize,
-        ) -> Result<(), rdif_intc::IntcError> {
-            todo!()
-        }
-
-        fn set_trigger(
-            &mut self,
-            _irq: rdif_intc::IrqId,
-            _trigger: rdif_intc::Trigger,
-        ) -> Result<(), rdif_intc::IntcError> {
-            todo!()
-        }
-
-        fn set_target_cpu(
-            &mut self,
-            _irq: rdif_intc::IrqId,
-            _cpu: rdif_base::CpuId,
-        ) -> Result<(), rdif_intc::IntcError> {
-            todo!()
-        }
-
-        fn cpu_local(&self) -> Option<rdif_intc::local::Boxed> {
-            todo!()
-        }
-    }
+    impl intc::Interface for IrqTest {}
 
     #[test]
     fn test_inner_type() {