diff options
| author | Tyler Gilbert <[email protected]> | 2023-09-29 21:53:01 -0500 |
|---|---|---|
| committer | Tyler Gilbert <[email protected]> | 2023-09-29 21:53:01 -0500 |
| commit | 1be5f193c39379ce63e743bdb50d52ae223c9985 (patch) | |
| tree | 778ffb75652368fcc907eb3b82139cd06c54344c | |
| parent | 4a632e08b720b18062396d2d4f999f0acf80355a (diff) | |
#Issue 1974 more whitespace fixes
| -rw-r--r-- | embassy-stm32/src/rcc/f4.rs | 15 | ||||
| -rw-r--r-- | embassy-stm32/src/sai/mod.rs | 3 |
2 files changed, 13 insertions, 5 deletions
diff --git a/embassy-stm32/src/rcc/f4.rs b/embassy-stm32/src/rcc/f4.rs index 6315dc77e..ebf78d0e2 100644 --- a/embassy-stm32/src/rcc/f4.rs +++ b/embassy-stm32/src/rcc/f4.rs | |||
| @@ -48,10 +48,12 @@ fn setup_i2s_pll(_vco_in: u32, _plli2s: Option<u32>) -> Option<u32> { | |||
| 48 | 48 | ||
| 49 | // Not currently implemented, but will be in the future | 49 | // Not currently implemented, but will be in the future |
| 50 | #[cfg(any(stm32f411, stm32f412, stm32f413, stm32f423, stm32f446))] | 50 | #[cfg(any(stm32f411, stm32f412, stm32f413, stm32f423, stm32f446))] |
| 51 | fn setup_i2s_pll(_vco_in: u32, _plli2s: Option<u32>) -> Option<u32> { None } | 51 | fn setup_i2s_pll(_vco_in: u32, _plli2s: Option<u32>) -> Option<u32> { |
| 52 | None | ||
| 53 | } | ||
| 52 | 54 | ||
| 53 | #[cfg(not(any(stm32f410, stm32f411, stm32f412, stm32f413, stm32f423, stm32f446)))] | 55 | #[cfg(not(any(stm32f410, stm32f411, stm32f412, stm32f413, stm32f423, stm32f446)))] |
| 54 | fn calculate_sai_i2s_pll_values(vco_in: u32, max_div: u32, target: Option<u32>, ) -> Option<(u32, u32, u32)> { | 56 | fn calculate_sai_i2s_pll_values(vco_in: u32, max_div: u32, target: Option<u32>) -> Option<(u32, u32, u32)> { |
| 55 | let min_div = 2; | 57 | let min_div = 2; |
| 56 | let target = match target { | 58 | let target = match target { |
| 57 | Some(target) => target, | 59 | Some(target) => target, |
| @@ -111,7 +113,14 @@ fn setup_sai_pll(vco_in: u32, pllsai: Option<u32>) -> Option<u32> { | |||
| 111 | Some(output) | 113 | Some(output) |
| 112 | } | 114 | } |
| 113 | 115 | ||
| 114 | fn setup_pll(pllsrcclk: u32, use_hse: bool, pllsysclk: Option<u32>, plli2s: Option<u32>, pllsai: Option<u32>, pll48clk: bool) -> PllResults { | 116 | fn setup_pll( |
| 117 | pllsrcclk: u32, | ||
| 118 | use_hse: bool, | ||
| 119 | pllsysclk: Option<u32>, | ||
| 120 | plli2s: Option<u32>, | ||
| 121 | pllsai: Option<u32>, | ||
| 122 | pll48clk: bool, | ||
| 123 | ) -> PllResults { | ||
| 115 | use crate::pac::rcc::vals::{Pllp, Pllsrc}; | 124 | use crate::pac::rcc::vals::{Pllp, Pllsrc}; |
| 116 | 125 | ||
| 117 | let sysclk = pllsysclk.unwrap_or(pllsrcclk); | 126 | let sysclk = pllsysclk.unwrap_or(pllsrcclk); |
diff --git a/embassy-stm32/src/sai/mod.rs b/embassy-stm32/src/sai/mod.rs index d2949e9a0..4ffa6e9ce 100644 --- a/embassy-stm32/src/sai/mod.rs +++ b/embassy-stm32/src/sai/mod.rs | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | use embassy_embedded_hal::SetConfig; | 3 | use embassy_embedded_hal::SetConfig; |
| 4 | use embassy_hal_internal::{into_ref, PeripheralRef}; | 4 | use embassy_hal_internal::{into_ref, PeripheralRef}; |
| 5 | 5 | ||
| 6 | pub use crate::dma::word; | ||
| 6 | use crate::dma::{ringbuffer, Channel, ReadableRingBuffer, TransferOptions, WritableRingBuffer}; | 7 | use crate::dma::{ringbuffer, Channel, ReadableRingBuffer, TransferOptions, WritableRingBuffer}; |
| 7 | use crate::gpio::sealed::{AFType, Pin as _}; | 8 | use crate::gpio::sealed::{AFType, Pin as _}; |
| 8 | use crate::gpio::AnyPin; | 9 | use crate::gpio::AnyPin; |
| @@ -10,8 +11,6 @@ use crate::pac::sai::{vals, Sai as Regs}; | |||
| 10 | use crate::rcc::RccPeripheral; | 11 | use crate::rcc::RccPeripheral; |
| 11 | use crate::{peripherals, Peripheral}; | 12 | use crate::{peripherals, Peripheral}; |
| 12 | 13 | ||
| 13 | pub use crate::dma::word; | ||
| 14 | |||
| 15 | #[derive(Debug)] | 14 | #[derive(Debug)] |
| 16 | #[cfg_attr(feature = "defmt", derive(defmt::Format))] | 15 | #[cfg_attr(feature = "defmt", derive(defmt::Format))] |
| 17 | pub enum Error { | 16 | pub enum Error { |
