Utilize LDREX/STREX in GPIO configure functions

Piroro-hs · Piroro-hs · commit b30fe247662c · 2021-03-30T19:58:36.000+09:00
diff --git a/asm/asm.a b/asm/asm.a
diff --git a/asm/asm.rs b/asm/asm.rs
@@ -0,0 +1,28 @@
+#![feature(asm)]
+#![no_std]
+#![crate_type = "staticlib"]
+
+/// Perform volatile atomic `*ptr = *ptr & !bic | or;`
+#[no_mangle]
+pub unsafe extern "C" fn volatile_atomic_bic_or(ptr: *mut u32, bic: u32, or: u32) {
+    let mut res: u32;
+    while {
+        asm!(
+            "ldrex {0}, [{1}]",
+            "bics {0}, {2}",
+            "orrs {0}, {3}",
+            "strex {0}, {0}, [{1}]",
+            out(reg) res,
+            in(reg) ptr,
+            in(reg) bic,
+            in(reg) or,
+            options(nostack),
+        );
+        res != 0
+    } {}
+}
+
+#[panic_handler]
+fn panic(_: &core::panic::PanicInfo) -> ! {
+    loop {} // Now empty loop is safe for LLVM >=12!
+}
diff --git a/build.rs b/build.rs
@@ -0,0 +1,15 @@
+use std::{env, fs::copy, path::PathBuf};
+
+fn main() {
+    copy_asm_lib();
+    println!("cargo:rerun-if-changed=build.rs");
+}
+
+fn copy_asm_lib() {
+    let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
+    let name = env::var("CARGO_PKG_NAME").unwrap();
+    copy("asm/asm.a", out_dir.join(format!("lib{}.a", name))).unwrap();
+    println!("cargo:rustc-link-lib=static={}", name);
+    println!("cargo:rustc-link-search={}", out_dir.display());
+    println!("cargo:rerun-if-changed=asm/asm.a");
+}
diff --git a/codegen/src/codegen/gpio.rs b/codegen/src/codegen/gpio.rs
@@ -131,12 +131,11 @@ fn get_port_pac_module(port: &Port, feature: &str) -> &'static str {
 fn gen_pin(pin: &gpio::Pin) -> Result<()> {
     let nr = pin.number()?;
     let reset_mode = get_pin_reset_mode(pin)?;
-    let afr = if nr < 8 { 'L' } else { 'H' };
     let af_numbers = get_pin_af_numbers(pin)?;
 
     println!(
-        "                {} => {{ reset: {}, afr: {}, af: {:?} }},",
-        nr, reset_mode, afr, af_numbers,
+        "                {} => {{ reset: {}, af: {:?} }},",
+        nr, reset_mode, af_numbers,
     );
 
     Ok(())
diff --git a/examples/adc.rs b/examples/adc.rs
@@ -32,8 +32,8 @@ fn main() -> ! {
 
     // Set up pin PA0 as analog pin.
     // This pin is connected to the user button on the stm32f3discovery board.
-    let mut gpio_a = dp.GPIOA.split(&mut rcc.ahb);
-    let mut adc1_in1_pin = gpio_a.pa0.into_analog(&mut gpio_a.moder, &mut gpio_a.pupdr);
+    let gpio_a = dp.GPIOA.split(&mut rcc.ahb);
+    let mut adc1_in1_pin = gpio_a.pa0.into_analog();
 
     // Be aware that the values in the table below depend on the input of VREF.
     // To have a stable VREF input, put a condensator and a volt limiting diode in front of it.
diff --git a/examples/can.rs b/examples/can.rs
@@ -26,8 +26,8 @@ fn main() -> ! {
 
     let mut flash = dp.FLASH.constrain();
     let mut rcc = dp.RCC.constrain();
-    let mut gpiob = dp.GPIOB.split(&mut rcc.ahb);
-    let mut gpioa = dp.GPIOA.split(&mut rcc.ahb);
+    let gpiob = dp.GPIOB.split(&mut rcc.ahb);
+    let gpioa = dp.GPIOA.split(&mut rcc.ahb);
 
     let _clocks = rcc
         .cfgr
@@ -38,12 +38,8 @@ fn main() -> ! {
         .freeze(&mut flash.acr);
 
     // Configure CAN RX and TX pins (AF9)
-    let rx = gpioa
-        .pa11
-        .into_af9_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
-    let tx = gpioa
-        .pa12
-        .into_af9_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
+    let rx = gpioa.pa11.into_af9_push_pull();
+    let tx = gpioa.pa12.into_af9_push_pull();
 
     // Initialize the CAN peripheral
     let can = Can::new(dp.CAN, rx, tx, &mut rcc.apb1);
@@ -53,9 +49,7 @@ fn main() -> ! {
 
     let (mut tx, mut rx0, _rx1) = can.split();
 
-    let mut led0 = gpiob
-        .pb15
-        .into_push_pull_output(&mut gpiob.moder, &mut gpiob.otyper);
+    let mut led0 = gpiob.pb15.into_push_pull_output();
     led0.set_high().unwrap();
 
     let filter = CanFilter::from_mask(0b100, ID as u32);
diff --git a/examples/gpio_erased.rs b/examples/gpio_erased.rs
@@ -19,31 +19,15 @@ fn main() -> ! {
     let dp = pac::Peripherals::take().unwrap();
 
     let mut rcc = dp.RCC.constrain();
-    let mut gpiob = dp.GPIOB.split(&mut rcc.ahb);
-    let mut gpioc = dp.GPIOC.split(&mut rcc.ahb);
-    let mut gpiod = dp.GPIOD.split(&mut rcc.ahb);
+    let gpiob = dp.GPIOB.split(&mut rcc.ahb);
+    let gpioc = dp.GPIOC.split(&mut rcc.ahb);
+    let gpiod = dp.GPIOD.split(&mut rcc.ahb);
 
     let mut pin_array: [gpio::PXx<Input>; 4] = [
-        gpiob
-            .pb11
-            .into_floating_input(&mut gpiob.moder, &mut gpiob.pupdr)
-            .downgrade()
-            .downgrade(),
-        gpioc
-            .pc4
-            .into_floating_input(&mut gpioc.moder, &mut gpioc.pupdr)
-            .downgrade()
-            .downgrade(),
-        gpiod
-            .pd3
-            .into_floating_input(&mut gpiod.moder, &mut gpiod.pupdr)
-            .downgrade()
-            .downgrade(),
-        gpiod
-            .pd2
-            .into_floating_input(&mut gpiod.moder, &mut gpiod.pupdr)
-            .downgrade()
-            .downgrade(),
+        gpiob.pb11.into_floating_input().downgrade().downgrade(),
+        gpioc.pc4.into_floating_input().downgrade().downgrade(),
+        gpiod.pd3.into_floating_input().downgrade().downgrade(),
+        gpiod.pd2.into_floating_input().downgrade().downgrade(),
     ];
 
     hprintln!("Start scanning pin array").unwrap();
diff --git a/examples/gpio_interrupts.rs b/examples/gpio_interrupts.rs
@@ -29,22 +29,18 @@ fn main() -> ! {
     let mut rcc = device_peripherals.RCC.constrain();
     let mut syscfg = device_peripherals.SYSCFG.constrain(&mut rcc.apb2);
     let mut exti = device_peripherals.EXTI;
-    let mut gpioe = device_peripherals.GPIOE.split(&mut rcc.ahb);
-    let mut gpioa = device_peripherals.GPIOA.split(&mut rcc.ahb);
+    let gpioe = device_peripherals.GPIOE.split(&mut rcc.ahb);
+    let gpioa = device_peripherals.GPIOA.split(&mut rcc.ahb);
 
-    let mut led = gpioe
-        .pe9
-        .into_push_pull_output(&mut gpioe.moder, &mut gpioe.otyper);
+    let mut led = gpioe.pe9.into_push_pull_output();
     // Turn the led on so we know the configuration step occurred.
     led.toggle().expect("unable to toggle led in configuration");
 
     // Move the ownership of the led to the global LED
     cortex_m::interrupt::free(|cs| *LED.borrow(cs).borrow_mut() = Some(led));
 
     // Configuring the user button to trigger an interrupt when the button is pressed.
-    let mut user_button = gpioa
-        .pa0
-        .into_pull_down_input(&mut gpioa.moder, &mut gpioa.pupdr);
+    let mut user_button = gpioa.pa0.into_pull_down_input();
     user_button.make_interrupt_source(&mut syscfg);
     user_button.trigger_on_edge(&mut exti, Edge::Rising);
     user_button.enable_interrupt(&mut exti);
diff --git a/examples/i2c_scanner.rs b/examples/i2c_scanner.rs
@@ -25,19 +25,13 @@ fn main() -> ! {
     let mut rcc = dp.RCC.constrain();
     let clocks = rcc.cfgr.freeze(&mut flash.acr);
 
-    let mut gpiob = dp.GPIOB.split(&mut rcc.ahb);
+    let gpiob = dp.GPIOB.split(&mut rcc.ahb);
 
     // Configure I2C1
-    let mut scl =
-        gpiob
-            .pb6
-            .into_af4_open_drain(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
-    let mut sda =
-        gpiob
-            .pb7
-            .into_af4_open_drain(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
-    scl.internal_pull_up(&mut gpiob.pupdr, true);
-    sda.internal_pull_up(&mut gpiob.pupdr, true);
+    let mut scl = gpiob.pb6.into_af4_open_drain();
+    let mut sda = gpiob.pb7.into_af4_open_drain();
+    scl.internal_pull_up(true);
+    sda.internal_pull_up(true);
     let mut i2c = hal::i2c::I2c::new(
         dp.I2C1,
         (scl, sda),
diff --git a/examples/pwm.rs b/examples/pwm.rs
@@ -31,41 +31,21 @@ fn main() -> ! {
     let clocks = rcc.cfgr.sysclk(16u32.MHz()).freeze(&mut flash.acr);
 
     // Prep the pins we need in their correct alternate function
-    let mut gpioa = dp.GPIOA.split(&mut rcc.ahb);
-    let pa4 = gpioa
-        .pa4
-        .into_af2_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
-    let pa6 = gpioa
-        .pa6
-        .into_af2_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
-    let pa7 = gpioa
-        .pa7
-        .into_af2_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
-
-    let mut gpiob = dp.GPIOB.split(&mut rcc.ahb);
-    let pb0 = gpiob
-        .pb0
-        .into_af2_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
-    let pb1 = gpiob
-        .pb1
-        .into_af2_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
-    let pb4 = gpiob
-        .pb4
-        .into_af2_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
-    let pb5 = gpiob
-        .pb5
-        .into_af2_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrl);
-    let pb8 = gpiob
-        .pb8
-        .into_af1_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrh);
-    let pb10 = gpiob
-        .pb10
-        .into_af1_push_pull(&mut gpiob.moder, &mut gpiob.otyper, &mut gpiob.afrh);
-
-    let mut gpioc = dp.GPIOC.split(&mut rcc.ahb);
-    let pc10 = gpioc
-        .pc10
-        .into_af4_push_pull(&mut gpioc.moder, &mut gpioc.otyper, &mut gpioc.afrh);
+    let gpioa = dp.GPIOA.split(&mut rcc.ahb);
+    let pa4 = gpioa.pa4.into_af2_push_pull();
+    let pa6 = gpioa.pa6.into_af2_push_pull();
+    let pa7 = gpioa.pa7.into_af2_push_pull();
+
+    let gpiob = dp.GPIOB.split(&mut rcc.ahb);
+    let pb0 = gpiob.pb0.into_af2_push_pull();
+    let pb1 = gpiob.pb1.into_af2_push_pull();
+    let pb4 = gpiob.pb4.into_af2_push_pull();
+    let pb5 = gpiob.pb5.into_af2_push_pull();
+    let pb8 = gpiob.pb8.into_af1_push_pull();
+    let pb10 = gpiob.pb10.into_af1_push_pull();
+
+    let gpioc = dp.GPIOC.split(&mut rcc.ahb);
+    let pc10 = gpioc.pc10.into_af4_push_pull();
 
     // TIM3
     //
diff --git a/examples/serial_dma.rs b/examples/serial_dma.rs
@@ -19,15 +19,11 @@ fn main() -> ! {
     let mut rcc = dp.RCC.constrain();
     let clocks = rcc.cfgr.freeze(&mut flash.acr);
 
-    let mut gpioa = dp.GPIOA.split(&mut rcc.ahb);
+    let gpioa = dp.GPIOA.split(&mut rcc.ahb);
 
     let pins = (
-        gpioa
-            .pa9
-            .into_af7_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
-        gpioa
-            .pa10
-            .into_af7_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh),
+        gpioa.pa9.into_af7_push_pull(),
+        gpioa.pa10.into_af7_push_pull(),
     );
     let serial = Serial::usart1(dp.USART1, pins, 9600.Bd(), clocks, &mut rcc.apb2);
     let (tx, rx) = serial.split();
diff --git a/examples/spi.rs b/examples/spi.rs
@@ -22,7 +22,7 @@ fn main() -> ! {
 
     let mut flash = dp.FLASH.constrain();
     let mut rcc = dp.RCC.constrain();
-    let mut gpioa = dp.GPIOA.split(&mut rcc.ahb);
+    let gpioa = dp.GPIOA.split(&mut rcc.ahb);
 
     let clocks = rcc
         .cfgr
@@ -32,15 +32,9 @@ fn main() -> ! {
         .freeze(&mut flash.acr);
 
     // Configure pins for SPI
-    let sck = gpioa
-        .pa5
-        .into_af5_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
-    let miso = gpioa
-        .pa6
-        .into_af5_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
-    let mosi = gpioa
-        .pa7
-        .into_af5_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrl);
+    let sck = gpioa.pa5.into_af5_push_pull();
+    let miso = gpioa.pa6.into_af5_push_pull();
+    let mosi = gpioa.pa7.into_af5_push_pull();
 
     let spi_mode = Mode {
         polarity: Polarity::IdleLow,
diff --git a/examples/toggle.rs b/examples/toggle.rs
@@ -19,11 +19,9 @@ fn main() -> ! {
     let dp = pac::Peripherals::take().unwrap();
 
     let mut rcc = dp.RCC.constrain();
-    let mut gpioe = dp.GPIOE.split(&mut rcc.ahb);
+    let gpioe = dp.GPIOE.split(&mut rcc.ahb);
 
-    let mut led = gpioe
-        .pe13
-        .into_push_pull_output(&mut gpioe.moder, &mut gpioe.otyper);
+    let mut led = gpioe.pe13.into_push_pull_output();
 
     led.set_low().unwrap();
 
diff --git a/examples/usb_serial.rs b/examples/usb_serial.rs
@@ -35,29 +35,22 @@ fn main() -> ! {
     assert!(clocks.usbclk_valid());
 
     // Configure the on-board LED (LD10, south red)
-    let mut gpioe = dp.GPIOE.split(&mut rcc.ahb);
-    let mut led = gpioe
-        .pe13
-        .into_push_pull_output(&mut gpioe.moder, &mut gpioe.otyper);
+    let gpioe = dp.GPIOE.split(&mut rcc.ahb);
+    let mut led = gpioe.pe13.into_push_pull_output();
     led.set_low().ok(); // Turn off
 
-    let mut gpioa = dp.GPIOA.split(&mut rcc.ahb);
+    let gpioa = dp.GPIOA.split(&mut rcc.ahb);
 
     // F3 Discovery board has a pull-up resistor on the D+ line.
     // Pull the D+ pin down to send a RESET condition to the USB bus.
     // This forced reset is needed only for development, without it host
     // will not reset your device when you upload new firmware.
-    let mut usb_dp = gpioa
-        .pa12
-        .into_push_pull_output(&mut gpioa.moder, &mut gpioa.otyper);
+    let mut usb_dp = gpioa.pa12.into_push_pull_output();
     usb_dp.set_low().ok();
     delay(clocks.sysclk().0 / 100);
 
-    let usb_dm =
-        gpioa
-            .pa11
-            .into_af14_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
-    let usb_dp = usb_dp.into_af14_push_pull(&mut gpioa.moder, &mut gpioa.otyper, &mut gpioa.afrh);
+    let usb_dm = gpioa.pa11.into_af14_push_pull();
+    let usb_dp = usb_dp.into_af14_push_pull();
 
     let usb = Peripheral {
         usb: dp.USB,
diff --git a/src/gpio.rs b/src/gpio.rs
