Merge #320

320: Update USB driver r=burrbull a=Disasm



Co-authored-by: Vadim Kaushan <admin@disasm.info>

Author: bors[bot]

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Breaking changes
 
+- Bump `stm32-usbd` dependency (`0.6.0`)
 - Use bit-banding for Peripheral enable/reset.
   Don't require APBs in initializers.
 - Rename `gpio::Edge::{RISING, FALLING, RISING_FALLING}` to `Rising`, `Falling`, `RisingFalling`, respectively
@@ -37,6 +38,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+- USB driver is now enabled by default for all devices supporting it
 - Updated `bxcan` dependency
 - Change internal implementation of pins using const generics
 - Use `cortex-m-rtic` instead of `cortex-m-rtfm` in the examples

Cargo.toml

@@ -12,7 +12,7 @@ edition = "2018"
 version = "0.7.0"
 
 [package.metadata.docs.rs]
-features = ["stm32f103", "rt", "stm32-usbd"]
+features = ["stm32f103", "rt"]
 default-target = "x86_64-unknown-linux-gnu"
 
 [dependencies]
@@ -36,8 +36,7 @@ version = "0.2.3"
 features = ["unproven"]
 
 [dependencies.stm32-usbd]
-version = "0.5.0"
-features = ["ram_access_1x16"]
+version = "0.6.0"
 optional = true
 
 [dev-dependencies]
@@ -79,7 +78,7 @@ doc = []
 rt = ["stm32f1/rt"]
 stm32f100 = ["stm32f1/stm32f100", "device-selected"]
 stm32f101 = ["stm32f1/stm32f101", "device-selected"]
-stm32f103 = ["stm32f1/stm32f103", "device-selected", "has-can"]
+stm32f103 = ["stm32f1/stm32f103", "device-selected", "has-can", "stm32-usbd"]
 stm32f105 = ["stm32f1/stm32f107", "device-selected", "connectivity"]
 stm32f107 = ["stm32f1/stm32f107", "device-selected", "connectivity"]
 

examples/usb_serial.rs

@@ -14,7 +14,7 @@ extern crate panic_semihosting;
 use cortex_m::asm::delay;
 use cortex_m_rt::entry;
 use stm32f1xx_hal::usb::{Peripheral, UsbBus};
-use stm32f1xx_hal::{prelude::*, stm32};
+use stm32f1xx_hal::{pac, prelude::*};
 use usb_device::prelude::*;
 use usbd_serial::{SerialPort, USB_CLASS_CDC};
 
@@ -23,7 +23,7 @@ fn main() -> ! {
     let dp = pac::Peripherals::take().unwrap();
 
     let mut flash = dp.FLASH.constrain();
-    let mut rcc = dp.RCC.constrain();
+    let rcc = dp.RCC.constrain();
 
     let clocks = rcc
         .cfgr

examples/usb_serial_interrupt.rs

@@ -7,9 +7,9 @@ extern crate panic_semihosting;
 
 use cortex_m::asm::{delay, wfi};
 use cortex_m_rt::entry;
-use stm32f1xx_hal::pac::{interrupt, Interrupt};
+use stm32f1xx_hal::pac::{self, interrupt, Interrupt, NVIC};
+use stm32f1xx_hal::prelude::*;
 use stm32f1xx_hal::usb::{Peripheral, UsbBus, UsbBusType};
-use stm32f1xx_hal::{prelude::*, stm32};
 use usb_device::{bus::UsbBusAllocator, prelude::*};
 use usbd_serial::{SerialPort, USB_CLASS_CDC};
 
@@ -19,11 +19,10 @@ static mut USB_DEVICE: Option<UsbDevice<UsbBusType>> = None;
 
 #[entry]
 fn main() -> ! {
-    let p = cortex_m::Peripherals::take().unwrap();
     let dp = pac::Peripherals::take().unwrap();
 
     let mut flash = dp.FLASH.constrain();
-    let mut rcc = dp.RCC.constrain();
+    let rcc = dp.RCC.constrain();
 
     let clocks = rcc
         .cfgr
@@ -71,10 +70,10 @@ fn main() -> ! {
         USB_DEVICE = Some(usb_dev);
     }
 
-    let mut nvic = p.NVIC;
-
-    nvic.enable(Interrupt::USB_HP_CAN_TX);
-    nvic.enable(Interrupt::USB_LP_CAN_RX0);
+    unsafe {
+        NVIC::unmask(Interrupt::USB_HP_CAN_TX);
+        NVIC::unmask(Interrupt::USB_LP_CAN_RX0);
+    }
 
     loop {
         wfi();

examples/usb_serial_rtic.rs

@@ -26,7 +26,7 @@ const APP: () = {
         static mut USB_BUS: Option<bus::UsbBusAllocator<UsbBusType>> = None;
 
         let mut flash = cx.device.FLASH.constrain();
-        let mut rcc = cx.device.RCC.constrain();
+        let rcc = cx.device.RCC.constrain();
 
         let clocks = rcc
             .cfgr

src/lib.rs

@@ -180,10 +180,7 @@ pub mod spi;
 pub mod time;
 #[cfg(feature = "device-selected")]
 pub mod timer;
-#[cfg(all(
-    feature = "stm32-usbd",
-    any(feature = "stm32f102", feature = "stm32f103")
-))]
+#[cfg(all(feature = "device-selected", feature = "stm32-usbd"))]
 pub mod usb;
 #[cfg(feature = "device-selected")]
 pub mod watchdog;

src/usb.rs

@@ -5,6 +5,7 @@
 //! for usage examples.
 
 use crate::pac::{RCC, USB};
+use crate::rcc::{Enable, Reset};
 use stm32_usbd::UsbPeripheral;
 
 use crate::gpio::gpioa::{PA11, PA12};
@@ -24,18 +25,17 @@ unsafe impl UsbPeripheral for Peripheral {
     const DP_PULL_UP_FEATURE: bool = false;
     const EP_MEMORY: *const () = 0x4000_6000 as _;
     const EP_MEMORY_SIZE: usize = 512;
+    const EP_MEMORY_ACCESS_2X16: bool = false;
 
     fn enable() {
-        let rcc = unsafe { (&*RCC::ptr()) };
+        unsafe {
+            let rcc = &*RCC::ptr();
 
-        cortex_m::interrupt::free(|_| {
             // Enable USB peripheral
-            rcc.apb1enr.modify(|_, w| w.usben().set_bit());
-
+            USB::enable(rcc);
             // Reset USB peripheral
-            rcc.apb1rstr.modify(|_, w| w.usbrst().set_bit());
-            rcc.apb1rstr.modify(|_, w| w.usbrst().clear_bit());
-        });
+            USB::reset(rcc);
+        }
     }
 
     fn startup_delay() {