Update stm32-usbd to v0.6.0

Author: Disasm

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"]
 

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() {