Use critical_section::CriticalSection for GPIO configuration

Author: urdh

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - Updated the `cast` dependency from 0.2 to 0.3
+- Use `critical_section::CriticalSection` for GPIO configuration (breaking change)
 
 ### Added
 

Cargo.toml

@@ -33,6 +33,7 @@ targets = ["thumbv6m-none-eabi"]
 bare-metal = { version = "1.0.0" }
 cast = "0.3"
 cortex-m = "0.7"
+critical-section = "1.0"
 embedded-hal = { version = "0.2", features = ["unproven"] }
 stm32f0 = "0.14"
 nb = "1"

examples/adc_values.rs

@@ -7,8 +7,9 @@ use stm32f0xx_hal as hal;
 
 use crate::hal::{pac, prelude::*};
 
-use cortex_m::{interrupt::Mutex, peripheral::syst::SystClkSource::Core};
+use cortex_m::peripheral::syst::SystClkSource::Core;
 use cortex_m_rt::{entry, exception};
+use critical_section::Mutex;
 
 use core::{cell::RefCell, fmt::Write};
 
@@ -25,7 +26,7 @@ fn main() -> ! {
         hal::pac::Peripherals::take(),
         cortex_m::peripheral::Peripherals::take(),
     ) {
-        cortex_m::interrupt::free(move |cs| {
+        critical_section::with(move |cs| {
             let mut flash = p.FLASH;
             let mut rcc = p.RCC.configure().sysclk(8.mhz()).freeze(&mut flash);
 
@@ -46,8 +47,8 @@ fn main() -> ! {
             syst.enable_interrupt();
 
             // USART1 at PA9 (TX) and PA10(RX)
-            let tx = gpioa.pa9.into_alternate_af1(cs);
-            let rx = gpioa.pa10.into_alternate_af1(cs);
+            let tx = gpioa.pa9.into_alternate_af1(&cs);
+            let rx = gpioa.pa10.into_alternate_af1(&cs);
 
             // Initialiase UART
             let (mut tx, _) =
@@ -74,7 +75,7 @@ fn SysTick() {
     use core::ops::DerefMut;
 
     // Enter critical section
-    cortex_m::interrupt::free(|cs| {
+    critical_section::with(|cs| {
         // Get access to the Mutex protected shared data
         if let Some(ref mut shared) = SHARED.borrow(cs).borrow_mut().deref_mut() {
             // Read temperature data from internal sensor using ADC

examples/blinky.rs

@@ -17,7 +17,7 @@ fn main() -> ! {
         let gpioa = p.GPIOA.split(&mut rcc);
 
         // (Re-)configure PA1 as output
-        let mut led = cortex_m::interrupt::free(|cs| gpioa.pa1.into_push_pull_output(cs));
+        let mut led = critical_section::with(|cs| gpioa.pa1.into_push_pull_output(&cs));
 
         loop {
             // Turn PA1 on a million times in a row

examples/blinky_adc.rs

@@ -17,12 +17,12 @@ fn main() -> ! {
 
         let gpioa = p.GPIOA.split(&mut rcc);
 
-        let (mut led, mut an_in) = cortex_m::interrupt::free(move |cs| {
+        let (mut led, mut an_in) = critical_section::with(move |cs| {
             (
                 // (Re-)configure PA1 as output
-                gpioa.pa1.into_push_pull_output(cs),
+                gpioa.pa1.into_push_pull_output(&cs),
                 // (Re-)configure PA0 as analog input
-                gpioa.pa0.into_analog(cs),
+                gpioa.pa0.into_analog(&cs),
             )
         });
 

examples/blinky_delay.rs

@@ -18,7 +18,7 @@ fn main() -> ! {
         let gpioa = p.GPIOA.split(&mut rcc);
 
         // (Re-)configure PA1 as output
-        let mut led = cortex_m::interrupt::free(move |cs| gpioa.pa1.into_push_pull_output(cs));
+        let mut led = critical_section::with(move |cs| gpioa.pa1.into_push_pull_output(&cs));
 
         // Get delay provider
         let mut delay = Delay::new(cp.SYST, &rcc);

examples/blinky_multiple.rs

@@ -18,12 +18,12 @@ fn main() -> ! {
         let gpioa = p.GPIOA.split(&mut rcc);
         let gpiob = p.GPIOB.split(&mut rcc);
 
-        let (led1, led2) = cortex_m::interrupt::free(move |cs| {
+        let (led1, led2) = critical_section::with(move |cs| {
             (
                 // (Re-)configure PA1 as output
-                gpioa.pa1.into_push_pull_output(cs),
+                gpioa.pa1.into_push_pull_output(&cs),
                 // (Re-)configure PB1 as output
-                gpiob.pb1.into_push_pull_output(cs),
+                gpiob.pb1.into_push_pull_output(&cs),
             )
         });
 

examples/blinky_timer.rs

@@ -17,7 +17,7 @@ fn main() -> ! {
         let gpioa = p.GPIOA.split(&mut rcc);
 
         // (Re-)configure PA1 as output
-        let mut led = cortex_m::interrupt::free(move |cs| gpioa.pa1.into_push_pull_output(cs));
+        let mut led = critical_section::with(move |cs| gpioa.pa1.into_push_pull_output(&cs));
 
         // Set up a timer expiring after 1s
         let mut timer = Timer::tim1(p.TIM1, Hertz(1), &mut rcc);

examples/blinky_timer_irq.rs

@@ -16,7 +16,8 @@ use crate::hal::{
 use cortex_m_rt::entry;
 
 use core::cell::RefCell;
-use cortex_m::{interrupt::Mutex, peripheral::Peripherals as c_m_Peripherals};
+use cortex_m::peripheral::Peripherals as c_m_Peripherals;
+use critical_section::Mutex;
 
 // A type definition for the GPIO pin to be used for our LED
 type LEDPIN = gpioa::PA5<Output<PushPull>>;
@@ -35,14 +36,14 @@ fn TIM7() {
     static mut INT: Option<Timer<TIM7>> = None;
 
     let led = LED.get_or_insert_with(|| {
-        cortex_m::interrupt::free(|cs| {
+        critical_section::with(|cs| {
             // Move LED pin here, leaving a None in its place
             GLED.borrow(cs).replace(None).unwrap()
         })
     });
 
     let int = INT.get_or_insert_with(|| {
-        cortex_m::interrupt::free(|cs| {
+        critical_section::with(|cs| {
             // Move LED pin here, leaving a None in its place
             GINT.borrow(cs).replace(None).unwrap()
         })
@@ -55,7 +56,7 @@ fn TIM7() {
 #[entry]
 fn main() -> ! {
     if let (Some(mut p), Some(cp)) = (Peripherals::take(), c_m_Peripherals::take()) {
-        cortex_m::interrupt::free(move |cs| {
+        critical_section::with(move |cs| {
             let mut rcc = p
                 .RCC
                 .configure()
@@ -68,7 +69,7 @@ fn main() -> ! {
             let gpioa = p.GPIOA.split(&mut rcc);
 
             // (Re-)configure PA5 as output
-            let led = gpioa.pa5.into_push_pull_output(cs);
+            let led = gpioa.pa5.into_push_pull_output(&cs);
 
             // Move the pin into our global storage
             *GLED.borrow(cs).borrow_mut() = Some(led);

examples/dac.rs

@@ -24,7 +24,7 @@ fn main() -> ! {
         let mut rcc = dp.RCC.configure().sysclk(8.mhz()).freeze(&mut dp.FLASH);
         let gpioa = dp.GPIOA.split(&mut rcc);
 
-        let pa4 = cortex_m::interrupt::free(move |cs| gpioa.pa4.into_analog(cs));
+        let pa4 = critical_section::with(move |cs| gpioa.pa4.into_analog(&cs));
 
         let mut dac = dac(dp.DAC, pa4, &mut rcc);