Merge pull request #59 from braun-embedded/usb

Improve USB module

Author: arkorobotics

examples/usb_serial.rs

@@ -5,7 +5,7 @@
 extern crate panic_semihosting;
 
 use cortex_m_rt::entry;
-use stm32l0xx_hal::usb::{Peripheral, UsbBus};
+use stm32l0xx_hal::usb::{USB, UsbBus};
 use stm32l0xx_hal::{pac, prelude::*, rcc, syscfg::SYSCFG};
 use usb_device::prelude::*;
 use usbd_serial::{SerialPort, USB_CLASS_CDC};
@@ -16,15 +16,11 @@ fn main() -> ! {
 
     let mut rcc = dp.RCC.freeze(rcc::Config::hsi16());
     let mut syscfg = SYSCFG::new(dp.SYSCFG, &mut rcc);
-    rcc.enable_hsi48(&mut syscfg, dp.CRS);
+    let hsi48 = rcc.enable_hsi48(&mut syscfg, dp.CRS);
 
     let gpioa = dp.GPIOA.split(&mut rcc);
 
-    let usb = Peripheral {
-        usb: dp.USB,
-        pin_dm: gpioa.pa11,
-        pin_dp: gpioa.pa12,
-    };
+    let usb = USB::new(dp.USB, gpioa.pa11, gpioa.pa12, hsi48);
     let usb_bus = UsbBus::new(usb);
 
     let mut serial = SerialPort::new(&usb_bus);

src/usb.rs

@@ -12,23 +12,36 @@
 //! Please check out the USB examples in the `examples/` directory to see how it
 //! fits together.
 
-use crate::stm32::{RCC, USB};
+use crate::{
+    pac::{self, RCC},
+    rcc::HSI48,
+};
 use stm32_usbd::UsbPeripheral;
 
 use crate::gpio::gpioa::{PA11, PA12};
 use crate::gpio::{Floating, Input};
 pub use stm32_usbd::UsbBus;
 
-pub struct Peripheral {
-    pub usb: USB,
-    pub pin_dm: PA11<Input<Floating>>,
-    pub pin_dp: PA12<Input<Floating>>,
+
+pub struct USB(());
+
+impl USB {
+    pub fn new(
+        _:   pac::USB,
+        _dm: PA11<Input<Floating>>,
+        _dp: PA12<Input<Floating>>,
+        _:   HSI48,
+    )
+        -> Self
+    {
+        Self(())
+    }
 }
 
-unsafe impl Sync for Peripheral {}
+unsafe impl Sync for USB {}
 
-unsafe impl UsbPeripheral for Peripheral {
-    const REGISTERS: *const () = USB::ptr() as *const ();
+unsafe impl UsbPeripheral for USB {
+    const REGISTERS: *const () = pac::USB::ptr() as *const ();
     const DP_PULL_UP_FEATURE: bool = true;
     const EP_MEMORY: *const () = 0x4000_6000 as _;
     const EP_MEMORY_SIZE: usize = 1024;
@@ -53,4 +66,4 @@ unsafe impl UsbPeripheral for Peripheral {
     }
 }
 
-pub type UsbBusType = UsbBus<Peripheral>;
+pub type UsbBusType = UsbBus<USB>;