*: cargo fmt

crawford · Apr 9, 2020 · e6029ac · e6029ac
1 parent 88dbe30
commit e6029ac
Show file tree

Hide file tree

Showing 8 changed files with 328 additions and 283 deletions.
diff --git a/src/cmu.rs b/src/cmu.rs
@@ -72,10 +72,8 @@ impl I2C0Clk {
     }
 }
 
-
 macro_rules! timerclk {
     ($TIMERnClk: ident, $timerN: ident) => {
-
         pub struct $TIMERnClk {
             _private: (),
         }
@@ -89,7 +87,7 @@ macro_rules! timerclk {
                 }
             }
         }
-    }
+    };
 }
 
 timerclk!(TIMER0Clk, timer0);

diff --git a/src/i2c.rs b/src/i2c.rs
@@ -48,7 +48,7 @@ impl I2C0WithClock {
     ) -> Result<I2C0WithScl<pins::PC11<Disabled>>, ()> {
         match route {
             registers::i2c0::routeloc0::SCLLOCW::LOC15 => (),
-            _ => return Result::Err(())
+            _ => return Result::Err(()),
         }
 
         Ok(I2C0WithScl {
@@ -75,7 +75,7 @@ impl<SCLP: EFM32Pin> I2C0WithScl<SCLP> {
     ) -> Result<ConfiguredI2C0, ()> {
         match route {
             registers::i2c0::routeloc0::SDALOCW::LOC15 => (),
-            _ => return Result::Err(())
+            _ => return Result::Err(()),
         }
 
         let sclroute = self.sclroute;

diff --git a/src/routing.rs b/src/routing.rs
@@ -16,7 +16,7 @@ pub trait HasLocForFunction<P, F> {
 mod per_function;
 mod per_peripheral;
 
-#[cfg(feature = "chip-efr32xg1")]
-mod efr32xg1;
 #[cfg(feature = "chip-efm32gg")]
 mod efm32gg;
+#[cfg(feature = "chip-efr32xg1")]
+mod efr32xg1;
diff --git a/src/routing/efm32gg.rs b/src/routing/efm32gg.rs
@@ -3,8 +3,8 @@
 //! members, so if anything is missing here that's present on another GG, it should be possible to
 //! just add it.)
 
-use crate::timer::{Timer0, Timer1, Timer2, Timer3, Channel0, Channel1, Channel2};
 use super::per_peripheral::timerperipheral_pin;
+use crate::timer::{Channel0, Channel1, Channel2, Timer0, Timer1, Timer2, Timer3};
 
 // Routes with pins on duplicate routes still need some macro adjustment
 

diff --git a/src/routing/efr32xg1.rs b/src/routing/efr32xg1.rs
@@ -2,8 +2,8 @@
 //! sheet](https://www.silabs.com/documents/public/data-sheets/efr32mg1-datasheet.pdf); Flex- and
 //! Blue Gecko appear to be the same.
 
-use crate::timer::{Timer0, Channel0, Channel1, Channel2};
 use super::per_function::timerchannel_pin;
+use crate::timer::{Channel0, Channel1, Channel2, Timer0};
 
 timerchannel_pin!(Timer0, Channel0, PA0, loc0, cc0loc, cc0pen);
 

diff --git a/src/routing/per_function.rs b/src/routing/per_function.rs
@@ -1,27 +1,27 @@
 #[macro_export]
 macro_rules! timerchannel_pin {
     ($TimerN: ident, $ChannelX: ident, $Pin: ident, $locI: ident, $ccXloc: ident, $ccXpen: ident) => {
+        impl super::HasLocForFunction<$TimerN, $ChannelX>
+            for crate::gpio::pins::$Pin<crate::gpio::Output>
+        {
+            unsafe fn configure() {
+                // FIXME https://github.com/chrysn/efm32gg-hal/issues/1
+                let reg = &mut *crate::timer::TimerChannel::<$TimerN, $ChannelX>::register();
+                cortex_m::interrupt::free(|_| {
+                    reg.routeloc0.modify(|_, w| w.$ccXloc().$locI());
+                    reg.routepen.modify(|_, w| w.$ccXpen().set_bit());
+                });
+            }
 
-impl super::HasLocForFunction<$TimerN, $ChannelX> for crate::gpio::pins::$Pin<crate::gpio::Output> {
-    unsafe fn configure() {
-        // FIXME https://github.com/chrysn/efm32gg-hal/issues/1
-        let reg = &mut *crate::timer::TimerChannel::<$TimerN, $ChannelX>::register();
-        cortex_m::interrupt::free(|_| {
-            reg.routeloc0.modify(|_, w| w.$ccXloc().$locI());
-            reg.routepen.modify(|_, w| w.$ccXpen().set_bit());
-        });
-    }
-
-    unsafe fn deconfigure() {
-        // FIXME https://github.com/chrysn/efm32gg-hal/issues/1
-        let reg = &mut *crate::timer::TimerChannel::<$TimerN, $ChannelX>::register();
-        cortex_m::interrupt::free(|_| {
-            reg.routepen.modify(|_, w| w.$ccXpen().clear_bit());
-        });
-    }
-}
-
-    }
+            unsafe fn deconfigure() {
+                // FIXME https://github.com/chrysn/efm32gg-hal/issues/1
+                let reg = &mut *crate::timer::TimerChannel::<$TimerN, $ChannelX>::register();
+                cortex_m::interrupt::free(|_| {
+                    reg.routepen.modify(|_, w| w.$ccXpen().clear_bit());
+                });
+            }
+        }
+    };
 }
 
 pub(crate) use timerchannel_pin;
diff --git a/src/routing/per_peripheral.rs b/src/routing/per_peripheral.rs
@@ -1,29 +1,32 @@
 #[macro_export]
 macro_rules! timerperipheral_pin {
     ($TimerN: ident, $ChannelX: ident, $Pin: ident, $is_locI: ident, $ccXpen: ident) => {
+        impl super::HasLocForFunction<$TimerN, $ChannelX>
+            for crate::gpio::pins::$Pin<crate::gpio::Output>
+        {
+            unsafe fn configure() {
+                // This is safe because it's read-only access
+                let reg = &mut *crate::timer::TimerChannel::<$TimerN, $ChannelX>::register();
+                assert!(
+                    reg.route.read().location().$is_locI(),
+                    "Pin was not adaequately pre-routed"
+                );
 
-impl super::HasLocForFunction<$TimerN, $ChannelX> for crate::gpio::pins::$Pin<crate::gpio::Output> {
-    unsafe fn configure() {
-        // This is safe because it's read-only access
-        let reg = &mut *crate::timer::TimerChannel::<$TimerN, $ChannelX>::register();
-        assert!(reg.route.read().location().$is_locI(), "Pin was not adaequately pre-routed");
+                // FIXME https://github.com/chrysn/efm32gg-hal/issues/1
+                cortex_m::interrupt::free(|_| {
+                    reg.route.modify(|_, w| w.$ccXpen().set_bit());
+                });
+            }
 
-        // FIXME https://github.com/chrysn/efm32gg-hal/issues/1
-        cortex_m::interrupt::free(|_| {
-            reg.route.modify(|_, w| w.$ccXpen().set_bit());
-        });
-    }
-
-    unsafe fn deconfigure() {
-        // FIXME https://github.com/chrysn/efm32gg-hal/issues/1
-        let reg = &mut *crate::timer::TimerChannel::<$TimerN, $ChannelX>::register();
-        cortex_m::interrupt::free(|_| {
-            reg.route.modify(|_, w| w.$ccXpen().clear_bit());
-        });
-    }
-}
-
-    }
+            unsafe fn deconfigure() {
+                // FIXME https://github.com/chrysn/efm32gg-hal/issues/1
+                let reg = &mut *crate::timer::TimerChannel::<$TimerN, $ChannelX>::register();
+                cortex_m::interrupt::free(|_| {
+                    reg.route.modify(|_, w| w.$ccXpen().clear_bit());
+                });
+            }
+        }
+    };
 }
 
 pub(crate) use timerperipheral_pin;