Merge pull request #199 from embassy-rs/noimport

Generated code cleanups

embassy-stm32/gen.py

@@ -42,6 +42,7 @@ with open('src/pac/mod.rs', 'w') as f:
             f'#[cfg_attr(feature="{chip["name"]}", path="{chip["name"]}.rs")]\n')
     f.write('mod chip;\n')
     f.write('pub use chip::*;\n')
+    f.write('pub(crate) mod regs;\n')
 
 # ========= Generate pac/stm32xxx.rs
 
@@ -57,7 +58,7 @@ for chip in chips.values():
 
         af = gpio_afs[chip['gpio_af']]
         peripheral_names = []  # USART1, PA5, EXTI8
-        exti_interrupts = [] # EXTI IRQs, EXTI0, EXTI4_15 etc.
+        exti_interrupts = []  # EXTI IRQs, EXTI0, EXTI4_15 etc.
         peripheral_versions = {}  # usart -> v1, syscfg -> f4
         pins = set()  # set of all present pins. PA4, PA5...
 
@@ -118,7 +119,7 @@ for chip in chips.values():
             if block_mod == 'rng':
                 for irq in chip['interrupts']:
                     if re.search('RNG', irq):
-                        f.write(f'impl_rng!({name}, ' + irq  + f');')
+                        f.write(f'impl_rng!({name}, {irq});')
 
             if block_mod == 'spi':
                 if 'clock' in peri:
@@ -182,7 +183,6 @@ for chip in chips.values():
                         if func := funcs.get(f'{name}_D7'):
                             f.write(f'impl_sdmmc_pin!({name}, D7Pin, {pin}, {func});')
 
-
             if block_mod == 'exti':
                 for irq in chip['interrupts']:
                     if re.match('EXTI', irq):
@@ -192,15 +192,9 @@ for chip in chips.values():
                 peripheral_names.append(name)
 
         for mod, version in peripheral_versions.items():
-            f.write(f'pub use regs::{mod}_{version} as {mod};')
+            f.write(f'pub use super::regs::{mod}_{version} as {mod};')
-
-        f.write(f"""
-            mod regs;
-            pub use regs::generic;
-            use embassy_extras::peripherals;
-            peripherals!({','.join(peripheral_names)});
-        """)
 
+        f.write(f"embassy_extras::peripherals!({','.join(peripheral_names)});")
 
         # ========= DMA peripherals
         if num_dmas > 0:
@@ -218,12 +212,7 @@ for chip in chips.values():
 
         # ========= exti interrupts
 
-        f.write(f"""
+        f.write(f"impl_exti_irq!({','.join(exti_interrupts)});")
-            use embassy::interrupt::Interrupt;
-            use embassy::interrupt::InterruptExt;
-
-            impl_exti_irq!({','.join(exti_interrupts)});
-        """)
 
         # ========= interrupts
 

embassy-stm32/src/exti.rs

@@ -216,6 +216,9 @@ macro_rules! impl_exti_irq {
     ($($e:ident),+) => {
         /// safety: must be called only once
         pub(crate) unsafe fn init_exti() {
+            use embassy::interrupt::Interrupt;
+            use embassy::interrupt::InterruptExt;
+
             $(
                 crate::interrupt::$e::steal().enable();
             )+

embassy-stm32/src/lib.rs

@@ -31,7 +31,7 @@ pub use embassy_macros::interrupt;
 pub use pac::{interrupt, peripherals, Peripherals};
 
 // workaround for svd2rust-generated code using `use crate::generic::*;`
-pub(crate) use pac::generic;
+pub(crate) use pac::regs::generic;
 
 #[non_exhaustive]
 pub struct Config {

embassy-stm32/src/pac/mod.rs

@@ -503,3 +503,4 @@
 #[cfg_attr(feature = "stm32l4s9zi", path = "stm32l4s9zi.rs")]
 mod chip;
 pub use chip::*;
+pub(crate) mod regs;

embassy-stm32/src/pac/stm32f401cb.rs

@@ -181,16 +181,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -201,19 +198,13 @@ peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f401cc.rs

@@ -181,16 +181,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -201,19 +198,13 @@ peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f401cd.rs

@@ -181,16 +181,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -201,19 +198,13 @@ peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f401ce.rs

@@ -181,16 +181,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -201,19 +198,13 @@ peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f401rb.rs

@@ -181,16 +181,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -201,19 +198,13 @@ peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f401rc.rs

@@ -181,16 +181,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -201,19 +198,13 @@ peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f401rd.rs

@@ -181,16 +181,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -201,19 +198,13 @@ peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f401re.rs

@@ -181,16 +181,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -201,19 +198,13 @@ peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f401vb.rs

@@ -189,16 +189,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -209,19 +206,13 @@ peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f401vc.rs

@@ -189,16 +189,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -209,19 +206,13 @@ peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f401vd.rs

@@ -189,16 +189,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -209,19 +206,13 @@ peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f401ve.rs

@@ -189,16 +189,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -209,19 +206,13 @@ peripherals!(
     PE8, PE9, PE10, PE11, PE12, PE13, PE14, PE15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9,
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f405oe.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f405og.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f405rg.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f405vg.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f405zg.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f407ie.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f407ig.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f407ve.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f407vg.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f407ze.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f407zg.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f410c8.rs

@@ -120,16 +120,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -138,19 +135,13 @@ peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
     PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f410cb.rs

@@ -120,16 +120,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -138,19 +135,13 @@ peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
     PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f410r8.rs

@@ -120,16 +120,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -138,19 +135,13 @@ peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
     PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f410rb.rs

@@ -120,16 +120,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -138,19 +135,13 @@ peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
     PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f410t8.rs

@@ -113,16 +113,13 @@ impl_usart_pin!(USART2, RtsPin, PA1, 7);
 impl_usart_pin!(USART2, TxPin, PA2, 7);
 impl_usart_pin!(USART2, RxPin, PA3, 7);
 impl_usart_pin!(USART2, CkPin, PA4, 7);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -131,19 +128,13 @@ peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
     PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, USART1, USART2
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f410tb.rs

@@ -113,16 +113,13 @@ impl_usart_pin!(USART2, RtsPin, PA1, 7);
 impl_usart_pin!(USART2, TxPin, PA2, 7);
 impl_usart_pin!(USART2, RxPin, PA3, 7);
 impl_usart_pin!(USART2, CkPin, PA4, 7);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -131,19 +128,13 @@ peripherals!(
     PC4, PC5, PC6, PC7, PC8, PC9, PC10, PC11, PC12, PC13, PC14, PC15, PH0, PH1, PH2, PH3, PH4, PH5,
     PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SYSCFG, USART1, USART2
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f411cc.rs

@@ -208,16 +208,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -229,19 +226,13 @@ peripherals!(
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f411ce.rs

@@ -208,16 +208,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -229,19 +226,13 @@ peripherals!(
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f411rc.rs

@@ -208,16 +208,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -229,19 +226,13 @@ peripherals!(
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f411re.rs

@@ -208,16 +208,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -229,19 +226,13 @@ peripherals!(
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f411vc.rs

@@ -208,16 +208,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -229,19 +226,13 @@ peripherals!(
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f411ve.rs

@@ -208,16 +208,13 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -229,19 +226,13 @@ peripherals!(
     PH10, PH11, PH12, PH13, PH14, PH15, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f412ce.rs

@@ -168,17 +168,14 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -188,19 +185,13 @@ peripherals!(
     PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5,
     SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f412cg.rs

@@ -168,17 +168,14 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -188,19 +185,13 @@ peripherals!(
     PH6, PH7, PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5,
     SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f412re.rs

@@ -197,17 +197,14 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -218,19 +215,13 @@ peripherals!(
     PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG,
     USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f412rg.rs

@@ -197,17 +197,14 @@ impl_usart_pin!(USART6, RxPin, PA12, 8);
 impl_usart_pin!(USART6, TxPin, PC6, 8);
 impl_usart_pin!(USART6, RxPin, PC7, 8);
 impl_usart_pin!(USART6, CkPin, PC8, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -218,19 +215,13 @@ peripherals!(
     PH8, PH9, PH10, PH11, PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG,
     USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f412ve.rs

@@ -267,17 +267,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -291,19 +288,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f412vg.rs

@@ -267,17 +267,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -291,19 +288,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f412ze.rs

@@ -267,17 +267,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -291,19 +288,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f412zg.rs

@@ -267,17 +267,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -291,19 +288,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f413cg.rs

@@ -254,17 +254,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -277,19 +274,13 @@ peripherals!(
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f413ch.rs

@@ -254,17 +254,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -277,19 +274,13 @@ peripherals!(
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f413mg.rs

@@ -270,17 +270,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -294,19 +291,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f413mh.rs

@@ -270,17 +270,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -294,19 +291,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f413rg.rs

@@ -270,17 +270,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -294,19 +291,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f413rh.rs

@@ -270,17 +270,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -294,19 +291,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f413vg.rs

@@ -270,17 +270,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -294,19 +291,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f413vh.rs

@@ -270,17 +270,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -294,19 +291,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f413zg.rs

@@ -270,17 +270,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -294,19 +291,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f413zh.rs

@@ -270,17 +270,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -294,19 +291,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f415og.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f415rg.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f415vg.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f415zg.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f417ie.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f417ig.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f417ve.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f417vg.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f417ze.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f417zg.rs

@@ -255,17 +255,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -279,19 +276,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, PI0, PI1, PI2, PI3, PI4, PI5, PI6, PI7, PI8, PI9, PI10, PI11, PI12,
     PI13, PI14, PI15, RNG, SPI1, SPI2, SPI3, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f423ch.rs

@@ -254,17 +254,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -277,19 +274,13 @@ peripherals!(
     PG11, PG12, PG13, PG14, PG15, PH0, PH1, PH2, PH3, PH4, PH5, PH6, PH7, PH8, PH9, PH10, PH11,
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f423mh.rs

@@ -270,17 +270,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -294,19 +291,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f423rh.rs

@@ -270,17 +270,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -294,19 +291,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f423vh.rs

@@ -270,17 +270,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -294,19 +291,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f423zh.rs

@@ -270,17 +270,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -294,19 +291,13 @@ peripherals!(
     PH12, PH13, PH14, PH15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3,
     USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f427ag.rs

@@ -307,17 +307,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -333,19 +330,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f427ai.rs

@@ -307,17 +307,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -333,19 +330,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f427ig.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f427ii.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f427vg.rs

@@ -299,17 +299,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -325,19 +322,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f427vi.rs

@@ -299,17 +299,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -325,19 +322,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f427zg.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f427zi.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429ag.rs

@@ -307,17 +307,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -333,19 +330,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429ai.rs

@@ -307,17 +307,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -333,19 +330,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429be.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429bg.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429bi.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429ie.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429ig.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429ii.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429ne.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429ng.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429ni.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429ve.rs

@@ -299,17 +299,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -325,19 +322,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429vg.rs

@@ -299,17 +299,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -325,19 +322,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429vi.rs

@@ -299,17 +299,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -325,19 +322,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429ze.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429zg.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f429zi.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f437ai.rs

@@ -307,17 +307,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -333,19 +330,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};

embassy-stm32/src/pac/stm32f437ig.rs

@@ -312,17 +312,14 @@ impl_usart_pin!(USART6, CtsPin, PG15, 8);
 impl_usart_pin!(USART6, CkPin, PG7, 8);
 impl_usart_pin!(USART6, RtsPin, PG8, 8);
 impl_usart_pin!(USART6, RxPin, PG9, 8);
-pub use regs::dma_v2 as dma;
+pub use super::regs::dma_v2 as dma;
-pub use regs::exti_v1 as exti;
+pub use super::regs::exti_v1 as exti;
-pub use regs::gpio_v2 as gpio;
+pub use super::regs::gpio_v2 as gpio;
-pub use regs::rng_v1 as rng;
+pub use super::regs::rng_v1 as rng;
-pub use regs::spi_v1 as spi;
+pub use super::regs::spi_v1 as spi;
-pub use regs::syscfg_f4 as syscfg;
+pub use super::regs::syscfg_f4 as syscfg;
-pub use regs::usart_v1 as usart;
+pub use super::regs::usart_v1 as usart;
-mod regs;
+embassy_extras::peripherals!(
-use embassy_extras::peripherals;
-pub use regs::generic;
-peripherals!(
     EXTI0, EXTI1, EXTI2, EXTI3, EXTI4, EXTI5, EXTI6, EXTI7, EXTI8, EXTI9, EXTI10, EXTI11, EXTI12,
     EXTI13, EXTI14, EXTI15, DMA1_CH0, DMA1_CH1, DMA1_CH2, DMA1_CH3, DMA1_CH4, DMA1_CH5, DMA1_CH6,
     DMA1_CH7, DMA2_CH0, DMA2_CH1, DMA2_CH2, DMA2_CH3, DMA2_CH4, DMA2_CH5, DMA2_CH6, DMA2_CH7, EXTI,
@@ -338,19 +335,13 @@ peripherals!(
     PJ14, PJ15, PK0, PK1, PK2, PK3, PK4, PK5, PK6, PK7, PK8, PK9, PK10, PK11, PK12, PK13, PK14,
     PK15, RNG, SPI1, SPI2, SPI3, SPI4, SPI5, SPI6, SYSCFG, USART1, USART2, USART3, USART6
 );
-
 pub fn DMA(n: u8) -> dma::Dma {
     match n {
         0 => DMA1,
         _ => DMA2,
     }
 }
-
-use embassy::interrupt::Interrupt;
-use embassy::interrupt::InterruptExt;
-
 impl_exti_irq!(EXTI0, EXTI1, EXTI15_10, EXTI2, EXTI3, EXTI4, EXTI9_5);
-
 pub mod interrupt {
     pub use cortex_m::interrupt::{CriticalSection, Mutex};
     pub use embassy::interrupt::{declare, take, Interrupt};