timer: Interrupt API Do not have nvic as an assocated function

This is to improve ergonimics. The associated function
is not really needed, when an assocated const already exists

Author: Sh3Rm4n

src/serial.rs

@@ -741,7 +741,7 @@ where
     ///
     /// though this function can not be used in a const context.
     #[doc(alias = "unmask")]
-    pub fn nvic() -> Interrupt {
+    pub fn nvic(&self) -> Interrupt {
         <Usart as Instance>::INTERRUPT
     }
 

src/timer.rs

@@ -18,7 +18,7 @@ use crate::pac::{Interrupt, RCC};
 use crate::rcc::{Clocks, APB1, APB2};
 use crate::time::rate::*;
 
-mod interrupts;
+pub mod interrupts;
 
 /// A monotonic nondecreasing timer.
 #[derive(Debug, Clone, Copy)]
@@ -65,33 +65,6 @@ impl MonoTimer {
     }
 }
 
-// #[non_exhaustive]
-// // TODO: ...
-// pub struct CommonRegisterBlock {
-//     cr1: i32,
-//     // ...
-// }
-
-/// Wrapper around interrupt types for the timers.
-#[derive(Copy, Clone, Debug)]
-// FIXME: Interrupt is not formattable?
-// #[cfg_attr(feature = "defmt", derive(defmt::Format))]
-// TODO: Does it make sense to introduce an enum for that?
-// enum ItrTypes {Global, Break, Update, Trigger, CaptureCompare}
-#[non_exhaustive] // To make the type non-creatable but still accessable.
-pub struct InterruptTypes {
-    /// Global Interrupt
-    global: Option<Interrupt>,
-    /// Break Interrupt
-    r#break: Option<Interrupt>,
-    /// Update Interrupt
-    update: Option<Interrupt>,
-    /// Trigger and communication Interrupt
-    trigger: Option<Interrupt>,
-    /// Capture and compare interupt
-    capture_compare: Option<Interrupt>,
-}
-
 /// A measurement of a monotonically nondecreasing clock
 #[derive(Debug, Clone, Copy)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
@@ -181,9 +154,7 @@ where
     /// ```
     ///
     /// though this function can not be used in a const context.
-    // TODO: Maybe this function should be implemented as a trait:
-    // Like extended timer and normal / simple timer?
-    pub fn nvic() -> <TIM as self::interrupts::InterruptNumber>::Interrupt {
+    pub fn nvic(&self) -> <TIM as self::interrupts::InterruptNumber>::Interrupt {
         <TIM as self::interrupts::InterruptNumber>::INTERRUPT
     }
 
@@ -344,11 +315,6 @@ pub trait Instance:
     /// Peripheral bus instance which is responsible for the peripheral
     type APB;
 
-    /// The associated interrupt number, used to unmask / enable the interrupt
-    /// with [`cortex_m::peripheral::NVIC::unmask()`]
-    // const INTERRUPT: InterruptTypes;
-    const INTERRUPT: Interrupt = Interrupt::TIM2;
-
     #[doc(hidden)]
     fn enable_clock(apb: &mut Self::APB);
     #[doc(hidden)]
@@ -425,8 +391,6 @@ macro_rules! timer {
             impl crate::private::Sealed for crate::pac::$TIMX {}
             impl Instance for crate::pac::$TIMX {
                 type APB = $APB;
-                // TODO: This has to be variable.
-                const INTERRUPT: Interrupt = Interrupt::TIM2;
 
                 #[inline]
                 fn enable_clock(apb: &mut Self::APB) {

src/timer/interrupts.rs

@@ -21,6 +21,7 @@ pub struct InterruptTypes {
 // FIXME: This super-trait constrained makes it difficult to use this trait
 // without cfg(feature...)
 // pub trait InterruptNumber: crate::private::Sealed {
+// TODO: Rename, because in conflict with: use cortex_m::interrupt::InterruptNumber;
 pub trait InterruptNumber {
     type Interrupt;
     const INTERRUPT: Self::Interrupt;

testsuite/tests/timer.rs

@@ -3,13 +3,14 @@
 
 use core::sync::atomic::{AtomicBool, Ordering};
 
+use cortex_m::interrupt::InterruptNumber;
 use defmt_rtt as _;
 use panic_probe as _;
 
 use stm32f3xx_hal as hal;
 
 use hal::rcc::{Clocks, APB1};
-use hal::timer::{Event, Instance, MonoTimer, Timer};
+use hal::timer::{self, Event, Instance, MonoTimer, Timer};
 use hal::{interrupt, pac, prelude::*};
 
 use pac::TIM2;
@@ -118,7 +119,6 @@ fn TIM2() {
     //
     // This is all needed, to clear the fired interrupt.
     assert!(cortex_m::peripheral::NVIC::is_active(
-        <pac::TIM2 as Instance>::INTERRUPT
+        <pac::TIM2 as timer::interrupts::InterruptNumber>::INTERRUPT
     ));
-    cortex_m::peripheral::NVIC::mask(<pac::TIM2 as Instance>::INTERRUPT);
-}
+    cortex_m::peripheral::NVIC::mask(<pac::TIM2 as timer::interrupts::InterruptNumber>::INTERRUPT); }

testsuite/tests/uart.rs

@@ -142,16 +142,18 @@ mod tests {
                 .into_af7_open_drain(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl),
         };
 
-        unsafe { cortex_m::peripheral::NVIC::unmask(<pac::USART1 as Instance>::INTERRUPT) }
+        let serial1 = Serial::new(
+            dp.USART1,
+            (serial_pair.0, serial_pair.1),
+            9600.Bd(),
+            clocks,
+            &mut rcc.apb2,
+        );
+
+        unsafe { cortex_m::peripheral::NVIC::unmask(serial1.nvic()) }
 
         super::State {
-            serial1: Some(Serial::new(
-                dp.USART1,
-                (serial_pair.0, serial_pair.1),
-                9600.Bd(),
-                clocks,
-                &mut rcc.apb2,
-            )),
+            serial1: Some(serial1),
             serial_slow: Some(Serial::new(
                 dp.USART2,
                 (cs_pair_1.0, cs_pair_2.1),