移除无用接口

qclic · Feb 6, 2025 · 919d5c0 · 919d5c0
1 parent 37098f1
commit 919d5c0
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 38 deletions.
diff --git a/crates/driver-interface/src/err.rs b/crates/driver-interface/src/err.rs
@@ -6,4 +6,4 @@ pub enum DriverError {
     Other(String),
 }
 
-pub type DriverResult<T> = core::result::Result<T, DriverError>;
+pub type DriverResult<T=()> = core::result::Result<T, DriverError>;
diff --git a/crates/driver-interface/src/interrupt_controller.rs b/crates/driver-interface/src/interrupt_controller.rs
@@ -19,7 +19,6 @@ pub trait InterfaceCPU: Send {
     fn set_trigger(&mut self, irq: IrqId, triger: Trigger);
     fn set_bind_cpu(&mut self, irq: IrqId, cpu_list: &[CpuId]);
     fn parse_fdt_config(&self, prop_interrupts: &[u32]) -> Result<IrqConfig, Box<dyn Error>>;
-    fn irq_pin_to_id(&self, pin: usize) -> Result<IrqId, Box<dyn Error>>;
 }
 
 pub trait Interface: DriverGeneric {

diff --git a/crates/driver-interface/src/lib.rs b/crates/driver-interface/src/lib.rs
@@ -12,8 +12,8 @@ pub use err::{DriverError, DriverResult};
 pub use interrupt_controller::IrqConfig;
 
 pub trait DriverGeneric: Send {
-    fn open(&mut self) -> DriverResult<()>;
-    fn close(&mut self) -> DriverResult<()>;
+    fn open(&mut self) -> DriverResult;
+    fn close(&mut self) -> DriverResult;
 }
 
 #[derive(Debug, Clone, Copy)]

diff --git a/crates/sparreal-kernel/src/irq/mod.rs b/crates/sparreal-kernel/src/irq/mod.rs
@@ -61,11 +61,14 @@ pub(crate) fn init_current_cpu() {
 
         let device = Device::new(c.descriptor.clone(), device);
 
-        g.irq_chips.0.insert(id, Chip {
-            device,
-            mutex: Mutex::new(()),
-            handlers: UnsafeCell::new(Default::default()),
-        });
+        g.irq_chips.0.insert(
+            id,
+            Chip {
+                device,
+                mutex: Mutex::new(()),
+                handlers: UnsafeCell::new(Default::default()),
+            },
+        );
     }
 }
 
@@ -164,11 +167,6 @@ impl Chip {
         chip.end_interrupt(irq);
         Some(())
     }
-
-    fn pin_to_id(&self, pin: usize) -> Result<IrqId, Box<dyn Error>> {
-        let chip = unsafe { &*self.device.force_use() };
-        chip.irq_pin_to_id(pin)
-    }
 }
 
 pub struct NoIrqGuard {
@@ -214,18 +212,6 @@ pub struct IrqParam {
 }
 
 impl IrqParam {
-    pub fn new_pin(pin: usize, irq_chip: DriverId) -> Result<Self, Box<dyn Error>> {
-        let chip = chip(irq_chip);
-        let irq_id = chip.pin_to_id(pin)?;
-        Ok(Self {
-            irq_chip,
-            cfg: IrqConfig {
-                irq: irq_id,
-                trigger: Trigger::LevelLow,
-            },
-        })
-    }
-
     pub fn register_builder(
         &self,
         handler: impl Fn(IrqId) -> IrqHandleResult + 'static,

diff --git a/crates/sparreal-rt/src/arch/aarch64/gic/gic_v2.rs b/crates/sparreal-rt/src/arch/aarch64/gic/gic_v2.rs
@@ -102,9 +102,7 @@ impl InterfaceCPU for GicV2PerCpu {
         fdt_parse_irq_config(prop_interupt)
     }
 
-    fn irq_pin_to_id(&self, pin: usize) -> Result<IrqId, Box<dyn Error>> {
-        super::irq_pin_to_id(pin)
-    }
+
 }
 
 impl DriverGeneric for GicV2 {

diff --git a/crates/sparreal-rt/src/arch/aarch64/gic/gic_v3.rs b/crates/sparreal-rt/src/arch/aarch64/gic/gic_v3.rs
@@ -105,10 +105,6 @@ impl InterfaceCPU for GicPerCpu {
     fn parse_fdt_config(&self, prop_interupt: &[u32]) -> Result<IrqConfig, Box<dyn Error>> {
         fdt_parse_irq_config(prop_interupt)
     }
-
-    fn irq_pin_to_id(&self, pin: usize) -> Result<IrqId, Box<dyn Error>> {
-        super::irq_pin_to_id(pin)
-    }
 }
 
 impl DriverGeneric for Gic {

diff --git a/crates/sparreal-rt/src/arch/aarch64/gic/mod.rs b/crates/sparreal-rt/src/arch/aarch64/gic/mod.rs
@@ -62,8 +62,3 @@ fn fdt_parse_irq_config(itr: &[u32]) -> Result<IrqConfig, Box<dyn Error>> {
         trigger,
     })
 }
-
-fn irq_pin_to_id(pin: usize) -> Result<IrqId, Box<dyn Error>> {
-    let irq_id = arm_gic_driver::IntId::spi(pin as _);
-    Ok((irq_id.to_u32() as usize).into())
-}