used/unused

Author: burrbull

src/fmpi2c.rs

@@ -143,7 +143,6 @@ impl<I2C: Instance> I2c<I2C> {
 impl<I2C: Instance> I2c<I2C> {
     fn i2c_init(&self, mode: impl Into<Mode>) {
         let mode = mode.into();
-        use core::cmp;
 
         // Make sure the I2C unit is disabled so we can configure it
         self.i2c.cr1().modify(|_, w| w.pe().clear_bit());
@@ -167,21 +166,21 @@ impl<I2C: Instance> I2c<I2C> {
         match mode {
             Mode::Standard { frequency } => {
                 presc = 3;
-                scll = cmp::max((((FREQ >> presc) >> 1) / frequency.raw()) - 1, 255) as u8;
+                scll = crate::max_u32((((FREQ >> presc) >> 1) / frequency.raw()) - 1, 255) as u8;
                 sclh = scll - 4;
                 sdadel = 2;
                 scldel = 4;
             }
             Mode::Fast { frequency } => {
                 presc = 1;
-                scll = cmp::max((((FREQ >> presc) >> 1) / frequency.raw()) - 1, 255) as u8;
+                scll = crate::max_u32((((FREQ >> presc) >> 1) / frequency.raw()) - 1, 255) as u8;
                 sclh = scll - 6;
                 sdadel = 2;
                 scldel = 3;
             }
             Mode::FastPlus { frequency } => {
                 presc = 0;
-                scll = cmp::max((((FREQ >> presc) >> 1) / frequency.raw()) - 4, 255) as u8;
+                scll = crate::max_u32((((FREQ >> presc) >> 1) / frequency.raw()) - 4, 255) as u8;
                 sclh = scll - 2;
                 sdadel = 0;
                 scldel = 2;

src/lib.rs

@@ -227,3 +227,20 @@ pub trait Steal {
     /// no stolen instances are passed to such software.
     unsafe fn steal() -> Self;
 }
+
+#[allow(unused)]
+const fn max_u32(first: u32, second: u32) -> u32 {
+    if second > first {
+        second
+    } else {
+        first
+    }
+}
+
+const fn min_u32(first: u32, second: u32) -> u32 {
+    if second < first {
+        second
+    } else {
+        first
+    }
+}

src/rcc/f4/mod.rs

@@ -558,7 +558,7 @@ impl CFGR {
         let sysclk = self.sysclk.unwrap_or(pllsrcclk);
         let sysclk_on_pll = sysclk != pllsrcclk;
 
-        let plls = self.pll_setup(pllsrcclk, sysclk_on_pll.then_some(sysclk));
+        let plls = pll::PllSetup::from_cfgr(&self, pllsrcclk, sysclk_on_pll.then_some(sysclk));
         let sysclk = if sysclk_on_pll {
             plls.pllsysclk.unwrap()
         } else {
@@ -586,7 +586,7 @@ impl CFGR {
 
         let pclk1 = self
             .pclk1
-            .unwrap_or_else(|| core::cmp::min(PCLK1_MAX, hclk));
+            .unwrap_or_else(|| crate::min_u32(PCLK1_MAX, hclk));
         let (ppre1_bits, ppre1) = match (hclk + pclk1 - 1) / pclk1 {
             0 => unreachable!(),
             1 => (0b000, 1u8),
@@ -603,7 +603,7 @@ impl CFGR {
 
         let pclk2 = self
             .pclk2
-            .unwrap_or_else(|| core::cmp::min(PCLK2_MAX, hclk));
+            .unwrap_or_else(|| crate::min_u32(PCLK2_MAX, hclk));
         let (ppre2_bits, ppre2) = match (hclk + pclk2 - 1) / pclk2 {
             0 => unreachable!(),
             1 => (0b000, 1u8),