fix1

Author: burrbull

.zed/settings.json

@@ -9,6 +9,10 @@
           "allTargets": false,
           "targets": "thumbv7em-none-eabihf"
         }
+      },
+      "binary": {
+        "path": "/home/burrbull/Programs/rust-analyzer-x86_64-unknown-linux-gnu",
+        "args": []
       }
     }
   }

Cargo.toml

@@ -620,6 +620,7 @@ stm32f732 = ["svd-f732"]
 stm32f733 = ["svd-f733"]
 stm32f745 = ["svd-f745"]
 stm32f746 = ["svd-f746"]
+stm32f750 = ["svd-f750"]
 stm32f756 = ["svd-f756"]
 stm32f765 = ["svd-f765"]
 stm32f767 = ["svd-f767"]
@@ -632,21 +633,21 @@ svd-f722 = ["f7", "stm32f7?/stm32f722", "gpio-f72x"]
 svd-f723 = ["f7", "stm32f7?/stm32f723", "gpio-f72x", "usb_hs_phy"]
 svd-f732 = ["f7", "stm32f7?/stm32f732", "gpio-f72x"]
 svd-f733 = ["f7", "stm32f7?/stm32f733", "gpio-f72x", "usb_hs_phy"]
-svd-f730 = ["f7", "stm32f7?/stm32f730", "gpio-f72x", "usb_hs_phy"]
+svd-f730 = ["f7", "stm32f7?/stm32f730", "gpio-f72x", "aes", "usb_hs_phy"]
 svd-f745 = ["f7", "stm32f7?/stm32f745", "gpio-f746"]
 svd-f746 = ["f7", "stm32f7?/stm32f746", "gpio-f746"]
+svd-f750 = ["f7", "stm32f7?/stm32f750", "gpio-f746"]
 svd-f756 = ["f7", "stm32f7?/stm32f756", "gpio-f746"]
 svd-f765 = ["f7", "stm32f7?/stm32f765", "gpio-f76x"]
-svd-f767 = ["f7", "stm32f7?/stm32f767", "gpio-f76x"]
-svd-f769 = ["f7", "stm32f7?/stm32f769", "gpio-f76x"]
-svd-f777 = ["f7", "stm32f7?/stm32f777", "gpio-f76x"]
-svd-f778 = ["f7", "stm32f7?/stm32f778", "gpio-f76x"]
-svd-f779 = ["f7", "stm32f7?/stm32f779", "gpio-f76x"]
+svd-f767 = ["f7", "stm32f7?/stm32f767", "gpio-f76x", "dsihost", "can3", "mdios"]
+svd-f769 = ["f7", "stm32f7?/stm32f769", "gpio-f76x", "dsihost", "can3", "mdios"]
+svd-f777 = ["f7", "stm32f7?/stm32f777", "gpio-f76x", "dsihost", "can3", "mdios"]
+svd-f778 = ["f7", "stm32f7?/stm32f778", "gpio-f76x", "dsihost", "can3", "mdios"]
+svd-f779 = ["f7", "stm32f7?/stm32f779", "gpio-f76x", "dsihost", "can3", "mdios"]
 
 gpio-f72x = [
     "adc2",
     "adc3",
-    "aes",
     "can1",
     "fmc",
     "gpioc",
@@ -770,10 +771,8 @@ gpio-f76x = [
     "can1",
     "can2",
     "cryp",
-    "can3",
     "dcmi",
     "dfsdm1",
-    "dsihost",
     "eth",
     "fmc",
     "gpioc",
@@ -795,7 +794,6 @@ gpio-f76x = [
     "i2s3",
     "lptim1",
     "ltdc",
-    "mdios",
     "quadspi",
     "rtc",
     "sai1",

src/gpio/alt/f7.rs

@@ -57,7 +57,7 @@ pub mod can2 {
     }
 }
 
-#[cfg(feature = "gpio-f76x")]
+#[cfg(feature = "can3")]
 pub mod can3 {
     use super::*;
 
@@ -391,7 +391,7 @@ pub mod dfsdm1 {
     }
 }
 
-#[cfg(feature = "gpio-f76x")]
+#[cfg(feature = "dsihost")]
 pub mod dsihost {
     use super::*;
 

src/lib.rs

@@ -80,6 +80,9 @@ pub use stm32f7::stm32f745 as pac;
 #[cfg(feature = "svd-f746")]
 pub use stm32f7::stm32f746 as pac;
 
+#[cfg(feature = "svd-f750")]
+pub use stm32f7::stm32f750 as pac;
+
 #[cfg(feature = "svd-f756")]
 pub use stm32f7::stm32f756 as pac;
 
@@ -289,6 +292,7 @@ const fn max_u32(first: u32, second: u32) -> u32 {
     }
 }
 
+#[cfg(feature = "f4")]
 const fn min_u32(first: u32, second: u32) -> u32 {
     if second < first {
         second

src/pacext.rs

@@ -9,6 +9,7 @@ pub mod uart;
 #[path = "./pacext/uart_v3.rs"]
 pub mod uart;
 
+#[cfg(feature = "f4")]
 macro_rules! wrap_r {
     (pub trait $TrR:ident {
         $(fn $f:ident(&self $(, $n:ident: u8)?) -> $fr:path;)*
@@ -26,8 +27,10 @@ macro_rules! wrap_r {
         }
     };
 }
+#[cfg(feature = "f4")]
 pub(crate) use wrap_r;
 
+#[cfg(feature = "f4")]
 macro_rules! wrap_w {
     (pub trait $TrR:ident {
         $(fn $f:ident(&mut self $(, $n:ident: u8)?) -> $fr:path;)*
@@ -46,6 +49,7 @@ macro_rules! wrap_w {
         }
     };
 }
+#[cfg(feature = "f4")]
 pub(crate) use wrap_w;
 
 macro_rules! impl_reg {
@@ -60,6 +64,7 @@ macro_rules! impl_reg {
 }
 pub(crate) use impl_reg;
 
+#[cfg(feature = "f4")]
 macro_rules! impl_read {
     ($($f:ident $(: $n:ident)? -> $fty:path;)*) => {
         $(
@@ -70,8 +75,10 @@ macro_rules! impl_read {
         )*
     };
 }
+#[cfg(feature = "f4")]
 pub(crate) use impl_read;
 
+#[cfg(feature = "f4")]
 macro_rules! impl_write {
     ($($f:ident $(: $n:ident)? -> $fty:path;)*) => {
         $(
@@ -82,4 +89,5 @@ macro_rules! impl_write {
         )*
     };
 }
+#[cfg(feature = "f4")]
 pub(crate) use impl_write;

src/pacext/uart_v3.rs

@@ -1,4 +1,4 @@
-use crate::{sealed, Sealed};
+use crate::Sealed;
 
 use super::*;
 use crate::pac::usart1;
@@ -15,41 +15,23 @@ pub trait UartRB: Sealed {
     fn gtpr(&self) -> &usart1::GTPR;
 }
 
-impl Sealed for usart1::RegisterBlock {}
-impl UartRB for usart1::RegisterBlock {
-    fn cr1(&self) -> &usart1::CR1 {
-        self.cr1()
-    }
-
-    fn rdr(&self) -> &usart1::RDR {
-        self.rdr()
-    }
-
-    fn tdr(&self) -> &usart1::TDR {
-        self.tdr()
-    }
-
-    fn brr(&self) -> &usart1::BRR {
-        self.brr()
-    }
-
-    fn icr(&self) -> &usart1::ICR {
-        self.icr()
-    }
-
-    fn isr(&self) -> &usart1::ISR {
-        self.isr()
-    }
-
-    fn cr2(&self) -> &usart1::CR2 {
-        self.cr2()
-    }
-
-    fn cr3(&self) -> &usart1::CR3 {
-        self.cr3()
-    }
-
-    fn gtpr(&self) -> &usart1::GTPR {
-        self.gtpr()
-    }
+macro_rules! impl_ext {
+    ($(#[$attr:meta])* $uart:ident) => {
+        impl Sealed for $uart::RegisterBlock {}
+        impl UartRB for $uart::RegisterBlock {
+            impl_reg! {
+                cr1 -> &usart1::CR1;
+                rdr -> &usart1::RDR;
+                tdr -> &usart1::TDR;
+                brr -> &usart1::BRR;
+                icr -> &usart1::ICR;
+                isr -> &usart1::ISR;
+                cr2 -> &usart1::CR2;
+                cr3 -> &usart1::CR3;
+                gtpr -> &usart1::GTPR;
+            }
+        }
+    };
 }
+
+impl_ext!(usart1);

src/rcc/f7/enable.rs

@@ -154,6 +154,12 @@ bus! {
     SAI2 => (APB2, sai2en, sai2lpen, sai2rst), // 23
 }
 
+#[cfg(feature = "svd-f730")]
+bus! {
+    AES => (AHB2, aesen, aeslpen, aesrst), // 4
+    USBPHYC => (APB2, usbphycen,, usbphycrst), // 31
+}
+
 #[cfg(any(
     feature = "svd-f730",
     feature = "svd-f722",
@@ -162,16 +168,13 @@ bus! {
     feature = "svd-f733",
 ))]
 bus! {
-    AES => (AHB2, aesen, aeslpen, aesrst), // 4
-
     SDMMC2 => (APB2, sdmmc2en, sdmmc2lpen, sdmmc2rst), // 7
-    USBPHYC => (APB2, usbphycen,, usbphycrst), // 31
 }
 
 #[cfg(any(
     feature = "svd-f745",
-    //feature = "svd-f750",
     feature = "svd-f746",
+    feature = "svd-f750",
     feature = "svd-f756",
     feature = "svd-f765",
     feature = "svd-f767",
@@ -207,10 +210,20 @@ bus! {
 ))]
 bus! {
     JPEG => (AHB2, jpegen, jpeglpen,), // 1
+}
 
+#[cfg(feature = "can3")]
+bus! {
     CAN3 => (APB1, can3en, can3lpen, can3rst), // 13
+}
 
+#[cfg(feature = "dsihost")]
+bus! {
     DSI => (APB2, dsien, dsilpen, dsirst), // 27
+}
+
+#[cfg(feature = "mdios")]
+bus! {
     MDIOS => (APB2, mdioen, mdiolpen, mdiorst), // 30
 }
 

src/spi.rs

@@ -264,11 +264,7 @@ macro_rules! spi {
 #[cfg(feature = "spi1")]
 spi! { pac::SPI1: Spi1, SpiSlave1 }
 #[cfg(feature = "spi2")]
-#[cfg(not(any(
-    //feature = "svd-f750",
-    feature = "svd-f746",
-    feature = "svd-f756",
-)))]
+#[cfg(not(any(feature = "svd-f746", feature = "svd-f750", feature = "svd-f756",)))]
 spi! { pac::SPI2: Spi2, SpiSlave2 }
 #[cfg(feature = "spi3")]
 #[cfg(not(any(feature = "svd-f745", feature = "svd-f765")))]