remove BusClock autoimpl

Author: burrbull

src/pwm.rs

@@ -191,7 +191,7 @@ use crate::stm32::TIM20;
 use crate::stm32::TIM5;
 use crate::stm32::{TIM1, TIM15, TIM16, TIM17, TIM2, TIM3, TIM4, TIM8};
 
-use crate::rcc::{BusTimerClock, Enable, Rcc, Reset};
+use crate::rcc::{BusTimerClock, Enable, Rcc, RccBus, Reset};
 use crate::time::{ExtU32, Hertz, NanoSecond, RateExtU32};
 
 #[cfg(any(
@@ -1149,7 +1149,7 @@ macro_rules! tim_hal {
                 $TIMX::enable(rcc);
                 $TIMX::reset(rcc);
 
-                let clk = $TIMX::timer_clock(&rcc.clocks);
+                let clk = <$TIMX as RccBus>::Bus::timer_clock(&rcc.clocks);
 
                 let (period, prescale) = match $bits {
                     16 => calculate_frequency_16bit(clk, freq, Alignment::Left),
@@ -1188,7 +1188,7 @@ macro_rules! tim_hal {
                     $TIMX::enable(rcc);
                     $TIMX::reset(rcc);
 
-                    let clk = $TIMX::timer_clock(&rcc.clocks).raw();
+                    let clk = <$TIMX as RccBus>::Bus::timer_clock(&rcc.clocks).raw();
 
                     PwmBuilder {
                         _tim: PhantomData,
@@ -1797,7 +1797,7 @@ macro_rules! lptim_hal {
                 $TIMX::enable(rcc);
                 $TIMX::reset(rcc);
 
-                let clk = $TIMX::timer_clock(&rcc.clocks);
+                let clk = <$TIMX as RccBus>::Bus::timer_clock(&rcc.clocks);
                 let reload = clk / freq;
                 assert!(reload < 128 * (1 << 16));
 

src/spi.rs

@@ -291,7 +291,7 @@ impl<SPI: Instance> SpiExt<SPI> for SPI {
         Self::reset(rcc);
 
         let spi_freq = freq.into().raw();
-        let bus_freq = SPI::clock(&rcc.clocks).raw();
+        let bus_freq = SPI::Bus::clock(&rcc.clocks).raw();
         setup_spi_regs(&self, spi_freq, bus_freq, mode);
 
         Spi { spi: self, pins }

src/timer.rs

@@ -10,7 +10,7 @@ use cortex_m::peripheral::{DCB, DWT, SYST};
 use embedded_hal_old::timer::{Cancel, CountDown as _, Periodic};
 use void::Void;
 
-use crate::rcc::{self, Clocks};
+use crate::rcc::{self, BusTimerClock, Clocks, RccBus};
 use crate::time::{Hertz, MicroSecond};
 
 /// Timer wrapper
@@ -202,7 +202,7 @@ impl Instant {
     }
 }
 
-pub trait Instance: rcc::Instance + rcc::BusTimerClock {}
+pub trait Instance: rcc::Instance + RccBus<Bus: BusTimerClock> {}
 
 impl<TIM> Timer<TIM>
 where
@@ -219,7 +219,7 @@ where
         }
 
         Self {
-            clk: TIM::timer_clock(clocks),
+            clk: TIM::Bus::timer_clock(clocks),
             tim,
         }
     }