stm32/rcc: misc cleanups.
This commit is contained in:
		@@ -14,10 +14,10 @@ async fn main(_spawner: Spawner) {
 | 
			
		||||
    let mut config = Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hsi = Some(Hsi::Mhz64);
 | 
			
		||||
        config.rcc.hsi = Some(HSIPrescaler::DIV1);
 | 
			
		||||
        config.rcc.csi = true;
 | 
			
		||||
        config.rcc.pll_src = PllSource::Hsi;
 | 
			
		||||
        config.rcc.pll1 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV2),
 | 
			
		||||
@@ -25,13 +25,14 @@ async fn main(_spawner: Spawner) {
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.pll2 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV8), // 100mhz
 | 
			
		||||
            divq: None,
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
 | 
			
		||||
        config.rcc.sys = Sysclk::PLL1_P; // 400 Mhz
 | 
			
		||||
        config.rcc.ahb_pre = AHBPrescaler::DIV2; // 200 Mhz
 | 
			
		||||
        config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
        config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
 
 | 
			
		||||
@@ -28,17 +28,17 @@ async fn main(_spawner: Spawner) {
 | 
			
		||||
    let mut config = Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hsi = Some(Hsi::Mhz64);
 | 
			
		||||
        config.rcc.hsi = Some(HSIPrescaler::DIV1);
 | 
			
		||||
        config.rcc.csi = true;
 | 
			
		||||
        config.rcc.pll_src = PllSource::Hsi;
 | 
			
		||||
        config.rcc.pll1 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV2),
 | 
			
		||||
            divq: Some(PllDiv::DIV8), // 100mhz
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
 | 
			
		||||
        config.rcc.sys = Sysclk::PLL1_P; // 400 Mhz
 | 
			
		||||
        config.rcc.ahb_pre = AHBPrescaler::DIV2; // 200 Mhz
 | 
			
		||||
        config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
        config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
 
 | 
			
		||||
@@ -16,10 +16,10 @@ fn main() -> ! {
 | 
			
		||||
    let mut config = Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hsi = Some(Hsi::Mhz64);
 | 
			
		||||
        config.rcc.hsi = Some(HSIPrescaler::DIV1);
 | 
			
		||||
        config.rcc.csi = true;
 | 
			
		||||
        config.rcc.pll_src = PllSource::Hsi;
 | 
			
		||||
        config.rcc.pll1 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV2),
 | 
			
		||||
@@ -27,13 +27,14 @@ fn main() -> ! {
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.pll2 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV8), // 100mhz
 | 
			
		||||
            divq: None,
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
 | 
			
		||||
        config.rcc.sys = Sysclk::PLL1_P; // 400 Mhz
 | 
			
		||||
        config.rcc.ahb_pre = AHBPrescaler::DIV2; // 200 Mhz
 | 
			
		||||
        config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
        config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
 
 | 
			
		||||
@@ -24,10 +24,10 @@ async fn main(spawner: Spawner) {
 | 
			
		||||
    let mut config = embassy_stm32::Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hsi = Some(Hsi::Mhz64);
 | 
			
		||||
        config.rcc.hsi = Some(HSIPrescaler::DIV1);
 | 
			
		||||
        config.rcc.csi = true;
 | 
			
		||||
        config.rcc.pll_src = PllSource::Hsi;
 | 
			
		||||
        config.rcc.pll1 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV2),
 | 
			
		||||
@@ -35,13 +35,14 @@ async fn main(spawner: Spawner) {
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.pll2 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV8), // 100mhz
 | 
			
		||||
            divq: None,
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
 | 
			
		||||
        config.rcc.sys = Sysclk::PLL1_P; // 400 Mhz
 | 
			
		||||
        config.rcc.ahb_pre = AHBPrescaler::DIV2; // 200 Mhz
 | 
			
		||||
        config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
        config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
 
 | 
			
		||||
@@ -34,18 +34,18 @@ async fn main(spawner: Spawner) -> ! {
 | 
			
		||||
    let mut config = Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hsi = Some(Hsi::Mhz64);
 | 
			
		||||
        config.rcc.hsi = Some(HSIPrescaler::DIV1);
 | 
			
		||||
        config.rcc.csi = true;
 | 
			
		||||
        config.rcc.hsi48 = true; // needed for RNG
 | 
			
		||||
        config.rcc.pll_src = PllSource::Hsi;
 | 
			
		||||
        config.rcc.pll1 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV2),
 | 
			
		||||
            divq: None,
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
 | 
			
		||||
        config.rcc.sys = Sysclk::PLL1_P; // 400 Mhz
 | 
			
		||||
        config.rcc.ahb_pre = AHBPrescaler::DIV2; // 200 Mhz
 | 
			
		||||
        config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
        config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
 
 | 
			
		||||
@@ -35,18 +35,18 @@ async fn main(spawner: Spawner) -> ! {
 | 
			
		||||
    let mut config = Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hsi = Some(Hsi::Mhz64);
 | 
			
		||||
        config.rcc.hsi = Some(HSIPrescaler::DIV1);
 | 
			
		||||
        config.rcc.csi = true;
 | 
			
		||||
        config.rcc.hsi48 = true; // needed for RNG
 | 
			
		||||
        config.rcc.pll_src = PllSource::Hsi;
 | 
			
		||||
        config.rcc.pll1 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV2),
 | 
			
		||||
            divq: None,
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
 | 
			
		||||
        config.rcc.sys = Sysclk::PLL1_P; // 400 Mhz
 | 
			
		||||
        config.rcc.ahb_pre = AHBPrescaler::DIV2; // 200 Mhz
 | 
			
		||||
        config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
        config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
 
 | 
			
		||||
@@ -14,17 +14,17 @@ async fn main(_spawner: Spawner) {
 | 
			
		||||
    let mut config = Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hsi = Some(Hsi::Mhz64);
 | 
			
		||||
        config.rcc.hsi = Some(HSIPrescaler::DIV1);
 | 
			
		||||
        config.rcc.csi = true;
 | 
			
		||||
        config.rcc.pll_src = PllSource::Hsi;
 | 
			
		||||
        config.rcc.pll1 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV2),
 | 
			
		||||
            divq: Some(PllDiv::DIV8), // 100mhz
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
 | 
			
		||||
        config.rcc.sys = Sysclk::PLL1_P; // 400 Mhz
 | 
			
		||||
        config.rcc.ahb_pre = AHBPrescaler::DIV2; // 200 Mhz
 | 
			
		||||
        config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
        config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
 
 | 
			
		||||
@@ -17,18 +17,18 @@ async fn main(_spawner: Spawner) {
 | 
			
		||||
    let mut config = Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hsi = Some(Hsi::Mhz64);
 | 
			
		||||
        config.rcc.hsi = Some(HSIPrescaler::DIV1);
 | 
			
		||||
        config.rcc.csi = true;
 | 
			
		||||
        config.rcc.hsi48 = true; // needed for RNG
 | 
			
		||||
        config.rcc.pll_src = PllSource::Hsi;
 | 
			
		||||
        config.rcc.pll1 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV2),
 | 
			
		||||
            divq: Some(PllDiv::DIV8), // 100mhz
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
 | 
			
		||||
        config.rcc.sys = Sysclk::PLL1_P; // 400 Mhz
 | 
			
		||||
        config.rcc.ahb_pre = AHBPrescaler::DIV2; // 200 Mhz
 | 
			
		||||
        config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
        config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
 
 | 
			
		||||
@@ -17,17 +17,17 @@ async fn main(_spawner: Spawner) {
 | 
			
		||||
    let mut config = Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hsi = Some(Hsi::Mhz64);
 | 
			
		||||
        config.rcc.hsi = Some(HSIPrescaler::DIV1);
 | 
			
		||||
        config.rcc.csi = true;
 | 
			
		||||
        config.rcc.pll_src = PllSource::Hsi;
 | 
			
		||||
        config.rcc.pll1 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV2),
 | 
			
		||||
            divq: None,
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
 | 
			
		||||
        config.rcc.sys = Sysclk::PLL1_P; // 400 Mhz
 | 
			
		||||
        config.rcc.ahb_pre = AHBPrescaler::DIV2; // 200 Mhz
 | 
			
		||||
        config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
        config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
 
 | 
			
		||||
@@ -18,17 +18,17 @@ async fn main(_spawner: Spawner) -> ! {
 | 
			
		||||
    let mut config = Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hsi = Some(Hsi::Mhz64);
 | 
			
		||||
        config.rcc.hsi = Some(HSIPrescaler::DIV1);
 | 
			
		||||
        config.rcc.csi = true;
 | 
			
		||||
        config.rcc.pll_src = PllSource::Hsi;
 | 
			
		||||
        config.rcc.pll1 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV2),
 | 
			
		||||
            divq: Some(PllDiv::DIV4), // default clock chosen by SDMMCSEL. 200 Mhz
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
 | 
			
		||||
        config.rcc.sys = Sysclk::PLL1_P; // 400 Mhz
 | 
			
		||||
        config.rcc.ahb_pre = AHBPrescaler::DIV2; // 200 Mhz
 | 
			
		||||
        config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
        config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
 
 | 
			
		||||
@@ -40,17 +40,17 @@ fn main() -> ! {
 | 
			
		||||
    let mut config = Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hsi = Some(Hsi::Mhz64);
 | 
			
		||||
        config.rcc.hsi = Some(HSIPrescaler::DIV1);
 | 
			
		||||
        config.rcc.csi = true;
 | 
			
		||||
        config.rcc.pll_src = PllSource::Hsi;
 | 
			
		||||
        config.rcc.pll1 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV2),
 | 
			
		||||
            divq: Some(PllDiv::DIV8), // used by SPI3. 100Mhz.
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
 | 
			
		||||
        config.rcc.sys = Sysclk::PLL1_P; // 400 Mhz
 | 
			
		||||
        config.rcc.ahb_pre = AHBPrescaler::DIV2; // 200 Mhz
 | 
			
		||||
        config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
        config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
 
 | 
			
		||||
@@ -36,17 +36,17 @@ fn main() -> ! {
 | 
			
		||||
    let mut config = Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hsi = Some(Hsi::Mhz64);
 | 
			
		||||
        config.rcc.hsi = Some(HSIPrescaler::DIV1);
 | 
			
		||||
        config.rcc.csi = true;
 | 
			
		||||
        config.rcc.pll_src = PllSource::Hsi;
 | 
			
		||||
        config.rcc.pll1 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV2),
 | 
			
		||||
            divq: Some(PllDiv::DIV8), // used by SPI3. 100Mhz.
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
 | 
			
		||||
        config.rcc.sys = Sysclk::PLL1_P; // 400 Mhz
 | 
			
		||||
        config.rcc.ahb_pre = AHBPrescaler::DIV2; // 200 Mhz
 | 
			
		||||
        config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
        config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
 
 | 
			
		||||
@@ -23,18 +23,18 @@ async fn main(_spawner: Spawner) {
 | 
			
		||||
    let mut config = Config::default();
 | 
			
		||||
    {
 | 
			
		||||
        use embassy_stm32::rcc::*;
 | 
			
		||||
        config.rcc.hsi = Some(Hsi::Mhz64);
 | 
			
		||||
        config.rcc.hsi = Some(HSIPrescaler::DIV1);
 | 
			
		||||
        config.rcc.csi = true;
 | 
			
		||||
        config.rcc.hsi48 = true; // needed for USB
 | 
			
		||||
        config.rcc.pll_src = PllSource::Hsi;
 | 
			
		||||
        config.rcc.pll1 = Some(Pll {
 | 
			
		||||
            source: PllSource::HSI,
 | 
			
		||||
            prediv: PllPreDiv::DIV4,
 | 
			
		||||
            mul: PllMul::MUL50,
 | 
			
		||||
            divp: Some(PllDiv::DIV2),
 | 
			
		||||
            divq: None,
 | 
			
		||||
            divr: None,
 | 
			
		||||
        });
 | 
			
		||||
        config.rcc.sys = Sysclk::Pll1P; // 400 Mhz
 | 
			
		||||
        config.rcc.sys = Sysclk::PLL1_P; // 400 Mhz
 | 
			
		||||
        config.rcc.ahb_pre = AHBPrescaler::DIV2; // 200 Mhz
 | 
			
		||||
        config.rcc.apb1_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
        config.rcc.apb2_pre = APBPrescaler::DIV2; // 100 Mhz
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user