LailaTheElf/embassy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FDCAN: Remove extra traits from.

Browse Source 
Comments

Fix.
This commit is contained in:
Corey Schuhen 2024-02-24 18:31:05 +10:00
parent 4657c10547
commit 2d634d07e0
1 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
embassy-stm32/src/can/fdcan.rs
View File

@ -861,22 +861,13 @@ pub(crate) mod sealed {
} }
} }
/// Trait for FDCAN interrupt channel 0 /// Instance trait
pub trait IT0Instance { pub trait Instance: sealed::Instance + RccPeripheral + 'static {
/// Type for FDCAN interrupt channel 0 /// Interrupt 0
type IT0Interrupt: crate::interrupt::typelevel::Interrupt; type IT0Interrupt: crate::interrupt::typelevel::Interrupt;
} /// Interrupt 0
/// Trait for FDCAN interrupt channel 1
pub trait IT1Instance {
/// Type for FDCAN interrupt channel 1
type IT1Interrupt: crate::interrupt::typelevel::Interrupt; type IT1Interrupt: crate::interrupt::typelevel::Interrupt;
} }
/// InterruptableInstance trait
pub trait InterruptableInstance: IT0Instance + IT1Instance {}
/// Instance trait
pub trait Instance: sealed::Instance + RccPeripheral + InterruptableInstance + 'static {}
/// Fdcan Instance struct /// Fdcan Instance struct
pub struct FdcanInstance<'a, T>(PeripheralRef<'a, T>); pub struct FdcanInstance<'a, T>(PeripheralRef<'a, T>);
@ -921,22 +912,22 @@ fn calc_timestamp(_ns_per_timer_tick: u64, ts_val: u16) -> Timestamp {
} }
impl Instance for peripherals::$inst {} #[allow(non_snake_case)]
pub(crate) mod $inst {
foreach_interrupt!( foreach_interrupt!(
($inst,can,FDCAN,IT0,$irq:ident) => { ($inst,can,FDCAN,IT0,$irq:ident) => {
impl IT0Instance for peripherals::$inst { pub type Interrupt0 = crate::interrupt::typelevel::$irq;
type IT0Interrupt = crate::interrupt::typelevel::$irq;
}
}; };
($inst,can,FDCAN,IT1,$irq:ident) => { ($inst,can,FDCAN,IT1,$irq:ident) => {
impl IT1Instance for peripherals::$inst { pub type Interrupt1 = crate::interrupt::typelevel::$irq;
type IT1Interrupt = crate::interrupt::typelevel::$irq;
}
}; };
); );
}
impl InterruptableInstance for peripherals::$inst {} impl Instance for peripherals::$inst {
type IT0Interrupt = $inst::Interrupt0;
type IT1Interrupt = $inst::Interrupt1;
}
}; };
($inst:ident, $msg_ram_inst:ident) => { ($inst:ident, $msg_ram_inst:ident) => {