Added h523/h533 gpio module

Author: Henrik Snöman

Cargo.toml

@@ -29,11 +29,12 @@ rm0481 = []                 # STM32H52x/6x/7x
 
 # Different subfamily groups have different selections of identical peripherals
 h56x_h573 = ["gpio-h56x_h573"]         # STM32H56x/STM32H573
-h523_h533 = ["gpio-h56x_h573"]         # STM32H523/STM32H533
+h523_h533 = ["gpio-h523_h533"]         # STM32H523/STM32H533
 
 # Different subfamily groups have different GPIOs available and different alternate functions
 # available
 gpio-h503 = []
+gpio-h523_h533 = []
 gpio-h56x_h573 = []
 
 # Some peripherals are only present on specific MCUs within a subfamily group

src/gpio.rs

@@ -167,7 +167,7 @@ pub struct PushPull;
 /// Analog mode (type state)
 pub struct Analog;
 
-/// JTAG/SWD mote (type state)
+/// JTAG/SWD mode (type state)
 pub type Debugger = Alternate<0, PushPull>;
 
 mod marker {

src/gpio/gpio_def.rs

@@ -133,23 +133,187 @@ mod h503 {
 
     impl<const P: char> Gpio<P> {
         pub(crate) const fn ptr() -> *const crate::pac::gpioa::RegisterBlock {
-            match P {
-                'A' => crate::pac::GPIOA::ptr(),
-                'B' => crate::pac::GPIOB::ptr() as _,
-                'C' => crate::pac::GPIOC::ptr() as _,
-                'D' => crate::pac::GPIOD::ptr() as _,
-                'H' => crate::pac::GPIOH::ptr() as _,
-                _ => panic!("Unknown GPIO port"),
+            const {
+                match P {
+                    'A' => crate::pac::GPIOA::ptr(),
+                    'B' => crate::pac::GPIOB::ptr() as _,
+                    'C' => crate::pac::GPIOC::ptr() as _,
+                    'D' => crate::pac::GPIOD::ptr() as _,
+                    'H' => crate::pac::GPIOH::ptr() as _,
+                    _ => panic!("Unknown GPIO port"),
+                }
+            }
+        }
+    }
+}
+
+#[cfg(feature = "gpio-h523_h533")]
+pub use h523_h533::*;
+
+#[cfg(feature = "gpio-h523_h533")]
+mod h523_h533 {
+    use super::Gpio;
+
+    gpio!(GPIOA, gpioa, Gpioa, PA, 'A', PAn, [
+        PA0: (pa0, 0, [1, 2, 3, 4, 5, 6, 7, 8, 9, 14, 15]),
+        PA1: (pa1, 1, [1, 2, 4, 5, 6, 7, 8, 9, 14, 15]),
+        PA2: (pa2, 2, [1, 2, 3, 4, 5, 7, 15]),
+        PA3: (pa3, 3, [1, 2, 3, 4, 5, 6, 7, 15]),
+        PA4: (pa4, 4, [2, 3, 4, 5, 6, 7, 13, 15]),
+        PA5: (pa5, 5, [1, 3, 5, 13, 14, 15]),
+        PA6: (pa6, 6, [1, 2, 3, 5, 6, 13, 15]),
+        PA7: (pa7, 7, [1, 2, 3, 5, 10, 13, 15]),
+        PA8: (pa8, 8, [0, 1, 3, 4, 5, 6, 7, 9, 10, 12, 13, 15]),
+        PA9: (pa9, 9, [1, 3, 4, 5, 7, 12, 13, 15]),
+        PA10: (pa10, 10, [1, 3, 4, 6, 7, 9, 12, 13, 15]),
+        PA11: (pa11, 11, [1, 3, 5, 6, 7, 9, 10, 15]),
+        PA12: (pa12, 12, [1, 3, 5, 6, 7, 9, 10, 15]),
+        PA13: (pa13, 13, [0, 15], crate::gpio::Debugger),
+        PA14: (pa14, 14, [0, 15], crate::gpio::Debugger),
+        PA15: (pa15, 15, [0, 1, 4, 5, 6, 7, 8, 9, 12, 13, 14, 15], crate::gpio::Debugger),
+    ]);
+
+    gpio!(GPIOB, gpiob, Gpiob, PB, 'B', PBn, [
+        PB0: (pb0, 0, [1, 2, 3, 5, 6, 7, 8, 15]),
+        PB1: (pb1, 1, [1, 2, 3, 4, 5, 6, 7, 15]),
+        PB2: (pb2, 2, [0, 3, 4, 5, 6, 7, 9, 10, 12, 15]),
+        PB3: (pb3, 3, [0, 1, 3, 4, 5, 6, 8, 9, 10, 14, 15], crate::gpio::Debugger),
+        PB4: (pb4, 4, [0, 2, 3, 4, 5, 6, 7, 9, 10, 13, 15], crate::gpio::Debugger),
+        PB5: (pb5, 5, [2, 3, 4, 5, 6, 7, 9, 10, 13, 14, 15]),
+        PB6: (pb6, 6, [2, 3, 4, 5, 6, 7, 8, 9, 10, 13, 14, 15]),
+        PB7: (pb7, 7, [2, 3, 4, 5, 6, 7, 8, 9, 12, 13, 15]),
+        PB8: (pb8, 8, [2, 3, 4, 5, 6, 7, 8, 9, 12, 13, 15]),
+        PB9: (pb9, 9, [2, 3, 4, 5, 6, 7, 8, 9, 12, 13, 15]),
+        PB10: (pb10, 10, [1, 2, 3, 4, 5, 7, 9, 15]),
+        PB12: (pb12, 12, [1, 2, 3, 4, 5, 6, 7, 9, 14, 15]),
+        PB13: (pb13, 13, [1, 2, 3, 4, 5, 7, 8, 9, 12, 14, 15]),
+        PB14: (pb14, 14, [1, 2, 3, 4, 5, 7, 8, 15]),
+        PB15: (pb15, 15, [0, 1, 2, 3, 4, 5, 6, 8, 10, 13, 14, 15]),
+    ]);
+
+    gpio!(GPIOC, gpioc, Gpioc, PC, 'C', PCn, [
+        PC0: (pc0, 0, [6, 7, 9, 10, 15]),
+        PC1: (pc1, 1, [0, 5, 6, 10, 15]),
+        PC2: (pc2, 2, [0, 2, 5, 6, 9, 15]),
+        PC3: (pc3, 3, [0, 3, 5, 6, 9, 15]),
+        PC4: (pc4, 4, [1, 3, 5, 7, 15]),
+        PC5: (pc5, 5, [1, 4, 6, 10, 15]),
+        PC6: (pc6, 6, [2, 3, 5, 7, 8, 9, 10, 11, 12, 13, 15]),
+        PC7: (pc7, 7, [0, 2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 15]), //TRGIO (AF0) was missing from autogenerated code
+        PC8: (pc8, 8, [0, 2, 3, 7, 8, 9, 10, 11, 12, 13, 15]),
+        PC9: (pc9, 9, [0, 2, 3, 4, 5, 8, 9, 11, 12, 13, 15]),
+        PC10: (pc10, 10, [3, 6, 7, 8, 9, 12, 13, 15]),
+        PC11: (pc11, 11, [3, 6, 7, 8, 9, 12, 13, 15]),
+        PC12: (pc12, 12, [0, 2, 3, 6, 7, 8, 12, 13, 15]),
+        PC13: (pc13, 13, [15]),
+        PC14: (pc14, 14, [15]),
+        PC15: (pc15, 15, [15]),
+    ]);
+
+    gpio!(GPIOD, gpiod, Gpiod, PD, 'D', PDn, [
+        PD0: (pd0, 0, [3, 8, 9, 12, 15]),
+        PD1: (pd1, 1, [8, 9, 12, 15]),
+        PD2: (pd2, 2, [0, 2, 4, 8, 12, 13, 15]),
+        PD3: (pd3, 3, [5, 7, 12, 13, 15]),
+        PD4: (pd4, 4, [7, 10, 12, 15]),
+        PD5: (pd5, 5, [1, 5, 7, 9, 10, 12, 15]),
+        PD6: (pd6, 6, [3, 4, 5, 7, 10, 11, 12, 13, 15]),
+        PD7: (pd7, 7, [3, 4, 5, 6, 7, 10, 11, 12, 15]),
+        PD8: (pd8, 8, [7, 12, 15]),
+        PD9: (pd9, 9, [7, 9, 12, 15]),
+        PD10: (pd10, 10, [3, 7, 12, 15]),
+        PD11: (pd11, 11, [3, 7, 8, 9, 12, 15]),
+        PD12: (pd12, 12, [1, 2, 3, 5, 7, 8, 9, 12, 13, 15]),
+        PD13: (pd13, 13, [1, 2, 3, 5, 9, 12, 13, 15]),
+        PD14: (pd14, 14, [2, 12, 15]),
+        PD15: (pd15, 15, [2, 12, 15]),
+    ]);
+
+    gpio!(GPIOE, gpioe, Gpioe, PE, 'E', PEn, [
+        PE0: (pe0, 0, [1, 2, 3, 4, 6, 9, 12, 13, 15]),
+        PE2: (pe2, 2, [0, 1, 5, 9, 12, 13, 15]),
+        PE3: (pe3, 3, [0, 4, 12, 15]),
+        PE4: (pe4, 4, [0, 4, 5, 12, 13, 15]),
+        PE5: (pe5, 5, [0, 4, 5, 12, 13, 15]),
+        PE6: (pe6, 6, [0, 1, 4, 5, 12, 13, 15]),
+        PE7: (pe7, 7, [1, 10, 12, 15]),
+        PE8: (pe8, 8, [1, 10, 12, 15]),
+        PE9: (pe9, 9, [1, 10, 12, 15]),
+        PE10: (pe10, 10, [1, 10, 12, 15]),
+        PE11: (pe11, 11, [1, 4, 5, 6, 12, 15]),
+        PE12: (pe12, 12, [1, 5, 12, 15]),
+        PE13: (pe13, 13, [1, 5, 12, 15]),
+        PE14: (pe14, 14, [1, 5, 12, 15]),
+        PE15: (pe15, 15, [1, 3, 12, 15]),
+    ]);
+
+    gpio!(GPIOF, gpiof, Gpiof, PF, 'F', PFn, [
+        PF0: (pf0, 0, [3, 4, 12, 15]),
+        PF1: (pf1, 1, [3, 4, 12, 15]),
+        PF2: (pf2, 2, [4, 12, 15]),
+        PF3: (pf3, 3, [12, 15]),
+        PF4: (pf4, 4, [12, 15]),
+        PF5: (pf5, 5, [5, 12, 15]),
+        PF6: (pf6, 6, [10, 15]),
+        PF7: (pf7, 7, [10, 15]),
+        PF8: (pf8, 8, [10, 15]),
+        PF9: (pf9, 9, [10, 15]),
+        PF10: (pf10, 10, [4, 9, 13, 15]),
+        PF11: (pf11, 11, [9, 13, 15]),
+        PF12: (pf12, 12, [12, 15]),
+        PF13: (pf13, 13, [12, 15]),
+        PF14: (pf14, 14, [12, 15]),
+        PF15: (pf15, 15, [5, 12, 15]),
+    ]);
+
+    gpio!(GPIOG, gpiog, Gpiog, PG, 'G', PGn, [
+        PG0: (pg0, 0, [12, 15]),
+        PG1: (pg1, 1, [7, 12, 15]),
+        PG2: (pg2, 2, [3, 12, 15]),
+        PG3: (pg3, 3, [3, 12, 15]),
+        PG4: (pg4, 4, [1, 12, 15]),
+        PG5: (pg5, 5, [1, 12, 15]),
+        PG6: (pg6, 6, [3, 5, 10, 11, 12, 13, 15]),
+        PG7: (pg7, 7, [3, 7, 11, 12, 13, 15]),
+        PG8: (pg8, 8, [3, 5, 7, 15]),
+        PG9: (pg9, 9, [5, 7, 9, 11, 12, 13, 15]),
+        PG10: (pg10, 10, [5, 11, 12, 13, 15]),
+        PG11: (pg11, 11, [1, 5, 10, 13, 15]),
+        PG12: (pg12, 12, [1, 4, 7, 10, 12, 13, 15]),
+        PG13: (pg13, 13, [0, 1, 7, 12, 15]),
+        PG14: (pg14, 14, [0, 1, 4, 7, 9, 12, 15]),
+        PG15: (pg15, 15, [5, 7, 13, 15]),
+    ]);
+
+    gpio!(GPIOH, gpioh, Gpioh, PH, 'H', PHn, [
+        PH0: (ph0, 0, [15]),
+        PH1: (ph1, 1, [15]),
+    ]);
+
+    impl<const P: char> Gpio<P> {
+        pub(crate) const fn ptr() -> *const crate::pac::gpioa::RegisterBlock {
+            const {
+                match P {
+                    'A' => crate::pac::GPIOA::ptr(),
+                    'B' => crate::pac::GPIOB::ptr() as _,
+                    'C' => crate::pac::GPIOC::ptr() as _,
+                    'D' => crate::pac::GPIOD::ptr() as _,
+                    'E' => crate::pac::GPIOE::ptr() as _,
+                    'F' => crate::pac::GPIOF::ptr() as _,
+                    'G' => crate::pac::GPIOG::ptr() as _,
+                    'H' => crate::pac::GPIOH::ptr() as _,
+                    _ => panic!("Unknown GPIO port"),
+                }
             }
         }
     }
 }
 
 #[cfg(feature = "gpio-h56x_h573")]
-pub use h523_h533_h56x_h573::*;
+pub use h56x_h573::*;
 
 #[cfg(feature = "gpio-h56x_h573")]
-mod h523_h533_h56x_h573 {
+mod h56x_h573 {
     use super::Gpio;
 
     gpio!(GPIOA, gpioa, Gpioa, PA, 'A', PAn, [
@@ -321,18 +485,19 @@ mod h523_h533_h56x_h573 {
 
     impl<const P: char> Gpio<P> {
         pub(crate) const fn ptr() -> *const crate::pac::gpioa::RegisterBlock {
-            match P {
-                'A' => crate::pac::GPIOA::ptr(),
-                'B' => crate::pac::GPIOB::ptr() as _,
-                'C' => crate::pac::GPIOC::ptr() as _,
-                'D' => crate::pac::GPIOD::ptr() as _,
-                'E' => crate::pac::GPIOE::ptr() as _,
-                'F' => crate::pac::GPIOF::ptr() as _,
-                'G' => crate::pac::GPIOG::ptr() as _,
-                'H' => crate::pac::GPIOH::ptr() as _,
-                #[cfg(feature = "h56x_h573")]
-                'I' => crate::pac::GPIOI::ptr() as _,
-                _ => panic!("Unknown GPIO port"),
+            const {
+                match P {
+                    'A' => crate::pac::GPIOA::ptr(),
+                    'B' => crate::pac::GPIOB::ptr() as _,
+                    'C' => crate::pac::GPIOC::ptr() as _,
+                    'D' => crate::pac::GPIOD::ptr() as _,
+                    'E' => crate::pac::GPIOE::ptr() as _,
+                    'F' => crate::pac::GPIOF::ptr() as _,
+                    'G' => crate::pac::GPIOG::ptr() as _,
+                    'H' => crate::pac::GPIOH::ptr() as _,
+                    'I' => crate::pac::GPIOI::ptr() as _,
+                    _ => panic!("Unknown GPIO port"),
+                }
             }
         }
     }