otg new

Author: burrbull

examples/analog-stopwatch-with-spi-ssd1306.rs

@@ -395,7 +395,7 @@ fn draw_seconds_hand(seconds: u32) -> impl Iterator<Item = Pixel<BinaryColor>> {
     // Add a fancy circle near the end of the hand
     let decoration = Circle::new(decoration_position, 3).into_styled(decoration_style);
 
-    hand.pixels().chain(decoration.pixels().into_iter())
+    hand.pixels().chain(decoration.pixels())
 }
 
 #[exception]

examples/usb-serial-irq.rs

@@ -36,14 +36,11 @@ fn main() -> ! {
 
     let gpioa = dp.GPIOA.split();
 
-    let usb = USB {
-        usb_global: dp.OTG_FS_GLOBAL,
-        usb_device: dp.OTG_FS_DEVICE,
-        usb_pwrclk: dp.OTG_FS_PWRCLK,
-        pin_dm: gpioa.pa11.into(),
-        pin_dp: gpioa.pa12.into(),
-        hclk: clocks.hclk(),
-    };
+    let usb = USB::new(
+        (dp.OTG_FS_GLOBAL, dp.OTG_FS_DEVICE, dp.OTG_FS_PWRCLK),
+        (gpioa.pa11, gpioa.pa12),
+        &clocks,
+    );
 
     *USB_BUS = Some(stm32f4xx_hal::otg_fs::UsbBusType::new(usb, EP_MEMORY));
     let usb_bus = USB_BUS.as_ref().unwrap();

examples/usb-serial-poll.rs

@@ -27,14 +27,11 @@ fn main() -> ! {
 
     let gpioa = dp.GPIOA.split();
 
-    let usb = USB {
-        usb_global: dp.OTG_FS_GLOBAL,
-        usb_device: dp.OTG_FS_DEVICE,
-        usb_pwrclk: dp.OTG_FS_PWRCLK,
-        pin_dm: gpioa.pa11.into(),
-        pin_dp: gpioa.pa12.into(),
-        hclk: clocks.hclk(),
-    };
+    let usb = USB::new(
+        (dp.OTG_FS_GLOBAL, dp.OTG_FS_DEVICE, dp.OTG_FS_PWRCLK),
+        (gpioa.pa11, gpioa.pa12),
+        &clocks,
+    );
 
     let usb_bus = UsbBus::new(usb, unsafe { &mut EP_MEMORY });
 

src/otg_fs.rs

@@ -6,7 +6,7 @@
 use crate::pac;
 
 use crate::gpio::alt::otg_fs as alt;
-use crate::rcc::{Enable, Reset};
+use crate::rcc::{Clocks, Enable, Reset};
 use fugit::HertzU32 as Hertz;
 
 pub use synopsys_usb_otg::UsbBus;
@@ -21,6 +21,23 @@ pub struct USB {
     pub hclk: Hertz,
 }
 
+impl USB {
+    pub fn new(
+        periphs: (pac::OTG_FS_GLOBAL, pac::OTG_FS_DEVICE, pac::OTG_FS_PWRCLK),
+        pins: (impl Into<alt::Dm>, impl Into<alt::Dp>),
+        clocks: &Clocks,
+    ) -> Self {
+        Self {
+            usb_global: periphs.0,
+            usb_device: periphs.1,
+            usb_pwrclk: periphs.2,
+            pin_dm: pins.0.into(),
+            pin_dp: pins.1.into(),
+            hclk: clocks.hclk(),
+        }
+    }
+}
+
 unsafe impl Sync for USB {}
 
 unsafe impl UsbPeripheral for USB {

src/otg_hs.rs

@@ -9,7 +9,7 @@
 use crate::pac;
 
 use crate::gpio::alt::otg_hs as alt;
-use crate::rcc::{Enable, Reset};
+use crate::rcc::{Clocks, Enable, Reset};
 use fugit::HertzU32 as Hertz;
 
 pub use synopsys_usb_otg::UsbBus;
@@ -24,6 +24,23 @@ pub struct USB {
     pub hclk: Hertz,
 }
 
+impl USB {
+    pub fn new(
+        periphs: (pac::OTG_HS_GLOBAL, pac::OTG_HS_DEVICE, pac::OTG_HS_PWRCLK),
+        pins: (impl Into<alt::Dm>, impl Into<alt::Dp>),
+        clocks: &Clocks,
+    ) -> Self {
+        Self {
+            usb_global: periphs.0,
+            usb_device: periphs.1,
+            usb_pwrclk: periphs.2,
+            pin_dm: pins.0.into(),
+            pin_dp: pins.1.into(),
+            hclk: clocks.hclk(),
+        }
+    }
+}
+
 unsafe impl Sync for USB {}
 
 unsafe impl UsbPeripheral for USB {