Merge pull request #38 from fudanchii/new-tomu-peripherals

Use Peripherals as struct name

Author: fudanchii

examples/blink.rs

@@ -7,7 +7,7 @@ use tomu::prelude::*;
 
 #[entry]
 fn main() -> ! {
-    let mut tomu = Tomu::from(EFM32HG::take().unwrap());
+    let mut tomu = Tomu::from(efm32hg::Peripherals::take().unwrap());
 
     tomu.watchdog.disable();
 

examples/devinfo_check.rs

@@ -7,7 +7,7 @@ use tomu::prelude::*;
 
 #[entry]
 fn main() -> ! {
-    let efm32 = EFM32HG::take().unwrap();
+    let efm32 = efm32hg::Peripherals::take().unwrap();
 
     let temp = efm32.DEVINFO.cal.read().temp();
     let flash_size = efm32.DEVINFO.msize.read().flash();

examples/pac_capsense.rs

@@ -46,7 +46,7 @@ static CHSWITCH: Mutex<Cell<u8>> = Mutex::new(Cell::new(1));
 
 #[entry]
 fn main() -> ! {
-    let efm32 = EFM32HG::take().unwrap();
+    let efm32 = efm32hg::Peripherals::take().unwrap();
 
     clock_setup(&efm32);
 
@@ -180,7 +180,7 @@ fn measure_stop() -> u16 {
     })
 }
 
-fn clock_setup(efm32: &EFM32HG) {
+fn clock_setup(efm32: &efm32hg::Peripherals) {
     efm32.CMU.hfperclken0.modify(|_, w| {
         w.acmp0().set_bit()
          .timer0().set_bit()
@@ -189,7 +189,7 @@ fn clock_setup(efm32: &EFM32HG) {
     });
 }
 
-fn acmp0_setup(efm32: &EFM32HG) {
+fn acmp0_setup(efm32: &efm32hg::Peripherals) {
     efm32.ACMP0.ctrl.write(|w| unsafe {
         w.fullbias().clear_bit()
          .halfbias().clear_bit()
@@ -213,7 +213,7 @@ fn acmp0_setup(efm32: &EFM32HG) {
     }
 }
 
-fn timer_setup(efm32: &EFM32HG) {
+fn timer_setup(efm32: &efm32hg::Peripherals) {
     efm32.TIMER0
         .ctrl
         .write(|w| w.presc().div1024().clksel().cc1());

examples/pac_rtc_interrupt.rs

@@ -21,44 +21,44 @@ static GREEN: Mutex<RefCell<Option<led::GreenLED>>> = Mutex::new(RefCell::new(No
 
 #[entry]
 fn main() -> ! {
-    let efm32hg = EFM32HG::take().unwrap();
+    let dp = efm32hg::Peripherals::take().unwrap();
 
     // Configure clock to RTC:
     //  * LFRCO ticks at 32768 Hz
     //  * No clock divider
-    efm32hg.CMU.hfcoreclken0.write(|w| w.le().set_bit());
-    efm32hg.CMU.oscencmd.write(|w| w.lfrcoen().set_bit());
-    efm32hg.CMU.lfapresc0.reset();
-    efm32hg.CMU.lfclksel.write(|w| w.lfa().lfrco());
+    dp.CMU.hfcoreclken0.write(|w| w.le().set_bit());
+    dp.CMU.oscencmd.write(|w| w.lfrcoen().set_bit());
+    dp.CMU.lfapresc0.reset();
+    dp.CMU.lfclksel.write(|w| w.lfa().lfrco());
 
     // Enable clock to RTC, ticking at 32 KiHz.
-    efm32hg.CMU.lfaclken0.write(|w| w.rtc().set_bit());
+    dp.CMU.lfaclken0.write(|w| w.rtc().set_bit());
 
     // Reset RTC
-    efm32hg.RTC.freeze.reset();
-    efm32hg.RTC.ctrl.reset();
-    efm32hg.RTC.ien.reset();
-    efm32hg.RTC.ifc
+    dp.RTC.freeze.reset();
+    dp.RTC.ctrl.reset();
+    dp.RTC.ien.reset();
+    dp.RTC.ifc
         .write(|w| w.comp0().set_bit().comp1().set_bit().of().set_bit());
-    efm32hg.RTC.comp0.reset();
-    efm32hg.RTC.comp1.reset();
+    dp.RTC.comp0.reset();
+    dp.RTC.comp1.reset();
 
     // Interrupt when matching custom compare value:
     // 65536 / 32768 Hz = 2 secs
-    efm32hg.RTC.comp0.write(|w| unsafe { w.comp0().bits(65_536) });
-    efm32hg.RTC.ien.modify(|_, w| w.comp0().set_bit());
+    dp.RTC.comp0.write(|w| unsafe { w.comp0().bits(65_536) });
+    dp.RTC.ien.modify(|_, w| w.comp0().set_bit());
 
     // Cap counter at `comp0` value.
-    efm32hg.RTC.ctrl.modify(|_, w| w.comp0top().set_bit());
+    dp.RTC.ctrl.modify(|_, w| w.comp0top().set_bit());
 
     // Enable RTC interrupts.
     efm32::NVIC::unpend(efm32::Interrupt::RTC);
     unsafe { efm32::NVIC::unmask(efm32::Interrupt::RTC) };
 
     // Start RTC.
-    efm32hg.RTC.ctrl.modify(|_, w| w.en().set_bit());
+    dp.RTC.ctrl.modify(|_, w| w.en().set_bit());
 
-    let mut tomu = Tomu::from(efm32hg);
+    let mut tomu = Tomu::from(dp);
     tomu.watchdog.disable();
 
     tomu.leds.red.off();

examples/toboot_config.rs

@@ -20,7 +20,7 @@ toboot_config! {
 
 #[entry]
 fn main() -> ! {
-    let mut tomu = Tomu::from(EFM32HG::take().unwrap());
+    let mut tomu = Tomu::from(efm32hg::Peripherals::take().unwrap());
 
     tomu.leds.red.off();
     tomu.leds.green.on();

examples/toggle_blink.rs

@@ -7,7 +7,7 @@ use tomu::prelude::*;
 
 #[entry]
 fn main() -> ! {
-    let mut tomu = Tomu::from(EFM32HG::take().unwrap());
+    let mut tomu = Tomu::from(efm32hg::Peripherals::take().unwrap());
 
     tomu.watchdog.disable();
 

src/efm32hg.rs

@@ -3,7 +3,7 @@ use crate::tomu::Tomu;
 
 /// Holds all available tomu peripherals
 #[allow(non_snake_case)]
-pub struct EFM32HG {
+pub struct Peripherals {
     /// Core peripheral: Cache and branch predictor maintenance operations
     pub CBP: efm32::CBP,
 
@@ -116,7 +116,7 @@ pub struct EFM32HG {
     pub WDOG: efm32::WDOG,
 }
 
-impl EFM32HG {
+impl Peripherals {
     /// Take `Peripherals`  instance, this is called `take`
     /// since we also take efm32's own `Peripherals` which will
     /// cause this method to panic if it's called more than once.

src/lib.rs

@@ -12,7 +12,6 @@ pub mod led;
 pub mod uart;
 pub mod usb;
 pub mod efm32hg;
-pub use efm32hg::EFM32HG;
 pub mod tomu;
 pub use tomu::Tomu;
 
@@ -33,6 +32,6 @@ pub mod prelude {
 
     pub use crate::led;
     pub use crate::led::LedTrait;
-    pub use crate::efm32hg::EFM32HG;
+    pub use crate::efm32hg;
     pub use crate::tomu::Tomu;
 }

src/tomu.rs

@@ -5,6 +5,7 @@ use efm32_hal::{
     delay::{CountProvider, Delay},
     systick::{SystickDelay, SystickExt},
 };
+use crate::efm32hg;
 use crate::led::LEDs;
 
 pub struct Tomu {
@@ -40,7 +41,7 @@ impl Tomu {
             },
         }
     }
-    pub fn from(efm32: crate::EFM32HG) -> Self {
+    pub fn from(efm32: efm32hg::Peripherals) -> Self {
         Self::from_parts(efm32.CMU, efm32.WDOG, efm32.GPIO, efm32.SYST)
     }
 }