Tidy up USB support for STM32H735

Author: richardeoin

examples/usb_serial.rs

@@ -35,7 +35,7 @@ fn main() -> ! {
     ccdr.peripheral.kernel_usb_clk_mux(UsbClkSel::HSI48);
 
     // IO
-    #[cfg(not(feature = "rm0455"))]
+    #[cfg(any(feature = "rm0433", feature = "rm0399"))]
     let (pin_dm, pin_dp) = {
         let gpiob = dp.GPIOB.split(ccdr.peripheral.GPIOB);
         (
@@ -44,7 +44,7 @@ fn main() -> ! {
         )
     };
 
-    #[cfg(feature = "rm0455")]
+    #[cfg(any(feature = "rm0455", feature = "rm0468"))]
     let (pin_dm, pin_dp) = {
         let gpioa = dp.GPIOA.split(ccdr.peripheral.GPIOA);
         (

src/rcc/rec.rs

@@ -482,11 +482,11 @@ peripheral_reset_and_enable_control! {
     AHB1, "" => [
         Eth1Mac,
         #[cfg(any(feature = "rm0399"))] Art,
-        Adc12 [group clk: Adc(Variant) d3ccip "ADC"]
+        Adc12 [group clk: Adc(Variant) d3ccip "ADC"],
+        Usb1Otg [group clk: Usb d2ccip2 "USB"]
     ];
     #[cfg(any(feature = "rm0433", feature = "rm0399"))]
     AHB1, "" => [
-        Usb1Otg [group clk: Usb d2ccip2 "USB"],
         Usb2Otg [group clk: Usb]
     ];
     #[cfg(feature = "rm0455")]
@@ -495,10 +495,6 @@ peripheral_reset_and_enable_control! {
         Usb1Otg [group clk: Usb cdccip2 "USB"],
         Adc12 [group clk: Adc(Variant) srdccip "ADC"]
     ];
-    #[cfg(feature = "rm0468")]
-    AHB1, "" => [
-        Usb1Otg [kernel clk: Usb d2ccip2 "USB"]
-    ];
 
 
     #[cfg(all())]

src/usb_hs.rs

@@ -15,11 +15,13 @@ use crate::gpio::{
     gpiob::{PB0, PB1, PB10, PB11, PB12, PB13, PB5},
     gpioc::{PC0, PC2, PC3},
     gpioh::PH4,
-    gpioi::PI11,
     Alternate, AF10,
 };
 
-#[cfg(not(feature = "rm0455"))]
+#[cfg(not(feature = "rm0468"))]
+use crate::gpio::gpioi::PI11;
+
+#[cfg(any(feature = "rm0433", feature = "rm0399"))]
 use crate::gpio::{
     gpiob::{PB14, PB15},
     AF12,
@@ -38,7 +40,7 @@ pub struct USB1 {
     pub hclk: Hertz,
 }
 impl USB1 {
-    #[cfg(not(feature = "rm0455"))]
+    #[cfg(any(feature = "rm0433", feature = "rm0399"))]
     pub fn new(
         usb_global: stm32::OTG1_HS_GLOBAL,
         usb_device: stm32::OTG1_HS_DEVICE,
@@ -50,7 +52,7 @@ impl USB1 {
     ) -> Self {
         Self::new_unchecked(usb_global, usb_device, usb_pwrclk, prec, clocks)
     }
-    #[cfg(feature = "rm0455")]
+    #[cfg(any(feature = "rm0455", feature = "rm0468"))]
     pub fn new(
         usb_global: stm32::OTG1_HS_GLOBAL,
         usb_device: stm32::OTG1_HS_DEVICE,
@@ -79,15 +81,15 @@ impl USB1 {
     }
 }
 
-#[cfg(not(feature = "rm0455"))]
+#[cfg(any(feature = "rm0433", feature = "rm0399"))]
 pub struct USB2 {
     pub usb_global: stm32::OTG2_HS_GLOBAL,
     pub usb_device: stm32::OTG2_HS_DEVICE,
     pub usb_pwrclk: stm32::OTG2_HS_PWRCLK,
     pub prec: rcc::rec::Usb2Otg,
     pub hclk: Hertz,
 }
-#[cfg(not(feature = "rm0455"))]
+#[cfg(any(feature = "rm0433", feature = "rm0399"))]
 impl USB2 {
     pub fn new(
         usb_global: stm32::OTG2_HS_GLOBAL,
@@ -161,11 +163,11 @@ usb_peripheral! {
 }
 pub type Usb1BusType = UsbBus<USB1>;
 
-#[cfg(not(feature = "rm0455"))]
+#[cfg(any(feature = "rm0433", feature = "rm0399"))]
 usb_peripheral! {
     USB2, OTG2_HS_GLOBAL, usb2otgen, usb2otgrst
 }
-#[cfg(not(feature = "rm0455"))]
+#[cfg(any(feature = "rm0433", feature = "rm0399"))]
 pub type Usb2BusType = UsbBus<USB2>;
 
 pub struct USB1_ULPI {
@@ -178,9 +180,11 @@ pub struct USB1_ULPI {
 
 pub enum Usb1UlpiDirPin {
     PC2(PC2<Alternate<AF10>>),
+    #[cfg(not(feature = "rm0468"))]
     PI11(PI11<Alternate<AF10>>),
 }
 
+#[cfg(not(feature = "rm0468"))]
 impl From<PI11<Alternate<AF10>>> for Usb1UlpiDirPin {
     fn from(v: PI11<Alternate<AF10>>) -> Self {
         Usb1UlpiDirPin::PI11(v)