diff options
| author | Jan Špaček <[email protected]> | 2024-05-24 22:04:04 +0200 |
|---|---|---|
| committer | Jan Špaček <[email protected]> | 2024-05-25 18:44:55 +0200 |
| commit | 081afca3f065dfd91e157d7c9a9477e2d914c99d (patch) | |
| tree | 574b29636674d3e5a9e3763d00f709635856403e /embassy-stm32/src/spi | |
| parent | 01c1cb2764300625f80b24e70052f250de27d814 (diff) | |
stm32/rcc: replace generated enable/disable code with runtime info
Diffstat (limited to 'embassy-stm32/src/spi')
| -rw-r--r-- | embassy-stm32/src/spi/mod.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/embassy-stm32/src/spi/mod.rs b/embassy-stm32/src/spi/mod.rs index 5fc8691ac..33be7a701 100644 --- a/embassy-stm32/src/spi/mod.rs +++ b/embassy-stm32/src/spi/mod.rs | |||
| @@ -13,7 +13,7 @@ use crate::dma::{slice_ptr_parts, word, ChannelAndRequest}; | |||
| 13 | use crate::gpio::{AFType, AnyPin, Pull, SealedPin as _, Speed}; | 13 | use crate::gpio::{AFType, AnyPin, Pull, SealedPin as _, Speed}; |
| 14 | use crate::mode::{Async, Blocking, Mode as PeriMode}; | 14 | use crate::mode::{Async, Blocking, Mode as PeriMode}; |
| 15 | use crate::pac::spi::{regs, vals, Spi as Regs}; | 15 | use crate::pac::spi::{regs, vals, Spi as Regs}; |
| 16 | use crate::rcc::{ClockEnableBit, SealedRccPeripheral}; | 16 | use crate::rcc::{self, RccInfo, SealedRccPeripheral}; |
| 17 | use crate::time::Hertz; | 17 | use crate::time::Hertz; |
| 18 | use crate::Peripheral; | 18 | use crate::Peripheral; |
| 19 | 19 | ||
| @@ -129,7 +129,7 @@ impl<'d, M: PeriMode> Spi<'d, M> { | |||
| 129 | 129 | ||
| 130 | let lsbfirst = config.raw_byte_order(); | 130 | let lsbfirst = config.raw_byte_order(); |
| 131 | 131 | ||
| 132 | T::enable_and_reset(); | 132 | rcc::enable_and_reset::<T>(); |
| 133 | 133 | ||
| 134 | #[cfg(any(spi_v1, spi_f1))] | 134 | #[cfg(any(spi_v1, spi_f1))] |
| 135 | { | 135 | { |
| @@ -738,7 +738,7 @@ impl<'d, M: PeriMode> Drop for Spi<'d, M> { | |||
| 738 | self.mosi.as_ref().map(|x| x.set_as_disconnected()); | 738 | self.mosi.as_ref().map(|x| x.set_as_disconnected()); |
| 739 | self.miso.as_ref().map(|x| x.set_as_disconnected()); | 739 | self.miso.as_ref().map(|x| x.set_as_disconnected()); |
| 740 | 740 | ||
| 741 | self.info.enable_bit.disable(); | 741 | self.info.rcc.disable(); |
| 742 | } | 742 | } |
| 743 | } | 743 | } |
| 744 | 744 | ||
| @@ -1118,7 +1118,7 @@ mod word_impl { | |||
| 1118 | 1118 | ||
| 1119 | pub(crate) struct Info { | 1119 | pub(crate) struct Info { |
| 1120 | pub(crate) regs: Regs, | 1120 | pub(crate) regs: Regs, |
| 1121 | pub(crate) enable_bit: ClockEnableBit, | 1121 | pub(crate) rcc: RccInfo, |
| 1122 | } | 1122 | } |
| 1123 | 1123 | ||
| 1124 | struct State {} | 1124 | struct State {} |
| @@ -1145,7 +1145,7 @@ foreach_peripheral!( | |||
| 1145 | (spi, $inst:ident) => { | 1145 | (spi, $inst:ident) => { |
| 1146 | peri_trait_impl!($inst, Info { | 1146 | peri_trait_impl!($inst, Info { |
| 1147 | regs: crate::pac::$inst, | 1147 | regs: crate::pac::$inst, |
| 1148 | enable_bit: crate::peripherals::$inst::ENABLE_BIT, | 1148 | rcc: crate::peripherals::$inst::RCC_INFO, |
| 1149 | }); | 1149 | }); |
| 1150 | }; | 1150 | }; |
| 1151 | ); | 1151 | ); |
