Remove stm32 module in favor of pac

Author: Sh3Rm4n

CHANGELOG.md

@@ -62,6 +62,9 @@ let clocks = rcc
   in alternate function mode ([#189])
 - GPIO internal resistor configuration is no longer encoded into pin typestate
   in input mode ([#189])
+- Remove `stm32` module. Use `use stm32f3xx_hal::pac` instead.
+  This module was a deprecated in [v0.5.0][] and is now subject for
+  removal. ([#220])
 
 ## [v0.6.1] - 2020-12-10
 
@@ -316,6 +319,7 @@ let clocks = rcc
 [defmt]: https://github.com/knurling-rs/defmt
 [filter]: https://defmt.ferrous-systems.com/filtering.html
 
+[#220]: https://github.com/stm32-rs/stm32f3xx-hal/pull/220
 [#217]: https://github.com/stm32-rs/stm32f3xx-hal/pull/217
 [#216]: https://github.com/stm32-rs/stm32f3xx-hal/pull/216
 [#211]: https://github.com/stm32-rs/stm32f3xx-hal/pull/211

examples/can.rs

@@ -9,8 +9,8 @@ use stm32f3xx_hal as hal;
 use cortex_m::asm;
 use cortex_m_rt::entry;
 
+use hal::pac;
 use hal::prelude::*;
-use hal::stm32;
 use hal::watchdog::IndependentWatchDog;
 
 use hal::can::{Can, CanFilter, CanFrame, CanId, Filter, Frame, Receiver, Transmitter};
@@ -22,7 +22,7 @@ const ID: u16 = 0b100;
 
 #[entry]
 fn main() -> ! {
-    let dp = stm32::Peripherals::take().unwrap();
+    let dp = pac::Peripherals::take().unwrap();
 
     let mut flash = dp.FLASH.constrain();
     let mut rcc = dp.RCC.constrain();

src/can.rs

@@ -15,12 +15,12 @@ pub use embedded_hal_can::{self, Filter, Frame, Id, Receiver, Transmitter};
 
 use crate::gpio::gpioa;
 use crate::gpio::{PushPull, AF9};
+use crate::pac;
 use crate::rcc::APB1;
-use crate::stm32;
 use nb::{self, Error};
 
 use core::sync::atomic::{AtomicU8, Ordering};
-pub use stm32::can::btr::LBKM_A;
+pub use pac::can::btr::LBKM_A;
 
 const EXID_MASK: u32 = 0b1_1111_1111_1100_0000_0000_0000_0000;
 const MAX_EXTENDED_ID: u32 = 0x1FFF_FFFF;
@@ -147,7 +147,7 @@ static FILTER_INDEX: AtomicU8 = AtomicU8::new(0);
 
 /// Controll Area Network (CAN) Peripheral
 pub struct Can {
-    can: stm32::CAN,
+    can: pac::CAN,
     _rx: gpioa::PA11<AF9<PushPull>>,
     _tx: gpioa::PA12<AF9<PushPull>>,
 }
@@ -160,7 +160,7 @@ pub struct CanFifo {
 
 /// A CAN transmitter which is used to send messages to the CAN network.
 pub struct CanTransmitter {
-    _can: stm32::CAN,
+    _can: pac::CAN,
     _rx: gpioa::PA11<AF9<PushPull>>,
     _tx: gpioa::PA12<AF9<PushPull>>,
 }
@@ -316,7 +316,7 @@ impl CanFilterData {
 impl Can {
     /// Initialize the CAN peripheral using the options specified by `opts`.
     pub fn new_with_opts(
-        can: stm32::CAN,
+        can: pac::CAN,
         rx: gpioa::PA11<AF9<PushPull>>,
         tx: gpioa::PA12<AF9<PushPull>>,
         apb1: &mut APB1,
@@ -362,7 +362,7 @@ impl Can {
     }
     /// Initialize the CAN Peripheral using default options from `CanOpts::default()`
     pub fn new(
-        can: stm32::CAN,
+        can: pac::CAN,
         rx: gpioa::PA11<AF9<PushPull>>,
         tx: gpioa::PA12<AF9<PushPull>>,
         apb1: &mut APB1,
@@ -399,7 +399,7 @@ impl Can {
     pub fn free(
         self,
     ) -> (
-        stm32::CAN,
+        pac::CAN,
         gpioa::PA11<AF9<PushPull>>,
         gpioa::PA12<AF9<PushPull>>,
     ) {
@@ -426,7 +426,7 @@ impl embedded_hal_can::Transmitter for CanTransmitter {
         &mut self,
         frame: &Self::Frame,
     ) -> Result<Option<Self::Frame>, nb::Error<Self::Error>> {
-        let can = unsafe { &*stm32::CAN::ptr() };
+        let can = unsafe { &*pac::CAN::ptr() };
 
         for tx_idx in 0..3 {
             let free = match tx_idx {
@@ -489,7 +489,7 @@ impl embedded_hal_can::Transmitter for CanTransmitter {
 
 impl Receiver for CanFifo {
     fn receive(&mut self) -> Result<Self::Frame, Error<Self::Error>> {
-        let can = unsafe { &*stm32::CAN::ptr() };
+        let can = unsafe { &*pac::CAN::ptr() };
 
         let rx = &can.rx[self.idx];
         if can.rfr[self.idx].read().fmp().bits() > 0 {
@@ -541,7 +541,7 @@ impl Receiver for CanFifo {
     /// Sets a filter in the next open filter register.
     fn set_filter(&mut self, filter: Self::Filter) {
         cortex_m::interrupt::free(|_cs| {
-            let can = unsafe { &*stm32::CAN::ptr() };
+            let can = unsafe { &*pac::CAN::ptr() };
 
             // Filter init mode
             can.fmr.modify(|_, w| w.finit().set_bit());

src/lib.rs

@@ -104,11 +104,7 @@ pub use stm32f3::stm32f373 as pac;
 #[cfg(feature = "svd-f3x4")]
 pub use stm32f3::stm32f3x4 as pac;
 
-/// Peripheral access
-#[deprecated(since = "0.5.0", note = "please use `pac` instead")]
-pub use crate::pac as stm32;
-
-// Enable use of interrupt macro
+/// Enable use of interrupt macro
 #[cfg(feature = "rt")]
 pub use crate::pac::interrupt;
 

src/spi.rs

@@ -21,7 +21,7 @@ use crate::stm32::spi1;
     feature = "stm32f303xe",
     feature = "stm32f398",
 ))]
-use crate::stm32::SPI4;
+use crate::pac::SPI4;
 
 #[cfg(any(feature = "stm32f373", feature = "stm32f378"))]
 use crate::gpio::gpioa::{PA1, PA10, PA12, PA13, PA2, PA3, PA8, PA9};