291 files changed, 10815 insertions, 10816 deletions

diff --git a/embassy-stm32/gen.py b/embassy-stm32/gen.py
index 63585870c..ce4bdc1df 100644
--- a/embassy-stm32/gen.py
+++ b/embassy-stm32/gen.py
@@ -130,11 +130,10 @@ for chip in chips.values():
 
             if block_mod == 'dma':
                 custom_singletons = True
-                inst_num = int(name[3:])
                 for ch_num in range(8):
                     channel = f'{name}_CH{ch_num}'
                     peripheral_names.append(channel)
-                    f.write(f'impl_dma_channel!({channel}, {inst_num}, {ch_num});')
+                    f.write(f'impl_dma_channel!({channel}, {name}, {ch_num});')
 
             if not custom_singletons:
                 peripheral_names.append(name)
diff --git a/embassy-stm32/src/pac/regs.rs b/embassy-stm32/src/pac/regs.rs
index 572a0a8a9..38ce5981f 100644
--- a/embassy-stm32/src/pac/regs.rs
+++ b/embassy-stm32/src/pac/regs.rs
@@ -1,50 +1,71 @@
 #![no_std]
-#![doc = "Peripheral access API (generated using svd2rust v0.17.0 (507115a 2021-04-19))"]
-pub mod rng_v1 {
+#![doc = "Peripheral access API (generated using svd2rust v0.17.0 (22741fa 2021-04-20))"]
+pub mod gpio_v1 {
     use crate::generic::*;
-    #[doc = "Random number generator"]
+    #[doc = "General purpose I/O"]
     #[derive(Copy, Clone)]
-    pub struct Rng(pub *mut u8);
-    unsafe impl Send for Rng {}
-    unsafe impl Sync for Rng {}
-    impl Rng {
-        #[doc = "control register"]
-        pub fn cr(self) -> Reg<regs::Cr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(0usize)) }
-        }
-        #[doc = "status register"]
-        pub fn sr(self) -> Reg<regs::Sr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(4usize)) }
+    pub struct Gpio(pub *mut u8);
+    unsafe impl Send for Gpio {}
+    unsafe impl Sync for Gpio {}
+    impl Gpio {
+        #[doc = "Port configuration register low (GPIOn_CRL)"]
+        pub fn cr(self, n: usize) -> Reg<regs::Cr, RW> {
+            assert!(n < 2usize);
+            unsafe { Reg::from_ptr(self.0.add(0usize + n * 4usize)) }
         }
-        #[doc = "data register"]
-        pub fn dr(self) -> Reg<u32, R> {
+        #[doc = "Port input data register (GPIOn_IDR)"]
+        pub fn idr(self) -> Reg<regs::Idr, R> {
             unsafe { Reg::from_ptr(self.0.add(8usize)) }
         }
+        #[doc = "Port output data register (GPIOn_ODR)"]
+        pub fn odr(self) -> Reg<regs::Odr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(12usize)) }
+        }
+        #[doc = "Port bit set/reset register (GPIOn_BSRR)"]
+        pub fn bsrr(self) -> Reg<regs::Bsrr, W> {
+            unsafe { Reg::from_ptr(self.0.add(16usize)) }
+        }
+        #[doc = "Port bit reset register (GPIOn_BRR)"]
+        pub fn brr(self) -> Reg<regs::Brr, W> {
+            unsafe { Reg::from_ptr(self.0.add(20usize)) }
+        }
+        #[doc = "Port configuration lock register"]
+        pub fn lckr(self) -> Reg<regs::Lckr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(24usize)) }
+        }
     }
     pub mod regs {
         use crate::generic::*;
-        #[doc = "control register"]
+        #[doc = "Port configuration register (GPIOn_CRx)"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
         pub struct Cr(pub u32);
         impl Cr {
-            #[doc = "Random number generator enable"]
-            pub const fn rngen(&self) -> bool {
-                let val = (self.0 >> 2usize) & 0x01;
-                val != 0
+            #[doc = "Port n mode bits"]
+            pub fn mode(&self, n: usize) -> super::vals::Mode {
+                assert!(n < 8usize);
+                let offs = 0usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x03;
+                super::vals::Mode(val as u8)
             }
-            #[doc = "Random number generator enable"]
-            pub fn set_rngen(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
+            #[doc = "Port n mode bits"]
+            pub fn set_mode(&mut self, n: usize, val: super::vals::Mode) {
+                assert!(n < 8usize);
+                let offs = 0usize + n * 4usize;
+                self.0 = (self.0 & !(0x03 << offs)) | (((val.0 as u32) & 0x03) << offs);
             }
-            #[doc = "Interrupt enable"]
-            pub const fn ie(&self) -> bool {
-                let val = (self.0 >> 3usize) & 0x01;
-                val != 0
+            #[doc = "Port n configuration bits"]
+            pub fn cnf(&self, n: usize) -> super::vals::Cnf {
+                assert!(n < 8usize);
+                let offs = 2usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x03;
+                super::vals::Cnf(val as u8)
             }
-            #[doc = "Interrupt enable"]
-            pub fn set_ie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
+            #[doc = "Port n configuration bits"]
+            pub fn set_cnf(&mut self, n: usize, val: super::vals::Cnf) {
+                assert!(n < 8usize);
+                let offs = 2usize + n * 4usize;
+                self.0 = (self.0 & !(0x03 << offs)) | (((val.0 as u32) & 0x03) << offs);
             }
         }
         impl Default for Cr {
@@ -52,741 +73,627 @@ pub mod rng_v1 {
                 Cr(0)
             }
         }
-        #[doc = "status register"]
+        #[doc = "Port bit set/reset register (GPIOn_BSRR)"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Sr(pub u32);
-        impl Sr {
-            #[doc = "Data ready"]
-            pub const fn drdy(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
+        pub struct Bsrr(pub u32);
+        impl Bsrr {
+            #[doc = "Set bit"]
+            pub fn bs(&self, n: usize) -> bool {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Data ready"]
-            pub fn set_drdy(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            #[doc = "Set bit"]
+            pub fn set_bs(&mut self, n: usize, val: bool) {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Clock error current status"]
-            pub const fn cecs(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
+            #[doc = "Reset bit"]
+            pub fn br(&self, n: usize) -> bool {
+                assert!(n < 16usize);
+                let offs = 16usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Clock error current status"]
-            pub fn set_cecs(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
+            #[doc = "Reset bit"]
+            pub fn set_br(&mut self, n: usize, val: bool) {
+                assert!(n < 16usize);
+                let offs = 16usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Seed error current status"]
-            pub const fn secs(&self) -> bool {
-                let val = (self.0 >> 2usize) & 0x01;
-                val != 0
+        }
+        impl Default for Bsrr {
+            fn default() -> Bsrr {
+                Bsrr(0)
             }
-            #[doc = "Seed error current status"]
-            pub fn set_secs(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
+        }
+        #[doc = "Port input data register (GPIOn_IDR)"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Idr(pub u32);
+        impl Idr {
+            #[doc = "Port input data"]
+            pub fn idr(&self, n: usize) -> super::vals::Idr {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
+                super::vals::Idr(val as u8)
             }
-            #[doc = "Clock error interrupt status"]
-            pub const fn ceis(&self) -> bool {
-                let val = (self.0 >> 5usize) & 0x01;
-                val != 0
+            #[doc = "Port input data"]
+            pub fn set_idr(&mut self, n: usize, val: super::vals::Idr) {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
             }
-            #[doc = "Clock error interrupt status"]
-            pub fn set_ceis(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+        }
+        impl Default for Idr {
+            fn default() -> Idr {
+                Idr(0)
             }
-            #[doc = "Seed error interrupt status"]
-            pub const fn seis(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
+        }
+        #[doc = "Port bit reset register (GPIOn_BRR)"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Brr(pub u32);
+        impl Brr {
+            #[doc = "Reset bit"]
+            pub fn br(&self, n: usize) -> bool {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Seed error interrupt status"]
-            pub fn set_seis(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            #[doc = "Reset bit"]
+            pub fn set_br(&mut self, n: usize, val: bool) {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
         }
-        impl Default for Sr {
-            fn default() -> Sr {
-                Sr(0)
+        impl Default for Brr {
+            fn default() -> Brr {
+                Brr(0)
             }
         }
-    }
-}
-pub mod spi_v2 {
-    use crate::generic::*;
-    #[doc = "Serial peripheral interface"]
-    #[derive(Copy, Clone)]
-    pub struct Spi(pub *mut u8);
-    unsafe impl Send for Spi {}
-    unsafe impl Sync for Spi {}
-    impl Spi {
-        #[doc = "control register 1"]
-        pub fn cr1(self) -> Reg<regs::Cr1, RW> {
-            unsafe { Reg::from_ptr(self.0.add(0usize)) }
-        }
-        #[doc = "control register 2"]
-        pub fn cr2(self) -> Reg<regs::Cr2, RW> {
-            unsafe { Reg::from_ptr(self.0.add(4usize)) }
-        }
-        #[doc = "status register"]
-        pub fn sr(self) -> Reg<regs::Sr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(8usize)) }
-        }
-        #[doc = "data register"]
-        pub fn dr(self) -> Reg<regs::Dr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(12usize)) }
+        #[doc = "Port output data register (GPIOn_ODR)"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Odr(pub u32);
+        impl Odr {
+            #[doc = "Port output data"]
+            pub fn odr(&self, n: usize) -> super::vals::Odr {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
+                super::vals::Odr(val as u8)
+            }
+            #[doc = "Port output data"]
+            pub fn set_odr(&mut self, n: usize, val: super::vals::Odr) {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
+            }
         }
-        #[doc = "CRC polynomial register"]
-        pub fn crcpr(self) -> Reg<regs::Crcpr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(16usize)) }
+        impl Default for Odr {
+            fn default() -> Odr {
+                Odr(0)
+            }
         }
-        #[doc = "RX CRC register"]
-        pub fn rxcrcr(self) -> Reg<regs::Rxcrcr, R> {
-            unsafe { Reg::from_ptr(self.0.add(20usize)) }
+        #[doc = "Port configuration lock register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Lckr(pub u32);
+        impl Lckr {
+            #[doc = "Port A Lock bit"]
+            pub fn lck(&self, n: usize) -> super::vals::Lck {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
+                super::vals::Lck(val as u8)
+            }
+            #[doc = "Port A Lock bit"]
+            pub fn set_lck(&mut self, n: usize, val: super::vals::Lck) {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
+            }
+            #[doc = "Lock key"]
+            pub const fn lckk(&self) -> super::vals::Lckk {
+                let val = (self.0 >> 16usize) & 0x01;
+                super::vals::Lckk(val as u8)
+            }
+            #[doc = "Lock key"]
+            pub fn set_lckk(&mut self, val: super::vals::Lckk) {
+                self.0 = (self.0 & !(0x01 << 16usize)) | (((val.0 as u32) & 0x01) << 16usize);
+            }
         }
-        #[doc = "TX CRC register"]
-        pub fn txcrcr(self) -> Reg<regs::Txcrcr, R> {
-            unsafe { Reg::from_ptr(self.0.add(24usize)) }
+        impl Default for Lckr {
+            fn default() -> Lckr {
+                Lckr(0)
+            }
         }
     }
     pub mod vals {
         use crate::generic::*;
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Frer(pub u8);
-        impl Frer {
-            #[doc = "No frame format error"]
-            pub const NOERROR: Self = Self(0);
-            #[doc = "A frame format error occurred"]
-            pub const ERROR: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Crcnext(pub u8);
-        impl Crcnext {
-            #[doc = "Next transmit value is from Tx buffer"]
-            pub const TXBUFFER: Self = Self(0);
-            #[doc = "Next transmit value is from Tx CRC register"]
-            pub const CRC: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Bidimode(pub u8);
-        impl Bidimode {
-            #[doc = "2-line unidirectional data mode selected"]
-            pub const UNIDIRECTIONAL: Self = Self(0);
-            #[doc = "1-line bidirectional data mode selected"]
-            pub const BIDIRECTIONAL: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Frlvlr(pub u8);
-        impl Frlvlr {
-            #[doc = "Rx FIFO Empty"]
-            pub const EMPTY: Self = Self(0);
-            #[doc = "Rx 1/4 FIFO"]
-            pub const QUARTER: Self = Self(0x01);
-            #[doc = "Rx 1/2 FIFO"]
-            pub const HALF: Self = Self(0x02);
-            #[doc = "Rx FIFO full"]
-            pub const FULL: Self = Self(0x03);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Mstr(pub u8);
-        impl Mstr {
-            #[doc = "Slave configuration"]
-            pub const SLAVE: Self = Self(0);
-            #[doc = "Master configuration"]
-            pub const MASTER: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Frf(pub u8);
-        impl Frf {
-            #[doc = "SPI Motorola mode"]
-            pub const MOTOROLA: Self = Self(0);
-            #[doc = "SPI TI mode"]
-            pub const TI: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Rxonly(pub u8);
-        impl Rxonly {
-            #[doc = "Full duplex (Transmit and receive)"]
-            pub const FULLDUPLEX: Self = Self(0);
-            #[doc = "Output disabled (Receive-only mode)"]
-            pub const OUTPUTDISABLED: Self = Self(0x01);
+        pub struct Bsw(pub u8);
+        impl Bsw {
+            #[doc = "No action on the corresponding ODx bit"]
+            pub const NOACTION: Self = Self(0);
+            #[doc = "Sets the corresponding ODRx bit"]
+            pub const SET: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Cpha(pub u8);
-        impl Cpha {
-            #[doc = "The first clock transition is the first data capture edge"]
-            pub const FIRSTEDGE: Self = Self(0);
-            #[doc = "The second clock transition is the first data capture edge"]
-            pub const SECONDEDGE: Self = Self(0x01);
+        pub struct Lckk(pub u8);
+        impl Lckk {
+            #[doc = "Port configuration lock key not active"]
+            pub const NOTACTIVE: Self = Self(0);
+            #[doc = "Port configuration lock key active"]
+            pub const ACTIVE: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Lsbfirst(pub u8);
-        impl Lsbfirst {
-            #[doc = "Data is transmitted/received with the MSB first"]
-            pub const MSBFIRST: Self = Self(0);
-            #[doc = "Data is transmitted/received with the LSB first"]
-            pub const LSBFIRST: Self = Self(0x01);
+        pub struct Odr(pub u8);
+        impl Odr {
+            #[doc = "Set output to logic low"]
+            pub const LOW: Self = Self(0);
+            #[doc = "Set output to logic high"]
+            pub const HIGH: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Cpol(pub u8);
-        impl Cpol {
-            #[doc = "CK to 0 when idle"]
-            pub const IDLELOW: Self = Self(0);
-            #[doc = "CK to 1 when idle"]
-            pub const IDLEHIGH: Self = Self(0x01);
+        pub struct Idr(pub u8);
+        impl Idr {
+            #[doc = "Input is logic low"]
+            pub const LOW: Self = Self(0);
+            #[doc = "Input is logic high"]
+            pub const HIGH: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Br(pub u8);
-        impl Br {
-            #[doc = "f_PCLK / 2"]
-            pub const DIV2: Self = Self(0);
-            #[doc = "f_PCLK / 4"]
-            pub const DIV4: Self = Self(0x01);
-            #[doc = "f_PCLK / 8"]
-            pub const DIV8: Self = Self(0x02);
-            #[doc = "f_PCLK / 16"]
-            pub const DIV16: Self = Self(0x03);
-            #[doc = "f_PCLK / 32"]
-            pub const DIV32: Self = Self(0x04);
-            #[doc = "f_PCLK / 64"]
-            pub const DIV64: Self = Self(0x05);
-            #[doc = "f_PCLK / 128"]
-            pub const DIV128: Self = Self(0x06);
-            #[doc = "f_PCLK / 256"]
-            pub const DIV256: Self = Self(0x07);
+        pub struct Mode(pub u8);
+        impl Mode {
+            #[doc = "Input mode (reset state)"]
+            pub const INPUT: Self = Self(0);
+            #[doc = "Output mode 10 MHz"]
+            pub const OUTPUT: Self = Self(0x01);
+            #[doc = "Output mode 2 MHz"]
+            pub const OUTPUT2: Self = Self(0x02);
+            #[doc = "Output mode 50 MHz"]
+            pub const OUTPUT50: Self = Self(0x03);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct LdmaRx(pub u8);
-        impl LdmaRx {
-            #[doc = "Number of data to transfer for receive is even"]
-            pub const EVEN: Self = Self(0);
-            #[doc = "Number of data to transfer for receive is odd"]
-            pub const ODD: Self = Self(0x01);
+        pub struct Lck(pub u8);
+        impl Lck {
+            #[doc = "Port configuration not locked"]
+            pub const UNLOCKED: Self = Self(0);
+            #[doc = "Port configuration locked"]
+            pub const LOCKED: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Frxth(pub u8);
-        impl Frxth {
-            #[doc = "RXNE event is generated if the FIFO level is greater than or equal to 1/2 (16-bit)"]
-            pub const HALF: Self = Self(0);
-            #[doc = "RXNE event is generated if the FIFO level is greater than or equal to 1/4 (8-bit)"]
-            pub const QUARTER: Self = Self(0x01);
+        pub struct Cnf(pub u8);
+        impl Cnf {
+            #[doc = "Analog mode / Push-Pull mode"]
+            pub const PUSHPULL: Self = Self(0);
+            #[doc = "Floating input (reset state) / Open Drain-Mode"]
+            pub const OPENDRAIN: Self = Self(0x01);
+            #[doc = "Input with pull-up/pull-down / Alternate Function Push-Pull Mode"]
+            pub const ALTPUSHPULL: Self = Self(0x02);
+            #[doc = "Alternate Function Open-Drain Mode"]
+            pub const ALTOPENDRAIN: Self = Self(0x03);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct LdmaTx(pub u8);
-        impl LdmaTx {
-            #[doc = "Number of data to transfer for transmit is even"]
-            pub const EVEN: Self = Self(0);
-            #[doc = "Number of data to transfer for transmit is odd"]
-            pub const ODD: Self = Self(0x01);
+        pub struct Brw(pub u8);
+        impl Brw {
+            #[doc = "No action on the corresponding ODx bit"]
+            pub const NOACTION: Self = Self(0);
+            #[doc = "Reset the ODx bit"]
+            pub const RESET: Self = Self(0x01);
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Bidioe(pub u8);
-        impl Bidioe {
-            #[doc = "Output disabled (receive-only mode)"]
-            pub const OUTPUTDISABLED: Self = Self(0);
-            #[doc = "Output enabled (transmit-only mode)"]
-            pub const OUTPUTENABLED: Self = Self(0x01);
+    }
+}
+pub mod syscfg_f4 {
+    use crate::generic::*;
+    #[doc = "System configuration controller"]
+    #[derive(Copy, Clone)]
+    pub struct Syscfg(pub *mut u8);
+    unsafe impl Send for Syscfg {}
+    unsafe impl Sync for Syscfg {}
+    impl Syscfg {
+        #[doc = "memory remap register"]
+        pub fn memrm(self) -> Reg<regs::Memrm, RW> {
+            unsafe { Reg::from_ptr(self.0.add(0usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ftlvlr(pub u8);
-        impl Ftlvlr {
-            #[doc = "Tx FIFO Empty"]
-            pub const EMPTY: Self = Self(0);
-            #[doc = "Tx 1/4 FIFO"]
-            pub const QUARTER: Self = Self(0x01);
-            #[doc = "Tx 1/2 FIFO"]
-            pub const HALF: Self = Self(0x02);
-            #[doc = "Tx FIFO full"]
-            pub const FULL: Self = Self(0x03);
+        #[doc = "peripheral mode configuration register"]
+        pub fn pmc(self) -> Reg<regs::Pmc, RW> {
+            unsafe { Reg::from_ptr(self.0.add(4usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Crcl(pub u8);
-        impl Crcl {
-            #[doc = "8-bit CRC length"]
-            pub const EIGHTBIT: Self = Self(0);
-            #[doc = "16-bit CRC length"]
-            pub const SIXTEENBIT: Self = Self(0x01);
+        #[doc = "external interrupt configuration register"]
+        pub fn exticr(self, n: usize) -> Reg<regs::Exticr, RW> {
+            assert!(n < 4usize);
+            unsafe { Reg::from_ptr(self.0.add(8usize + n * 4usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ds(pub u8);
-        impl Ds {
-            #[doc = "4-bit"]
-            pub const FOURBIT: Self = Self(0x03);
-            #[doc = "5-bit"]
-            pub const FIVEBIT: Self = Self(0x04);
-            #[doc = "6-bit"]
-            pub const SIXBIT: Self = Self(0x05);
-            #[doc = "7-bit"]
-            pub const SEVENBIT: Self = Self(0x06);
-            #[doc = "8-bit"]
-            pub const EIGHTBIT: Self = Self(0x07);
-            #[doc = "9-bit"]
-            pub const NINEBIT: Self = Self(0x08);
-            #[doc = "10-bit"]
-            pub const TENBIT: Self = Self(0x09);
-            #[doc = "11-bit"]
-            pub const ELEVENBIT: Self = Self(0x0a);
-            #[doc = "12-bit"]
-            pub const TWELVEBIT: Self = Self(0x0b);
-            #[doc = "13-bit"]
-            pub const THIRTEENBIT: Self = Self(0x0c);
-            #[doc = "14-bit"]
-            pub const FOURTEENBIT: Self = Self(0x0d);
-            #[doc = "15-bit"]
-            pub const FIFTEENBIT: Self = Self(0x0e);
-            #[doc = "16-bit"]
-            pub const SIXTEENBIT: Self = Self(0x0f);
+        #[doc = "Compensation cell control register"]
+        pub fn cmpcr(self) -> Reg<regs::Cmpcr, R> {
+            unsafe { Reg::from_ptr(self.0.add(32usize)) }
         }
     }
     pub mod regs {
         use crate::generic::*;
-        #[doc = "data register"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Dr(pub u32);
-        impl Dr {
-            #[doc = "Data register"]
-            pub const fn dr(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0xffff;
-                val as u16
-            }
-            #[doc = "Data register"]
-            pub fn set_dr(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
-            }
-        }
-        impl Default for Dr {
-            fn default() -> Dr {
-                Dr(0)
-            }
-        }
-        #[doc = "control register 2"]
+        #[doc = "memory remap register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr2(pub u32);
-        impl Cr2 {
-            #[doc = "Rx buffer DMA enable"]
-            pub const fn rxdmaen(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Rx buffer DMA enable"]
-            pub fn set_rxdmaen(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
-            }
-            #[doc = "Tx buffer DMA enable"]
-            pub const fn txdmaen(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Tx buffer DMA enable"]
-            pub fn set_txdmaen(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
-            }
-            #[doc = "SS output enable"]
-            pub const fn ssoe(&self) -> bool {
-                let val = (self.0 >> 2usize) & 0x01;
-                val != 0
-            }
-            #[doc = "SS output enable"]
-            pub fn set_ssoe(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
-            }
-            #[doc = "NSS pulse management"]
-            pub const fn nssp(&self) -> bool {
-                let val = (self.0 >> 3usize) & 0x01;
-                val != 0
-            }
-            #[doc = "NSS pulse management"]
-            pub fn set_nssp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
-            }
-            #[doc = "Frame format"]
-            pub const fn frf(&self) -> super::vals::Frf {
-                let val = (self.0 >> 4usize) & 0x01;
-                super::vals::Frf(val as u8)
-            }
-            #[doc = "Frame format"]
-            pub fn set_frf(&mut self, val: super::vals::Frf) {
-                self.0 = (self.0 & !(0x01 << 4usize)) | (((val.0 as u32) & 0x01) << 4usize);
-            }
-            #[doc = "Error interrupt enable"]
-            pub const fn errie(&self) -> bool {
-                let val = (self.0 >> 5usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Error interrupt enable"]
-            pub fn set_errie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
-            }
-            #[doc = "RX buffer not empty interrupt enable"]
-            pub const fn rxneie(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
-                val != 0
+        pub struct Memrm(pub u32);
+        impl Memrm {
+            #[doc = "Memory mapping selection"]
+            pub const fn mem_mode(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x07;
+                val as u8
             }
-            #[doc = "RX buffer not empty interrupt enable"]
-            pub fn set_rxneie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            #[doc = "Memory mapping selection"]
+            pub fn set_mem_mode(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x07 << 0usize)) | (((val as u32) & 0x07) << 0usize);
             }
-            #[doc = "Tx buffer empty interrupt enable"]
-            pub const fn txeie(&self) -> bool {
-                let val = (self.0 >> 7usize) & 0x01;
+            #[doc = "Flash bank mode selection"]
+            pub const fn fb_mode(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
                 val != 0
             }
-            #[doc = "Tx buffer empty interrupt enable"]
-            pub fn set_txeie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
-            }
-            #[doc = "Data size"]
-            pub const fn ds(&self) -> super::vals::Ds {
-                let val = (self.0 >> 8usize) & 0x0f;
-                super::vals::Ds(val as u8)
-            }
-            #[doc = "Data size"]
-            pub fn set_ds(&mut self, val: super::vals::Ds) {
-                self.0 = (self.0 & !(0x0f << 8usize)) | (((val.0 as u32) & 0x0f) << 8usize);
-            }
-            #[doc = "FIFO reception threshold"]
-            pub const fn frxth(&self) -> super::vals::Frxth {
-                let val = (self.0 >> 12usize) & 0x01;
-                super::vals::Frxth(val as u8)
-            }
-            #[doc = "FIFO reception threshold"]
-            pub fn set_frxth(&mut self, val: super::vals::Frxth) {
-                self.0 = (self.0 & !(0x01 << 12usize)) | (((val.0 as u32) & 0x01) << 12usize);
-            }
-            #[doc = "Last DMA transfer for reception"]
-            pub const fn ldma_rx(&self) -> super::vals::LdmaRx {
-                let val = (self.0 >> 13usize) & 0x01;
-                super::vals::LdmaRx(val as u8)
-            }
-            #[doc = "Last DMA transfer for reception"]
-            pub fn set_ldma_rx(&mut self, val: super::vals::LdmaRx) {
-                self.0 = (self.0 & !(0x01 << 13usize)) | (((val.0 as u32) & 0x01) << 13usize);
+            #[doc = "Flash bank mode selection"]
+            pub fn set_fb_mode(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
-            #[doc = "Last DMA transfer for transmission"]
-            pub const fn ldma_tx(&self) -> super::vals::LdmaTx {
-                let val = (self.0 >> 14usize) & 0x01;
-                super::vals::LdmaTx(val as u8)
+            #[doc = "FMC memory mapping swap"]
+            pub const fn swp_fmc(&self) -> u8 {
+                let val = (self.0 >> 10usize) & 0x03;
+                val as u8
             }
-            #[doc = "Last DMA transfer for transmission"]
-            pub fn set_ldma_tx(&mut self, val: super::vals::LdmaTx) {
-                self.0 = (self.0 & !(0x01 << 14usize)) | (((val.0 as u32) & 0x01) << 14usize);
+            #[doc = "FMC memory mapping swap"]
+            pub fn set_swp_fmc(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x03 << 10usize)) | (((val as u32) & 0x03) << 10usize);
             }
         }
-        impl Default for Cr2 {
-            fn default() -> Cr2 {
-                Cr2(0)
+        impl Default for Memrm {
+            fn default() -> Memrm {
+                Memrm(0)
             }
         }
-        #[doc = "status register"]
+        #[doc = "Compensation cell control register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Sr(pub u32);
-        impl Sr {
-            #[doc = "Receive buffer not empty"]
-            pub const fn rxne(&self) -> bool {
+        pub struct Cmpcr(pub u32);
+        impl Cmpcr {
+            #[doc = "Compensation cell power-down"]
+            pub const fn cmp_pd(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Receive buffer not empty"]
-            pub fn set_rxne(&mut self, val: bool) {
+            #[doc = "Compensation cell power-down"]
+            pub fn set_cmp_pd(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Transmit buffer empty"]
-            pub const fn txe(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
+            #[doc = "READY"]
+            pub const fn ready(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
                 val != 0
             }
-            #[doc = "Transmit buffer empty"]
-            pub fn set_txe(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
-            }
-            #[doc = "CRC error flag"]
-            pub const fn crcerr(&self) -> bool {
-                let val = (self.0 >> 4usize) & 0x01;
-                val != 0
+            #[doc = "READY"]
+            pub fn set_ready(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
-            #[doc = "CRC error flag"]
-            pub fn set_crcerr(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
+        }
+        impl Default for Cmpcr {
+            fn default() -> Cmpcr {
+                Cmpcr(0)
             }
-            #[doc = "Mode fault"]
-            pub const fn modf(&self) -> bool {
-                let val = (self.0 >> 5usize) & 0x01;
+        }
+        #[doc = "peripheral mode configuration register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Pmc(pub u32);
+        impl Pmc {
+            #[doc = "ADC1DC2"]
+            pub const fn adc1dc2(&self) -> bool {
+                let val = (self.0 >> 16usize) & 0x01;
                 val != 0
             }
-            #[doc = "Mode fault"]
-            pub fn set_modf(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+            #[doc = "ADC1DC2"]
+            pub fn set_adc1dc2(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
             }
-            #[doc = "Overrun flag"]
-            pub const fn ovr(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
+            #[doc = "ADC2DC2"]
+            pub const fn adc2dc2(&self) -> bool {
+                let val = (self.0 >> 17usize) & 0x01;
                 val != 0
             }
-            #[doc = "Overrun flag"]
-            pub fn set_ovr(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            #[doc = "ADC2DC2"]
+            pub fn set_adc2dc2(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 17usize)) | (((val as u32) & 0x01) << 17usize);
             }
-            #[doc = "Busy flag"]
-            pub const fn bsy(&self) -> bool {
-                let val = (self.0 >> 7usize) & 0x01;
+            #[doc = "ADC3DC2"]
+            pub const fn adc3dc2(&self) -> bool {
+                let val = (self.0 >> 18usize) & 0x01;
                 val != 0
             }
-            #[doc = "Busy flag"]
-            pub fn set_bsy(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            #[doc = "ADC3DC2"]
+            pub fn set_adc3dc2(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 18usize)) | (((val as u32) & 0x01) << 18usize);
             }
-            #[doc = "Frame format error"]
-            pub const fn fre(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
+            #[doc = "Ethernet PHY interface selection"]
+            pub const fn mii_rmii_sel(&self) -> bool {
+                let val = (self.0 >> 23usize) & 0x01;
                 val != 0
             }
-            #[doc = "Frame format error"]
-            pub fn set_fre(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
-            }
-            #[doc = "FIFO reception level"]
-            pub const fn frlvl(&self) -> u8 {
-                let val = (self.0 >> 9usize) & 0x03;
-                val as u8
-            }
-            #[doc = "FIFO reception level"]
-            pub fn set_frlvl(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x03 << 9usize)) | (((val as u32) & 0x03) << 9usize);
-            }
-            #[doc = "FIFO Transmission Level"]
-            pub const fn ftlvl(&self) -> u8 {
-                let val = (self.0 >> 11usize) & 0x03;
-                val as u8
-            }
-            #[doc = "FIFO Transmission Level"]
-            pub fn set_ftlvl(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x03 << 11usize)) | (((val as u32) & 0x03) << 11usize);
+            #[doc = "Ethernet PHY interface selection"]
+            pub fn set_mii_rmii_sel(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 23usize)) | (((val as u32) & 0x01) << 23usize);
             }
         }
-        impl Default for Sr {
-            fn default() -> Sr {
-                Sr(0)
+        impl Default for Pmc {
+            fn default() -> Pmc {
+                Pmc(0)
             }
         }
-        #[doc = "CRC polynomial register"]
+        #[doc = "external interrupt configuration register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Crcpr(pub u32);
-        impl Crcpr {
-            #[doc = "CRC polynomial register"]
-            pub const fn crcpoly(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0xffff;
-                val as u16
+        pub struct Exticr(pub u32);
+        impl Exticr {
+            #[doc = "EXTI x configuration"]
+            pub fn exti(&self, n: usize) -> u8 {
+                assert!(n < 4usize);
+                let offs = 0usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x0f;
+                val as u8
             }
-            #[doc = "CRC polynomial register"]
-            pub fn set_crcpoly(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
+            #[doc = "EXTI x configuration"]
+            pub fn set_exti(&mut self, n: usize, val: u8) {
+                assert!(n < 4usize);
+                let offs = 0usize + n * 4usize;
+                self.0 = (self.0 & !(0x0f << offs)) | (((val as u32) & 0x0f) << offs);
             }
         }
-        impl Default for Crcpr {
-            fn default() -> Crcpr {
-                Crcpr(0)
+        impl Default for Exticr {
+            fn default() -> Exticr {
+                Exticr(0)
             }
         }
-        #[doc = "RX CRC register"]
+    }
+}
+pub mod exti_v1 {
+    use crate::generic::*;
+    #[doc = "External interrupt/event controller"]
+    #[derive(Copy, Clone)]
+    pub struct Exti(pub *mut u8);
+    unsafe impl Send for Exti {}
+    unsafe impl Sync for Exti {}
+    impl Exti {
+        #[doc = "Interrupt mask register (EXTI_IMR)"]
+        pub fn imr(self) -> Reg<regs::Imr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(0usize)) }
+        }
+        #[doc = "Event mask register (EXTI_EMR)"]
+        pub fn emr(self) -> Reg<regs::Emr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(4usize)) }
+        }
+        #[doc = "Rising Trigger selection register (EXTI_RTSR)"]
+        pub fn rtsr(self) -> Reg<regs::Rtsr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(8usize)) }
+        }
+        #[doc = "Falling Trigger selection register (EXTI_FTSR)"]
+        pub fn ftsr(self) -> Reg<regs::Ftsr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(12usize)) }
+        }
+        #[doc = "Software interrupt event register (EXTI_SWIER)"]
+        pub fn swier(self) -> Reg<regs::Swier, RW> {
+            unsafe { Reg::from_ptr(self.0.add(16usize)) }
+        }
+        #[doc = "Pending register (EXTI_PR)"]
+        pub fn pr(self) -> Reg<regs::Pr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(20usize)) }
+        }
+    }
+    pub mod regs {
+        use crate::generic::*;
+        #[doc = "Falling Trigger selection register (EXTI_FTSR)"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Rxcrcr(pub u32);
-        impl Rxcrcr {
-            #[doc = "Rx CRC register"]
-            pub const fn rx_crc(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0xffff;
-                val as u16
+        pub struct Ftsr(pub u32);
+        impl Ftsr {
+            #[doc = "Falling trigger event configuration of line 0"]
+            pub fn tr(&self, n: usize) -> super::vals::Tr {
+                assert!(n < 23usize);
+                let offs = 0usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
+                super::vals::Tr(val as u8)
             }
-            #[doc = "Rx CRC register"]
-            pub fn set_rx_crc(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
+            #[doc = "Falling trigger event configuration of line 0"]
+            pub fn set_tr(&mut self, n: usize, val: super::vals::Tr) {
+                assert!(n < 23usize);
+                let offs = 0usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
             }
         }
-        impl Default for Rxcrcr {
-            fn default() -> Rxcrcr {
-                Rxcrcr(0)
+        impl Default for Ftsr {
+            fn default() -> Ftsr {
+                Ftsr(0)
             }
         }
-        #[doc = "TX CRC register"]
+        #[doc = "Event mask register (EXTI_EMR)"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Txcrcr(pub u32);
-        impl Txcrcr {
-            #[doc = "Tx CRC register"]
-            pub const fn tx_crc(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0xffff;
-                val as u16
+        pub struct Emr(pub u32);
+        impl Emr {
+            #[doc = "Event Mask on line 0"]
+            pub fn mr(&self, n: usize) -> super::vals::Mr {
+                assert!(n < 23usize);
+                let offs = 0usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
+                super::vals::Mr(val as u8)
             }
-            #[doc = "Tx CRC register"]
-            pub fn set_tx_crc(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
+            #[doc = "Event Mask on line 0"]
+            pub fn set_mr(&mut self, n: usize, val: super::vals::Mr) {
+                assert!(n < 23usize);
+                let offs = 0usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
             }
         }
-        impl Default for Txcrcr {
-            fn default() -> Txcrcr {
-                Txcrcr(0)
+        impl Default for Emr {
+            fn default() -> Emr {
+                Emr(0)
             }
         }
-        #[doc = "control register 1"]
+        #[doc = "Software interrupt event register (EXTI_SWIER)"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr1(pub u32);
-        impl Cr1 {
-            #[doc = "Clock phase"]
-            pub const fn cpha(&self) -> super::vals::Cpha {
-                let val = (self.0 >> 0usize) & 0x01;
-                super::vals::Cpha(val as u8)
-            }
-            #[doc = "Clock phase"]
-            pub fn set_cpha(&mut self, val: super::vals::Cpha) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val.0 as u32) & 0x01) << 0usize);
-            }
-            #[doc = "Clock polarity"]
-            pub const fn cpol(&self) -> super::vals::Cpol {
-                let val = (self.0 >> 1usize) & 0x01;
-                super::vals::Cpol(val as u8)
-            }
-            #[doc = "Clock polarity"]
-            pub fn set_cpol(&mut self, val: super::vals::Cpol) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val.0 as u32) & 0x01) << 1usize);
-            }
-            #[doc = "Master selection"]
-            pub const fn mstr(&self) -> super::vals::Mstr {
-                let val = (self.0 >> 2usize) & 0x01;
-                super::vals::Mstr(val as u8)
-            }
-            #[doc = "Master selection"]
-            pub fn set_mstr(&mut self, val: super::vals::Mstr) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val.0 as u32) & 0x01) << 2usize);
-            }
-            #[doc = "Baud rate control"]
-            pub const fn br(&self) -> super::vals::Br {
-                let val = (self.0 >> 3usize) & 0x07;
-                super::vals::Br(val as u8)
-            }
-            #[doc = "Baud rate control"]
-            pub fn set_br(&mut self, val: super::vals::Br) {
-                self.0 = (self.0 & !(0x07 << 3usize)) | (((val.0 as u32) & 0x07) << 3usize);
-            }
-            #[doc = "SPI enable"]
-            pub const fn spe(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
-                val != 0
-            }
-            #[doc = "SPI enable"]
-            pub fn set_spe(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
-            }
-            #[doc = "Frame format"]
-            pub const fn lsbfirst(&self) -> super::vals::Lsbfirst {
-                let val = (self.0 >> 7usize) & 0x01;
-                super::vals::Lsbfirst(val as u8)
-            }
-            #[doc = "Frame format"]
-            pub fn set_lsbfirst(&mut self, val: super::vals::Lsbfirst) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
-            }
-            #[doc = "Internal slave select"]
-            pub const fn ssi(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
+        pub struct Swier(pub u32);
+        impl Swier {
+            #[doc = "Software Interrupt on line 0"]
+            pub fn swier(&self, n: usize) -> bool {
+                assert!(n < 23usize);
+                let offs = 0usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Internal slave select"]
-            pub fn set_ssi(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
-            }
-            #[doc = "Software slave management"]
-            pub const fn ssm(&self) -> bool {
-                let val = (self.0 >> 9usize) & 0x01;
-                val != 0
+            #[doc = "Software Interrupt on line 0"]
+            pub fn set_swier(&mut self, n: usize, val: bool) {
+                assert!(n < 23usize);
+                let offs = 0usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Software slave management"]
-            pub fn set_ssm(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
+        }
+        impl Default for Swier {
+            fn default() -> Swier {
+                Swier(0)
             }
-            #[doc = "Receive only"]
-            pub const fn rxonly(&self) -> super::vals::Rxonly {
-                let val = (self.0 >> 10usize) & 0x01;
-                super::vals::Rxonly(val as u8)
+        }
+        #[doc = "Rising Trigger selection register (EXTI_RTSR)"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Rtsr(pub u32);
+        impl Rtsr {
+            #[doc = "Rising trigger event configuration of line 0"]
+            pub fn tr(&self, n: usize) -> super::vals::Tr {
+                assert!(n < 23usize);
+                let offs = 0usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
+                super::vals::Tr(val as u8)
             }
-            #[doc = "Receive only"]
-            pub fn set_rxonly(&mut self, val: super::vals::Rxonly) {
-                self.0 = (self.0 & !(0x01 << 10usize)) | (((val.0 as u32) & 0x01) << 10usize);
+            #[doc = "Rising trigger event configuration of line 0"]
+            pub fn set_tr(&mut self, n: usize, val: super::vals::Tr) {
+                assert!(n < 23usize);
+                let offs = 0usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
             }
-            #[doc = "CRC length"]
-            pub const fn crcl(&self) -> super::vals::Crcl {
-                let val = (self.0 >> 11usize) & 0x01;
-                super::vals::Crcl(val as u8)
+        }
+        impl Default for Rtsr {
+            fn default() -> Rtsr {
+                Rtsr(0)
             }
-            #[doc = "CRC length"]
-            pub fn set_crcl(&mut self, val: super::vals::Crcl) {
-                self.0 = (self.0 & !(0x01 << 11usize)) | (((val.0 as u32) & 0x01) << 11usize);
+        }
+        #[doc = "Interrupt mask register (EXTI_IMR)"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Imr(pub u32);
+        impl Imr {
+            #[doc = "Interrupt Mask on line 0"]
+            pub fn mr(&self, n: usize) -> super::vals::Mr {
+                assert!(n < 23usize);
+                let offs = 0usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
+                super::vals::Mr(val as u8)
             }
-            #[doc = "CRC transfer next"]
-            pub const fn crcnext(&self) -> super::vals::Crcnext {
-                let val = (self.0 >> 12usize) & 0x01;
-                super::vals::Crcnext(val as u8)
+            #[doc = "Interrupt Mask on line 0"]
+            pub fn set_mr(&mut self, n: usize, val: super::vals::Mr) {
+                assert!(n < 23usize);
+                let offs = 0usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
             }
-            #[doc = "CRC transfer next"]
-            pub fn set_crcnext(&mut self, val: super::vals::Crcnext) {
-                self.0 = (self.0 & !(0x01 << 12usize)) | (((val.0 as u32) & 0x01) << 12usize);
+        }
+        impl Default for Imr {
+            fn default() -> Imr {
+                Imr(0)
             }
-            #[doc = "Hardware CRC calculation enable"]
-            pub const fn crcen(&self) -> bool {
-                let val = (self.0 >> 13usize) & 0x01;
+        }
+        #[doc = "Pending register (EXTI_PR)"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Pr(pub u32);
+        impl Pr {
+            #[doc = "Pending bit 0"]
+            pub fn pr(&self, n: usize) -> bool {
+                assert!(n < 23usize);
+                let offs = 0usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Hardware CRC calculation enable"]
-            pub fn set_crcen(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 13usize)) | (((val as u32) & 0x01) << 13usize);
-            }
-            #[doc = "Output enable in bidirectional mode"]
-            pub const fn bidioe(&self) -> super::vals::Bidioe {
-                let val = (self.0 >> 14usize) & 0x01;
-                super::vals::Bidioe(val as u8)
-            }
-            #[doc = "Output enable in bidirectional mode"]
-            pub fn set_bidioe(&mut self, val: super::vals::Bidioe) {
-                self.0 = (self.0 & !(0x01 << 14usize)) | (((val.0 as u32) & 0x01) << 14usize);
-            }
-            #[doc = "Bidirectional data mode enable"]
-            pub const fn bidimode(&self) -> super::vals::Bidimode {
-                let val = (self.0 >> 15usize) & 0x01;
-                super::vals::Bidimode(val as u8)
-            }
-            #[doc = "Bidirectional data mode enable"]
-            pub fn set_bidimode(&mut self, val: super::vals::Bidimode) {
-                self.0 = (self.0 & !(0x01 << 15usize)) | (((val.0 as u32) & 0x01) << 15usize);
+            #[doc = "Pending bit 0"]
+            pub fn set_pr(&mut self, n: usize, val: bool) {
+                assert!(n < 23usize);
+                let offs = 0usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
         }
-        impl Default for Cr1 {
-            fn default() -> Cr1 {
-                Cr1(0)
+        impl Default for Pr {
+            fn default() -> Pr {
+                Pr(0)
             }
         }
     }
+    pub mod vals {
+        use crate::generic::*;
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Mr(pub u8);
+        impl Mr {
+            #[doc = "Interrupt request line is masked"]
+            pub const MASKED: Self = Self(0);
+            #[doc = "Interrupt request line is unmasked"]
+            pub const UNMASKED: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Prw(pub u8);
+        impl Prw {
+            #[doc = "Clears pending bit"]
+            pub const CLEAR: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Swierw(pub u8);
+        impl Swierw {
+            #[doc = "Generates an interrupt request"]
+            pub const PEND: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Tr(pub u8);
+        impl Tr {
+            #[doc = "Falling edge trigger is disabled"]
+            pub const DISABLED: Self = Self(0);
+            #[doc = "Falling edge trigger is enabled"]
+            pub const ENABLED: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Prr(pub u8);
+        impl Prr {
+            #[doc = "No trigger request occurred"]
+            pub const NOTPENDING: Self = Self(0);
+            #[doc = "Selected trigger request occurred"]
+            pub const PENDING: Self = Self(0x01);
+        }
+    }
 }
-pub mod dma_v2 {
+pub mod dma_v1 {
     use crate::generic::*;
     #[doc = "DMA controller"]
     #[derive(Copy, Clone)]
@@ -794,267 +701,226 @@ pub mod dma_v2 {
     unsafe impl Send for Dma {}
     unsafe impl Sync for Dma {}
     impl Dma {
-        #[doc = "low interrupt status register"]
-        pub fn isr(self, n: usize) -> Reg<regs::Isr, R> {
-            assert!(n < 2usize);
-            unsafe { Reg::from_ptr(self.0.add(0usize + n * 4usize)) }
+        #[doc = "DMA interrupt status register (DMA_ISR)"]
+        pub fn isr(self) -> Reg<regs::Isr, R> {
+            unsafe { Reg::from_ptr(self.0.add(0usize)) }
         }
-        #[doc = "low interrupt flag clear register"]
-        pub fn ifcr(self, n: usize) -> Reg<regs::Ifcr, W> {
-            assert!(n < 2usize);
-            unsafe { Reg::from_ptr(self.0.add(8usize + n * 4usize)) }
+        #[doc = "DMA interrupt flag clear register (DMA_IFCR)"]
+        pub fn ifcr(self) -> Reg<regs::Ifcr, W> {
+            unsafe { Reg::from_ptr(self.0.add(4usize)) }
         }
-        #[doc = "Stream cluster: S?CR, S?NDTR, S?M0AR, S?M1AR and S?FCR registers"]
-        pub fn st(self, n: usize) -> St {
-            assert!(n < 8usize);
-            unsafe { St(self.0.add(16usize + n * 24usize)) }
+        #[doc = "Channel cluster: CCR?, CNDTR?, CPAR?, and CMAR? registers"]
+        pub fn ch(self, n: usize) -> Ch {
+            assert!(n < 7usize);
+            unsafe { Ch(self.0.add(8usize + n * 20usize)) }
         }
     }
-    #[doc = "Stream cluster: S?CR, S?NDTR, S?M0AR, S?M1AR and S?FCR registers"]
+    #[doc = "Channel cluster: CCR?, CNDTR?, CPAR?, and CMAR? registers"]
     #[derive(Copy, Clone)]
-    pub struct St(pub *mut u8);
-    unsafe impl Send for St {}
-    unsafe impl Sync for St {}
-    impl St {
-        #[doc = "stream x configuration register"]
+    pub struct Ch(pub *mut u8);
+    unsafe impl Send for Ch {}
+    unsafe impl Sync for Ch {}
+    impl Ch {
+        #[doc = "DMA channel configuration register (DMA_CCR)"]
         pub fn cr(self) -> Reg<regs::Cr, RW> {
             unsafe { Reg::from_ptr(self.0.add(0usize)) }
         }
-        #[doc = "stream x number of data register"]
+        #[doc = "DMA channel 1 number of data register"]
         pub fn ndtr(self) -> Reg<regs::Ndtr, RW> {
             unsafe { Reg::from_ptr(self.0.add(4usize)) }
         }
-        #[doc = "stream x peripheral address register"]
+        #[doc = "DMA channel 1 peripheral address register"]
         pub fn par(self) -> Reg<u32, RW> {
             unsafe { Reg::from_ptr(self.0.add(8usize)) }
         }
-        #[doc = "stream x memory 0 address register"]
-        pub fn m0ar(self) -> Reg<u32, RW> {
+        #[doc = "DMA channel 1 memory address register"]
+        pub fn mar(self) -> Reg<u32, RW> {
             unsafe { Reg::from_ptr(self.0.add(12usize)) }
         }
-        #[doc = "stream x memory 1 address register"]
-        pub fn m1ar(self) -> Reg<u32, RW> {
-            unsafe { Reg::from_ptr(self.0.add(16usize)) }
-        }
-        #[doc = "stream x FIFO control register"]
-        pub fn fcr(self) -> Reg<regs::Fcr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(20usize)) }
-        }
     }
     pub mod vals {
         use crate::generic::*;
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Pl(pub u8);
+        impl Pl {
+            #[doc = "Low priority"]
+            pub const LOW: Self = Self(0);
+            #[doc = "Medium priority"]
+            pub const MEDIUM: Self = Self(0x01);
+            #[doc = "High priority"]
+            pub const HIGH: Self = Self(0x02);
+            #[doc = "Very high priority"]
+            pub const VERYHIGH: Self = Self(0x03);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
         pub struct Circ(pub u8);
         impl Circ {
-            #[doc = "Circular mode disabled"]
+            #[doc = "Circular buffer disabled"]
             pub const DISABLED: Self = Self(0);
-            #[doc = "Circular mode enabled"]
+            #[doc = "Circular buffer enabled"]
             pub const ENABLED: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
         pub struct Inc(pub u8);
         impl Inc {
-            #[doc = "Address pointer is fixed"]
-            pub const FIXED: Self = Self(0);
-            #[doc = "Address pointer is incremented after each data transfer"]
-            pub const INCREMENTED: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Dbm(pub u8);
-        impl Dbm {
-            #[doc = "No buffer switching at the end of transfer"]
+            #[doc = "Increment mode disabled"]
             pub const DISABLED: Self = Self(0);
-            #[doc = "Memory target switched at the end of the DMA transfer"]
+            #[doc = "Increment mode enabled"]
             pub const ENABLED: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Fth(pub u8);
-        impl Fth {
-            #[doc = "1/4 full FIFO"]
-            pub const QUARTER: Self = Self(0);
-            #[doc = "1/2 full FIFO"]
-            pub const HALF: Self = Self(0x01);
-            #[doc = "3/4 full FIFO"]
-            pub const THREEQUARTERS: Self = Self(0x02);
-            #[doc = "Full FIFO"]
-            pub const FULL: Self = Self(0x03);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
         pub struct Size(pub u8);
         impl Size {
-            #[doc = "Byte (8-bit)"]
+            #[doc = "8-bit size"]
             pub const BITS8: Self = Self(0);
-            #[doc = "Half-word (16-bit)"]
+            #[doc = "16-bit size"]
             pub const BITS16: Self = Self(0x01);
-            #[doc = "Word (32-bit)"]
+            #[doc = "32-bit size"]
             pub const BITS32: Self = Self(0x02);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Pl(pub u8);
-        impl Pl {
-            #[doc = "Low"]
-            pub const LOW: Self = Self(0);
-            #[doc = "Medium"]
-            pub const MEDIUM: Self = Self(0x01);
-            #[doc = "High"]
-            pub const HIGH: Self = Self(0x02);
-            #[doc = "Very high"]
-            pub const VERYHIGH: Self = Self(0x03);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Dmdis(pub u8);
-        impl Dmdis {
-            #[doc = "Direct mode is enabled"]
-            pub const ENABLED: Self = Self(0);
-            #[doc = "Direct mode is disabled"]
-            pub const DISABLED: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Pincos(pub u8);
-        impl Pincos {
-            #[doc = "The offset size for the peripheral address calculation is linked to the PSIZE"]
-            pub const PSIZE: Self = Self(0);
-            #[doc = "The offset size for the peripheral address calculation is fixed to 4 (32-bit alignment)"]
-            pub const FIXED4: Self = Self(0x01);
+        pub struct Memmem(pub u8);
+        impl Memmem {
+            #[doc = "Memory to memory mode disabled"]
+            pub const DISABLED: Self = Self(0);
+            #[doc = "Memory to memory mode enabled"]
+            pub const ENABLED: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
         pub struct Dir(pub u8);
         impl Dir {
-            #[doc = "Peripheral-to-memory"]
-            pub const PERIPHERALTOMEMORY: Self = Self(0);
-            #[doc = "Memory-to-peripheral"]
-            pub const MEMORYTOPERIPHERAL: Self = Self(0x01);
-            #[doc = "Memory-to-memory"]
-            pub const MEMORYTOMEMORY: Self = Self(0x02);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Pfctrl(pub u8);
-        impl Pfctrl {
-            #[doc = "The DMA is the flow controller"]
-            pub const DMA: Self = Self(0);
-            #[doc = "The peripheral is the flow controller"]
-            pub const PERIPHERAL: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ct(pub u8);
-        impl Ct {
-            #[doc = "The current target memory is Memory 0"]
-            pub const MEMORY0: Self = Self(0);
-            #[doc = "The current target memory is Memory 1"]
-            pub const MEMORY1: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Fs(pub u8);
-        impl Fs {
-            #[doc = "0 < fifo_level < 1/4"]
-            pub const QUARTER1: Self = Self(0);
-            #[doc = "1/4 <= fifo_level < 1/2"]
-            pub const QUARTER2: Self = Self(0x01);
-            #[doc = "1/2 <= fifo_level < 3/4"]
-            pub const QUARTER3: Self = Self(0x02);
-            #[doc = "3/4 <= fifo_level < full"]
-            pub const QUARTER4: Self = Self(0x03);
-            #[doc = "FIFO is empty"]
-            pub const EMPTY: Self = Self(0x04);
-            #[doc = "FIFO is full"]
-            pub const FULL: Self = Self(0x05);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Burst(pub u8);
-        impl Burst {
-            #[doc = "Single transfer"]
-            pub const SINGLE: Self = Self(0);
-            #[doc = "Incremental burst of 4 beats"]
-            pub const INCR4: Self = Self(0x01);
-            #[doc = "Incremental burst of 8 beats"]
-            pub const INCR8: Self = Self(0x02);
-            #[doc = "Incremental burst of 16 beats"]
-            pub const INCR16: Self = Self(0x03);
+            #[doc = "Read from peripheral"]
+            pub const FROMPERIPHERAL: Self = Self(0);
+            #[doc = "Read from memory"]
+            pub const FROMMEMORY: Self = Self(0x01);
         }
     }
     pub mod regs {
         use crate::generic::*;
-        #[doc = "low interrupt flag clear register"]
+        #[doc = "DMA interrupt status register (DMA_ISR)"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ifcr(pub u32);
-        impl Ifcr {
-            #[doc = "Stream x clear FIFO error interrupt flag (x = 3..0)"]
-            pub fn cfeif(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 0usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+        pub struct Isr(pub u32);
+        impl Isr {
+            #[doc = "Channel 1 Global interrupt flag"]
+            pub fn gif(&self, n: usize) -> bool {
+                assert!(n < 7usize);
+                let offs = 0usize + n * 4usize;
                 let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Stream x clear FIFO error interrupt flag (x = 3..0)"]
-            pub fn set_cfeif(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 0usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+            #[doc = "Channel 1 Global interrupt flag"]
+            pub fn set_gif(&mut self, n: usize, val: bool) {
+                assert!(n < 7usize);
+                let offs = 0usize + n * 4usize;
                 self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Stream x clear direct mode error interrupt flag (x = 3..0)"]
-            pub fn cdmeif(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 2usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+            #[doc = "Channel 1 Transfer Complete flag"]
+            pub fn tcif(&self, n: usize) -> bool {
+                assert!(n < 7usize);
+                let offs = 1usize + n * 4usize;
                 let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Stream x clear direct mode error interrupt flag (x = 3..0)"]
-            pub fn set_cdmeif(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 2usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+            #[doc = "Channel 1 Transfer Complete flag"]
+            pub fn set_tcif(&mut self, n: usize, val: bool) {
+                assert!(n < 7usize);
+                let offs = 1usize + n * 4usize;
                 self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Stream x clear transfer error interrupt flag (x = 3..0)"]
-            pub fn cteif(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 3usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+            #[doc = "Channel 1 Half Transfer Complete flag"]
+            pub fn htif(&self, n: usize) -> bool {
+                assert!(n < 7usize);
+                let offs = 2usize + n * 4usize;
                 let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Stream x clear transfer error interrupt flag (x = 3..0)"]
-            pub fn set_cteif(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 3usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+            #[doc = "Channel 1 Half Transfer Complete flag"]
+            pub fn set_htif(&mut self, n: usize, val: bool) {
+                assert!(n < 7usize);
+                let offs = 2usize + n * 4usize;
                 self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Stream x clear half transfer interrupt flag (x = 3..0)"]
-            pub fn chtif(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 4usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+            #[doc = "Channel 1 Transfer Error flag"]
+            pub fn teif(&self, n: usize) -> bool {
+                assert!(n < 7usize);
+                let offs = 3usize + n * 4usize;
                 let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Stream x clear half transfer interrupt flag (x = 3..0)"]
-            pub fn set_chtif(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 4usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+            #[doc = "Channel 1 Transfer Error flag"]
+            pub fn set_teif(&mut self, n: usize, val: bool) {
+                assert!(n < 7usize);
+                let offs = 3usize + n * 4usize;
                 self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Stream x clear transfer complete interrupt flag (x = 3..0)"]
+        }
+        impl Default for Isr {
+            fn default() -> Isr {
+                Isr(0)
+            }
+        }
+        #[doc = "DMA interrupt flag clear register (DMA_IFCR)"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Ifcr(pub u32);
+        impl Ifcr {
+            #[doc = "Channel 1 Global interrupt clear"]
+            pub fn cgif(&self, n: usize) -> bool {
+                assert!(n < 7usize);
+                let offs = 0usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
+            }
+            #[doc = "Channel 1 Global interrupt clear"]
+            pub fn set_cgif(&mut self, n: usize, val: bool) {
+                assert!(n < 7usize);
+                let offs = 0usize + n * 4usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            }
+            #[doc = "Channel 1 Transfer Complete clear"]
             pub fn ctcif(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 5usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                assert!(n < 7usize);
+                let offs = 1usize + n * 4usize;
                 let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Stream x clear transfer complete interrupt flag (x = 3..0)"]
+            #[doc = "Channel 1 Transfer Complete clear"]
             pub fn set_ctcif(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 5usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                assert!(n < 7usize);
+                let offs = 1usize + n * 4usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            }
+            #[doc = "Channel 1 Half Transfer clear"]
+            pub fn chtif(&self, n: usize) -> bool {
+                assert!(n < 7usize);
+                let offs = 2usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
+            }
+            #[doc = "Channel 1 Half Transfer clear"]
+            pub fn set_chtif(&mut self, n: usize, val: bool) {
+                assert!(n < 7usize);
+                let offs = 2usize + n * 4usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            }
+            #[doc = "Channel 1 Transfer Error clear"]
+            pub fn cteif(&self, n: usize) -> bool {
+                assert!(n < 7usize);
+                let offs = 3usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
+            }
+            #[doc = "Channel 1 Transfer Error clear"]
+            pub fn set_cteif(&mut self, n: usize, val: bool) {
+                assert!(n < 7usize);
+                let offs = 3usize + n * 4usize;
                 self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
         }
@@ -1063,17 +929,17 @@ pub mod dma_v2 {
                 Ifcr(0)
             }
         }
-        #[doc = "stream x number of data register"]
+        #[doc = "DMA channel 1 number of data register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
         pub struct Ndtr(pub u32);
         impl Ndtr {
-            #[doc = "Number of data items to transfer"]
+            #[doc = "Number of data to transfer"]
             pub const fn ndt(&self) -> u16 {
                 let val = (self.0 >> 0usize) & 0xffff;
                 val as u16
             }
-            #[doc = "Number of data items to transfer"]
+            #[doc = "Number of data to transfer"]
             pub fn set_ndt(&mut self, val: u16) {
                 self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
@@ -1083,309 +949,527 @@ pub mod dma_v2 {
                 Ndtr(0)
             }
         }
-        #[doc = "stream x configuration register"]
+        #[doc = "DMA channel configuration register (DMA_CCR)"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
         pub struct Cr(pub u32);
         impl Cr {
-            #[doc = "Stream enable / flag stream ready when read low"]
+            #[doc = "Channel enable"]
             pub const fn en(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Stream enable / flag stream ready when read low"]
+            #[doc = "Channel enable"]
             pub fn set_en(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Direct mode error interrupt enable"]
-            pub const fn dmeie(&self) -> bool {
+            #[doc = "Transfer complete interrupt enable"]
+            pub const fn tcie(&self) -> bool {
                 let val = (self.0 >> 1usize) & 0x01;
                 val != 0
             }
-            #[doc = "Direct mode error interrupt enable"]
-            pub fn set_dmeie(&mut self, val: bool) {
+            #[doc = "Transfer complete interrupt enable"]
+            pub fn set_tcie(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "Transfer error interrupt enable"]
-            pub const fn teie(&self) -> bool {
+            #[doc = "Half Transfer interrupt enable"]
+            pub const fn htie(&self) -> bool {
                 let val = (self.0 >> 2usize) & 0x01;
                 val != 0
             }
-            #[doc = "Transfer error interrupt enable"]
-            pub fn set_teie(&mut self, val: bool) {
+            #[doc = "Half Transfer interrupt enable"]
+            pub fn set_htie(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
             }
-            #[doc = "Half transfer interrupt enable"]
-            pub const fn htie(&self) -> bool {
+            #[doc = "Transfer error interrupt enable"]
+            pub const fn teie(&self) -> bool {
                 let val = (self.0 >> 3usize) & 0x01;
                 val != 0
             }
-            #[doc = "Half transfer interrupt enable"]
-            pub fn set_htie(&mut self, val: bool) {
+            #[doc = "Transfer error interrupt enable"]
+            pub fn set_teie(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
             }
-            #[doc = "Transfer complete interrupt enable"]
-            pub const fn tcie(&self) -> bool {
-                let val = (self.0 >> 4usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Transfer complete interrupt enable"]
-            pub fn set_tcie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
-            }
-            #[doc = "Peripheral flow controller"]
-            pub const fn pfctrl(&self) -> super::vals::Pfctrl {
-                let val = (self.0 >> 5usize) & 0x01;
-                super::vals::Pfctrl(val as u8)
-            }
-            #[doc = "Peripheral flow controller"]
-            pub fn set_pfctrl(&mut self, val: super::vals::Pfctrl) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val.0 as u32) & 0x01) << 5usize);
-            }
             #[doc = "Data transfer direction"]
             pub const fn dir(&self) -> super::vals::Dir {
-                let val = (self.0 >> 6usize) & 0x03;
+                let val = (self.0 >> 4usize) & 0x01;
                 super::vals::Dir(val as u8)
             }
             #[doc = "Data transfer direction"]
             pub fn set_dir(&mut self, val: super::vals::Dir) {
-                self.0 = (self.0 & !(0x03 << 6usize)) | (((val.0 as u32) & 0x03) << 6usize);
+                self.0 = (self.0 & !(0x01 << 4usize)) | (((val.0 as u32) & 0x01) << 4usize);
             }
             #[doc = "Circular mode"]
             pub const fn circ(&self) -> super::vals::Circ {
-                let val = (self.0 >> 8usize) & 0x01;
+                let val = (self.0 >> 5usize) & 0x01;
                 super::vals::Circ(val as u8)
             }
             #[doc = "Circular mode"]
             pub fn set_circ(&mut self, val: super::vals::Circ) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val.0 as u32) & 0x01) << 8usize);
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val.0 as u32) & 0x01) << 5usize);
             }
             #[doc = "Peripheral increment mode"]
             pub const fn pinc(&self) -> super::vals::Inc {
-                let val = (self.0 >> 9usize) & 0x01;
+                let val = (self.0 >> 6usize) & 0x01;
                 super::vals::Inc(val as u8)
             }
             #[doc = "Peripheral increment mode"]
             pub fn set_pinc(&mut self, val: super::vals::Inc) {
-                self.0 = (self.0 & !(0x01 << 9usize)) | (((val.0 as u32) & 0x01) << 9usize);
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val.0 as u32) & 0x01) << 6usize);
             }
             #[doc = "Memory increment mode"]
             pub const fn minc(&self) -> super::vals::Inc {
-                let val = (self.0 >> 10usize) & 0x01;
+                let val = (self.0 >> 7usize) & 0x01;
                 super::vals::Inc(val as u8)
             }
             #[doc = "Memory increment mode"]
             pub fn set_minc(&mut self, val: super::vals::Inc) {
-                self.0 = (self.0 & !(0x01 << 10usize)) | (((val.0 as u32) & 0x01) << 10usize);
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
             }
-            #[doc = "Peripheral data size"]
+            #[doc = "Peripheral size"]
             pub const fn psize(&self) -> super::vals::Size {
-                let val = (self.0 >> 11usize) & 0x03;
+                let val = (self.0 >> 8usize) & 0x03;
                 super::vals::Size(val as u8)
             }
-            #[doc = "Peripheral data size"]
+            #[doc = "Peripheral size"]
             pub fn set_psize(&mut self, val: super::vals::Size) {
-                self.0 = (self.0 & !(0x03 << 11usize)) | (((val.0 as u32) & 0x03) << 11usize);
+                self.0 = (self.0 & !(0x03 << 8usize)) | (((val.0 as u32) & 0x03) << 8usize);
             }
-            #[doc = "Memory data size"]
+            #[doc = "Memory size"]
             pub const fn msize(&self) -> super::vals::Size {
-                let val = (self.0 >> 13usize) & 0x03;
+                let val = (self.0 >> 10usize) & 0x03;
                 super::vals::Size(val as u8)
             }
-            #[doc = "Memory data size"]
+            #[doc = "Memory size"]
             pub fn set_msize(&mut self, val: super::vals::Size) {
-                self.0 = (self.0 & !(0x03 << 13usize)) | (((val.0 as u32) & 0x03) << 13usize);
-            }
-            #[doc = "Peripheral increment offset size"]
-            pub const fn pincos(&self) -> super::vals::Pincos {
-                let val = (self.0 >> 15usize) & 0x01;
-                super::vals::Pincos(val as u8)
-            }
-            #[doc = "Peripheral increment offset size"]
-            pub fn set_pincos(&mut self, val: super::vals::Pincos) {
-                self.0 = (self.0 & !(0x01 << 15usize)) | (((val.0 as u32) & 0x01) << 15usize);
+                self.0 = (self.0 & !(0x03 << 10usize)) | (((val.0 as u32) & 0x03) << 10usize);
             }
-            #[doc = "Priority level"]
+            #[doc = "Channel Priority level"]
             pub const fn pl(&self) -> super::vals::Pl {
-                let val = (self.0 >> 16usize) & 0x03;
+                let val = (self.0 >> 12usize) & 0x03;
                 super::vals::Pl(val as u8)
             }
-            #[doc = "Priority level"]
+            #[doc = "Channel Priority level"]
             pub fn set_pl(&mut self, val: super::vals::Pl) {
-                self.0 = (self.0 & !(0x03 << 16usize)) | (((val.0 as u32) & 0x03) << 16usize);
+                self.0 = (self.0 & !(0x03 << 12usize)) | (((val.0 as u32) & 0x03) << 12usize);
             }
-            #[doc = "Double buffer mode"]
-            pub const fn dbm(&self) -> super::vals::Dbm {
+            #[doc = "Memory to memory mode"]
+            pub const fn mem2mem(&self) -> super::vals::Memmem {
+                let val = (self.0 >> 14usize) & 0x01;
+                super::vals::Memmem(val as u8)
+            }
+            #[doc = "Memory to memory mode"]
+            pub fn set_mem2mem(&mut self, val: super::vals::Memmem) {
+                self.0 = (self.0 & !(0x01 << 14usize)) | (((val.0 as u32) & 0x01) << 14usize);
+            }
+        }
+        impl Default for Cr {
+            fn default() -> Cr {
+                Cr(0)
+            }
+        }
+    }
+}
+pub mod generic {
+    use core::marker::PhantomData;
+    #[derive(Copy, Clone)]
+    pub struct RW;
+    #[derive(Copy, Clone)]
+    pub struct R;
+    #[derive(Copy, Clone)]
+    pub struct W;
+    mod sealed {
+        use super::*;
+        pub trait Access {}
+        impl Access for R {}
+        impl Access for W {}
+        impl Access for RW {}
+    }
+    pub trait Access: sealed::Access + Copy {}
+    impl Access for R {}
+    impl Access for W {}
+    impl Access for RW {}
+    pub trait Read: Access {}
+    impl Read for RW {}
+    impl Read for R {}
+    pub trait Write: Access {}
+    impl Write for RW {}
+    impl Write for W {}
+    #[derive(Copy, Clone)]
+    pub struct Reg<T: Copy, A: Access> {
+        ptr: *mut u8,
+        phantom: PhantomData<*mut (T, A)>,
+    }
+    unsafe impl<T: Copy, A: Access> Send for Reg<T, A> {}
+    unsafe impl<T: Copy, A: Access> Sync for Reg<T, A> {}
+    impl<T: Copy, A: Access> Reg<T, A> {
+        pub fn from_ptr(ptr: *mut u8) -> Self {
+            Self {
+                ptr,
+                phantom: PhantomData,
+            }
+        }
+        pub fn ptr(&self) -> *mut T {
+            self.ptr as _
+        }
+    }
+    impl<T: Copy, A: Read> Reg<T, A> {
+        pub unsafe fn read(&self) -> T {
+            (self.ptr as *mut T).read_volatile()
+        }
+    }
+    impl<T: Copy, A: Write> Reg<T, A> {
+        pub unsafe fn write_value(&self, val: T) {
+            (self.ptr as *mut T).write_volatile(val)
+        }
+    }
+    impl<T: Default + Copy, A: Write> Reg<T, A> {
+        pub unsafe fn write<R>(&self, f: impl FnOnce(&mut T) -> R) -> R {
+            let mut val = Default::default();
+            let res = f(&mut val);
+            self.write_value(val);
+            res
+        }
+    }
+    impl<T: Copy, A: Read + Write> Reg<T, A> {
+        pub unsafe fn modify<R>(&self, f: impl FnOnce(&mut T) -> R) -> R {
+            let mut val = self.read();
+            let res = f(&mut val);
+            self.write_value(val);
+            res
+        }
+    }
+}
+pub mod syscfg_l4 {
+    use crate::generic::*;
+    #[doc = "System configuration controller"]
+    #[derive(Copy, Clone)]
+    pub struct Syscfg(pub *mut u8);
+    unsafe impl Send for Syscfg {}
+    unsafe impl Sync for Syscfg {}
+    impl Syscfg {
+        #[doc = "memory remap register"]
+        pub fn memrmp(self) -> Reg<regs::Memrmp, RW> {
+            unsafe { Reg::from_ptr(self.0.add(0usize)) }
+        }
+        #[doc = "configuration register 1"]
+        pub fn cfgr1(self) -> Reg<regs::Cfgr1, RW> {
+            unsafe { Reg::from_ptr(self.0.add(4usize)) }
+        }
+        #[doc = "external interrupt configuration register 1"]
+        pub fn exticr(self, n: usize) -> Reg<regs::Exticr, RW> {
+            assert!(n < 4usize);
+            unsafe { Reg::from_ptr(self.0.add(8usize + n * 4usize)) }
+        }
+        #[doc = "SCSR"]
+        pub fn scsr(self) -> Reg<regs::Scsr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(24usize)) }
+        }
+        #[doc = "CFGR2"]
+        pub fn cfgr2(self) -> Reg<regs::Cfgr2, RW> {
+            unsafe { Reg::from_ptr(self.0.add(28usize)) }
+        }
+        #[doc = "SWPR"]
+        pub fn swpr(self) -> Reg<regs::Swpr, W> {
+            unsafe { Reg::from_ptr(self.0.add(32usize)) }
+        }
+        #[doc = "SKR"]
+        pub fn skr(self) -> Reg<regs::Skr, W> {
+            unsafe { Reg::from_ptr(self.0.add(36usize)) }
+        }
+    }
+    pub mod regs {
+        use crate::generic::*;
+        #[doc = "external interrupt configuration register 4"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Exticr(pub u32);
+        impl Exticr {
+            #[doc = "EXTI12 configuration bits"]
+            pub fn exti(&self, n: usize) -> u8 {
+                assert!(n < 4usize);
+                let offs = 0usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x0f;
+                val as u8
+            }
+            #[doc = "EXTI12 configuration bits"]
+            pub fn set_exti(&mut self, n: usize, val: u8) {
+                assert!(n < 4usize);
+                let offs = 0usize + n * 4usize;
+                self.0 = (self.0 & !(0x0f << offs)) | (((val as u32) & 0x0f) << offs);
+            }
+        }
+        impl Default for Exticr {
+            fn default() -> Exticr {
+                Exticr(0)
+            }
+        }
+        #[doc = "SWPR"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Swpr(pub u32);
+        impl Swpr {
+            #[doc = "SRAWM2 write protection."]
+            pub fn pwp(&self, n: usize) -> bool {
+                assert!(n < 32usize);
+                let offs = 0usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
+            }
+            #[doc = "SRAWM2 write protection."]
+            pub fn set_pwp(&mut self, n: usize, val: bool) {
+                assert!(n < 32usize);
+                let offs = 0usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            }
+        }
+        impl Default for Swpr {
+            fn default() -> Swpr {
+                Swpr(0)
+            }
+        }
+        #[doc = "configuration register 1"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Cfgr1(pub u32);
+        impl Cfgr1 {
+            #[doc = "Firewall disable"]
+            pub const fn fwdis(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Firewall disable"]
+            pub fn set_fwdis(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            }
+            #[doc = "I/O analog switch voltage booster enable"]
+            pub const fn boosten(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
+                val != 0
+            }
+            #[doc = "I/O analog switch voltage booster enable"]
+            pub fn set_boosten(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            }
+            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB6"]
+            pub const fn i2c_pb6_fmp(&self) -> bool {
+                let val = (self.0 >> 16usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB6"]
+            pub fn set_i2c_pb6_fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
+            }
+            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB7"]
+            pub const fn i2c_pb7_fmp(&self) -> bool {
+                let val = (self.0 >> 17usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB7"]
+            pub fn set_i2c_pb7_fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 17usize)) | (((val as u32) & 0x01) << 17usize);
+            }
+            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB8"]
+            pub const fn i2c_pb8_fmp(&self) -> bool {
                 let val = (self.0 >> 18usize) & 0x01;
-                super::vals::Dbm(val as u8)
+                val != 0
             }
-            #[doc = "Double buffer mode"]
-            pub fn set_dbm(&mut self, val: super::vals::Dbm) {
-                self.0 = (self.0 & !(0x01 << 18usize)) | (((val.0 as u32) & 0x01) << 18usize);
+            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB8"]
+            pub fn set_i2c_pb8_fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 18usize)) | (((val as u32) & 0x01) << 18usize);
             }
-            #[doc = "Current target (only in double buffer mode)"]
-            pub const fn ct(&self) -> super::vals::Ct {
+            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB9"]
+            pub const fn i2c_pb9_fmp(&self) -> bool {
                 let val = (self.0 >> 19usize) & 0x01;
-                super::vals::Ct(val as u8)
+                val != 0
             }
-            #[doc = "Current target (only in double buffer mode)"]
-            pub fn set_ct(&mut self, val: super::vals::Ct) {
-                self.0 = (self.0 & !(0x01 << 19usize)) | (((val.0 as u32) & 0x01) << 19usize);
+            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB9"]
+            pub fn set_i2c_pb9_fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 19usize)) | (((val as u32) & 0x01) << 19usize);
             }
-            #[doc = "Peripheral burst transfer configuration"]
-            pub const fn pburst(&self) -> super::vals::Burst {
-                let val = (self.0 >> 21usize) & 0x03;
-                super::vals::Burst(val as u8)
+            #[doc = "I2C1 Fast-mode Plus driving capability activation"]
+            pub const fn i2c1_fmp(&self) -> bool {
+                let val = (self.0 >> 20usize) & 0x01;
+                val != 0
             }
-            #[doc = "Peripheral burst transfer configuration"]
-            pub fn set_pburst(&mut self, val: super::vals::Burst) {
-                self.0 = (self.0 & !(0x03 << 21usize)) | (((val.0 as u32) & 0x03) << 21usize);
+            #[doc = "I2C1 Fast-mode Plus driving capability activation"]
+            pub fn set_i2c1_fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 20usize)) | (((val as u32) & 0x01) << 20usize);
             }
-            #[doc = "Memory burst transfer configuration"]
-            pub const fn mburst(&self) -> super::vals::Burst {
-                let val = (self.0 >> 23usize) & 0x03;
-                super::vals::Burst(val as u8)
+            #[doc = "I2C2 Fast-mode Plus driving capability activation"]
+            pub const fn i2c2_fmp(&self) -> bool {
+                let val = (self.0 >> 21usize) & 0x01;
+                val != 0
             }
-            #[doc = "Memory burst transfer configuration"]
-            pub fn set_mburst(&mut self, val: super::vals::Burst) {
-                self.0 = (self.0 & !(0x03 << 23usize)) | (((val.0 as u32) & 0x03) << 23usize);
+            #[doc = "I2C2 Fast-mode Plus driving capability activation"]
+            pub fn set_i2c2_fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 21usize)) | (((val as u32) & 0x01) << 21usize);
             }
-            #[doc = "Channel selection"]
-            pub const fn chsel(&self) -> u8 {
-                let val = (self.0 >> 25usize) & 0x0f;
+            #[doc = "I2C3 Fast-mode Plus driving capability activation"]
+            pub const fn i2c3_fmp(&self) -> bool {
+                let val = (self.0 >> 22usize) & 0x01;
+                val != 0
+            }
+            #[doc = "I2C3 Fast-mode Plus driving capability activation"]
+            pub fn set_i2c3_fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 22usize)) | (((val as u32) & 0x01) << 22usize);
+            }
+            #[doc = "Floating Point Unit interrupts enable bits"]
+            pub const fn fpu_ie(&self) -> u8 {
+                let val = (self.0 >> 26usize) & 0x3f;
                 val as u8
             }
-            #[doc = "Channel selection"]
-            pub fn set_chsel(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x0f << 25usize)) | (((val as u32) & 0x0f) << 25usize);
+            #[doc = "Floating Point Unit interrupts enable bits"]
+            pub fn set_fpu_ie(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x3f << 26usize)) | (((val as u32) & 0x3f) << 26usize);
             }
         }
-        impl Default for Cr {
-            fn default() -> Cr {
-                Cr(0)
+        impl Default for Cfgr1 {
+            fn default() -> Cfgr1 {
+                Cfgr1(0)
             }
         }
-        #[doc = "stream x FIFO control register"]
+        #[doc = "memory remap register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Fcr(pub u32);
-        impl Fcr {
-            #[doc = "FIFO threshold selection"]
-            pub const fn fth(&self) -> super::vals::Fth {
-                let val = (self.0 >> 0usize) & 0x03;
-                super::vals::Fth(val as u8)
+        pub struct Memrmp(pub u32);
+        impl Memrmp {
+            #[doc = "Memory mapping selection"]
+            pub const fn mem_mode(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x07;
+                val as u8
             }
-            #[doc = "FIFO threshold selection"]
-            pub fn set_fth(&mut self, val: super::vals::Fth) {
-                self.0 = (self.0 & !(0x03 << 0usize)) | (((val.0 as u32) & 0x03) << 0usize);
+            #[doc = "Memory mapping selection"]
+            pub fn set_mem_mode(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x07 << 0usize)) | (((val as u32) & 0x07) << 0usize);
             }
-            #[doc = "Direct mode disable"]
-            pub const fn dmdis(&self) -> super::vals::Dmdis {
-                let val = (self.0 >> 2usize) & 0x01;
-                super::vals::Dmdis(val as u8)
+            #[doc = "QUADSPI memory mapping swap"]
+            pub const fn qfs(&self) -> bool {
+                let val = (self.0 >> 3usize) & 0x01;
+                val != 0
             }
-            #[doc = "Direct mode disable"]
-            pub fn set_dmdis(&mut self, val: super::vals::Dmdis) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val.0 as u32) & 0x01) << 2usize);
+            #[doc = "QUADSPI memory mapping swap"]
+            pub fn set_qfs(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
             }
-            #[doc = "FIFO status"]
-            pub const fn fs(&self) -> super::vals::Fs {
-                let val = (self.0 >> 3usize) & 0x07;
-                super::vals::Fs(val as u8)
+            #[doc = "Flash Bank mode selection"]
+            pub const fn fb_mode(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
+                val != 0
             }
-            #[doc = "FIFO status"]
-            pub fn set_fs(&mut self, val: super::vals::Fs) {
-                self.0 = (self.0 & !(0x07 << 3usize)) | (((val.0 as u32) & 0x07) << 3usize);
+            #[doc = "Flash Bank mode selection"]
+            pub fn set_fb_mode(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
-            #[doc = "FIFO error interrupt enable"]
-            pub const fn feie(&self) -> bool {
-                let val = (self.0 >> 7usize) & 0x01;
+        }
+        impl Default for Memrmp {
+            fn default() -> Memrmp {
+                Memrmp(0)
+            }
+        }
+        #[doc = "SCSR"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Scsr(pub u32);
+        impl Scsr {
+            #[doc = "SRAM2 Erase"]
+            pub const fn sram2er(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "FIFO error interrupt enable"]
-            pub fn set_feie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            #[doc = "SRAM2 Erase"]
+            pub fn set_sram2er(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            }
+            #[doc = "SRAM2 busy by erase operation"]
+            pub const fn sram2bsy(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
+                val != 0
+            }
+            #[doc = "SRAM2 busy by erase operation"]
+            pub fn set_sram2bsy(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
         }
-        impl Default for Fcr {
-            fn default() -> Fcr {
-                Fcr(0)
+        impl Default for Scsr {
+            fn default() -> Scsr {
+                Scsr(0)
             }
         }
-        #[doc = "low interrupt status register"]
+        #[doc = "SKR"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Isr(pub u32);
-        impl Isr {
-            #[doc = "Stream x FIFO error interrupt flag (x=3..0)"]
-            pub fn feif(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 0usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
-                let val = (self.0 >> offs) & 0x01;
+        pub struct Skr(pub u32);
+        impl Skr {
+            #[doc = "SRAM2 write protection key for software erase"]
+            pub const fn key(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0xff;
+                val as u8
+            }
+            #[doc = "SRAM2 write protection key for software erase"]
+            pub fn set_key(&mut self, val: u8) {
+                self.0 = (self.0 & !(0xff << 0usize)) | (((val as u32) & 0xff) << 0usize);
+            }
+        }
+        impl Default for Skr {
+            fn default() -> Skr {
+                Skr(0)
+            }
+        }
+        #[doc = "CFGR2"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Cfgr2(pub u32);
+        impl Cfgr2 {
+            #[doc = "Cortex LOCKUP (Hardfault) output enable bit"]
+            pub const fn cll(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Stream x FIFO error interrupt flag (x=3..0)"]
-            pub fn set_feif(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 0usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Cortex LOCKUP (Hardfault) output enable bit"]
+            pub fn set_cll(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Stream x direct mode error interrupt flag (x=3..0)"]
-            pub fn dmeif(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 2usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "SRAM2 parity lock bit"]
+            pub const fn spl(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
                 val != 0
             }
-            #[doc = "Stream x direct mode error interrupt flag (x=3..0)"]
-            pub fn set_dmeif(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 2usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "SRAM2 parity lock bit"]
+            pub fn set_spl(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "Stream x transfer error interrupt flag (x=3..0)"]
-            pub fn teif(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 3usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "PVD lock enable bit"]
+            pub const fn pvdl(&self) -> bool {
+                let val = (self.0 >> 2usize) & 0x01;
                 val != 0
             }
-            #[doc = "Stream x transfer error interrupt flag (x=3..0)"]
-            pub fn set_teif(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 3usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "PVD lock enable bit"]
+            pub fn set_pvdl(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
             }
-            #[doc = "Stream x half transfer interrupt flag (x=3..0)"]
-            pub fn htif(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 4usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "ECC Lock"]
+            pub const fn eccl(&self) -> bool {
+                let val = (self.0 >> 3usize) & 0x01;
                 val != 0
             }
-            #[doc = "Stream x half transfer interrupt flag (x=3..0)"]
-            pub fn set_htif(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 4usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "ECC Lock"]
+            pub fn set_eccl(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
             }
-            #[doc = "Stream x transfer complete interrupt flag (x = 3..0)"]
-            pub fn tcif(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 5usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "SRAM2 parity error flag"]
+            pub const fn spf(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
                 val != 0
             }
-            #[doc = "Stream x transfer complete interrupt flag (x = 3..0)"]
-            pub fn set_tcif(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 5usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "SRAM2 parity error flag"]
+            pub fn set_spf(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
         }
-        impl Default for Isr {
-            fn default() -> Isr {
-                Isr(0)
+        impl Default for Cfgr2 {
+            fn default() -> Cfgr2 {
+                Cfgr2(0)
             }
         }
     }
@@ -1436,214 +1520,54 @@ pub mod gpio_v2 {
             unsafe { Reg::from_ptr(self.0.add(32usize + n * 4usize)) }
         }
     }
-    pub mod vals {
-        use crate::generic::*;
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Lckk(pub u8);
-        impl Lckk {
-            #[doc = "Port configuration lock key not active"]
-            pub const NOTACTIVE: Self = Self(0);
-            #[doc = "Port configuration lock key active"]
-            pub const ACTIVE: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Afr(pub u8);
-        impl Afr {
-            #[doc = "AF0"]
-            pub const AF0: Self = Self(0);
-            #[doc = "AF1"]
-            pub const AF1: Self = Self(0x01);
-            #[doc = "AF2"]
-            pub const AF2: Self = Self(0x02);
-            #[doc = "AF3"]
-            pub const AF3: Self = Self(0x03);
-            #[doc = "AF4"]
-            pub const AF4: Self = Self(0x04);
-            #[doc = "AF5"]
-            pub const AF5: Self = Self(0x05);
-            #[doc = "AF6"]
-            pub const AF6: Self = Self(0x06);
-            #[doc = "AF7"]
-            pub const AF7: Self = Self(0x07);
-            #[doc = "AF8"]
-            pub const AF8: Self = Self(0x08);
-            #[doc = "AF9"]
-            pub const AF9: Self = Self(0x09);
-            #[doc = "AF10"]
-            pub const AF10: Self = Self(0x0a);
-            #[doc = "AF11"]
-            pub const AF11: Self = Self(0x0b);
-            #[doc = "AF12"]
-            pub const AF12: Self = Self(0x0c);
-            #[doc = "AF13"]
-            pub const AF13: Self = Self(0x0d);
-            #[doc = "AF14"]
-            pub const AF14: Self = Self(0x0e);
-            #[doc = "AF15"]
-            pub const AF15: Self = Self(0x0f);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Brw(pub u8);
-        impl Brw {
-            #[doc = "Resets the corresponding ODRx bit"]
-            pub const RESET: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ospeedr(pub u8);
-        impl Ospeedr {
-            #[doc = "Low speed"]
-            pub const LOWSPEED: Self = Self(0);
-            #[doc = "Medium speed"]
-            pub const MEDIUMSPEED: Self = Self(0x01);
-            #[doc = "High speed"]
-            pub const HIGHSPEED: Self = Self(0x02);
-            #[doc = "Very high speed"]
-            pub const VERYHIGHSPEED: Self = Self(0x03);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Idr(pub u8);
-        impl Idr {
-            #[doc = "Input is logic low"]
-            pub const LOW: Self = Self(0);
-            #[doc = "Input is logic high"]
-            pub const HIGH: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ot(pub u8);
-        impl Ot {
-            #[doc = "Output push-pull (reset state)"]
-            pub const PUSHPULL: Self = Self(0);
-            #[doc = "Output open-drain"]
-            pub const OPENDRAIN: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Pupdr(pub u8);
-        impl Pupdr {
-            #[doc = "No pull-up, pull-down"]
-            pub const FLOATING: Self = Self(0);
-            #[doc = "Pull-up"]
-            pub const PULLUP: Self = Self(0x01);
-            #[doc = "Pull-down"]
-            pub const PULLDOWN: Self = Self(0x02);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Moder(pub u8);
-        impl Moder {
-            #[doc = "Input mode (reset state)"]
-            pub const INPUT: Self = Self(0);
-            #[doc = "General purpose output mode"]
-            pub const OUTPUT: Self = Self(0x01);
-            #[doc = "Alternate function mode"]
-            pub const ALTERNATE: Self = Self(0x02);
-            #[doc = "Analog mode"]
-            pub const ANALOG: Self = Self(0x03);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Bsw(pub u8);
-        impl Bsw {
-            #[doc = "Sets the corresponding ODRx bit"]
-            pub const SET: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Lck(pub u8);
-        impl Lck {
-            #[doc = "Port configuration not locked"]
-            pub const UNLOCKED: Self = Self(0);
-            #[doc = "Port configuration locked"]
-            pub const LOCKED: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Odr(pub u8);
-        impl Odr {
-            #[doc = "Set output to logic low"]
-            pub const LOW: Self = Self(0);
-            #[doc = "Set output to logic high"]
-            pub const HIGH: Self = Self(0x01);
-        }
-    }
     pub mod regs {
         use crate::generic::*;
-        #[doc = "GPIO port output speed register"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ospeedr(pub u32);
-        impl Ospeedr {
-            #[doc = "Port x configuration bits (y = 0..15)"]
-            pub fn ospeedr(&self, n: usize) -> super::vals::Ospeedr {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 2usize;
-                let val = (self.0 >> offs) & 0x03;
-                super::vals::Ospeedr(val as u8)
-            }
-            #[doc = "Port x configuration bits (y = 0..15)"]
-            pub fn set_ospeedr(&mut self, n: usize, val: super::vals::Ospeedr) {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 2usize;
-                self.0 = (self.0 & !(0x03 << offs)) | (((val.0 as u32) & 0x03) << offs);
-            }
-        }
-        impl Default for Ospeedr {
-            fn default() -> Ospeedr {
-                Ospeedr(0)
-            }
-        }
-        #[doc = "GPIO port input data register"]
+        #[doc = "GPIO port output data register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Idr(pub u32);
-        impl Idr {
-            #[doc = "Port input data (y = 0..15)"]
-            pub fn idr(&self, n: usize) -> super::vals::Idr {
+        pub struct Odr(pub u32);
+        impl Odr {
+            #[doc = "Port output data (y = 0..15)"]
+            pub fn odr(&self, n: usize) -> super::vals::Odr {
                 assert!(n < 16usize);
                 let offs = 0usize + n * 1usize;
                 let val = (self.0 >> offs) & 0x01;
-                super::vals::Idr(val as u8)
+                super::vals::Odr(val as u8)
             }
-            #[doc = "Port input data (y = 0..15)"]
-            pub fn set_idr(&mut self, n: usize, val: super::vals::Idr) {
+            #[doc = "Port output data (y = 0..15)"]
+            pub fn set_odr(&mut self, n: usize, val: super::vals::Odr) {
                 assert!(n < 16usize);
                 let offs = 0usize + n * 1usize;
                 self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
             }
         }
-        impl Default for Idr {
-            fn default() -> Idr {
-                Idr(0)
+        impl Default for Odr {
+            fn default() -> Odr {
+                Odr(0)
             }
         }
-        #[doc = "GPIO port pull-up/pull-down register"]
+        #[doc = "GPIO alternate function register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Pupdr(pub u32);
-        impl Pupdr {
-            #[doc = "Port x configuration bits (y = 0..15)"]
-            pub fn pupdr(&self, n: usize) -> super::vals::Pupdr {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 2usize;
-                let val = (self.0 >> offs) & 0x03;
-                super::vals::Pupdr(val as u8)
+        pub struct Afr(pub u32);
+        impl Afr {
+            #[doc = "Alternate function selection for port x bit y (y = 0..15)"]
+            pub fn afr(&self, n: usize) -> super::vals::Afr {
+                assert!(n < 8usize);
+                let offs = 0usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x0f;
+                super::vals::Afr(val as u8)
             }
-            #[doc = "Port x configuration bits (y = 0..15)"]
-            pub fn set_pupdr(&mut self, n: usize, val: super::vals::Pupdr) {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 2usize;
-                self.0 = (self.0 & !(0x03 << offs)) | (((val.0 as u32) & 0x03) << offs);
+            #[doc = "Alternate function selection for port x bit y (y = 0..15)"]
+            pub fn set_afr(&mut self, n: usize, val: super::vals::Afr) {
+                assert!(n < 8usize);
+                let offs = 0usize + n * 4usize;
+                self.0 = (self.0 & !(0x0f << offs)) | (((val.0 as u32) & 0x0f) << offs);
             }
         }
-        impl Default for Pupdr {
-            fn default() -> Pupdr {
-                Pupdr(0)
+        impl Default for Afr {
+            fn default() -> Afr {
+                Afr(0)
             }
         }
         #[doc = "GPIO port bit set/reset register"]
@@ -1683,28 +1607,85 @@ pub mod gpio_v2 {
                 Bsrr(0)
             }
         }
-        #[doc = "GPIO port output type register"]
+        #[doc = "GPIO port output speed register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Otyper(pub u32);
-        impl Otyper {
+        pub struct Ospeedr(pub u32);
+        impl Ospeedr {
             #[doc = "Port x configuration bits (y = 0..15)"]
-            pub fn ot(&self, n: usize) -> super::vals::Ot {
+            pub fn ospeedr(&self, n: usize) -> super::vals::Ospeedr {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 2usize;
+                let val = (self.0 >> offs) & 0x03;
+                super::vals::Ospeedr(val as u8)
+            }
+            #[doc = "Port x configuration bits (y = 0..15)"]
+            pub fn set_ospeedr(&mut self, n: usize, val: super::vals::Ospeedr) {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 2usize;
+                self.0 = (self.0 & !(0x03 << offs)) | (((val.0 as u32) & 0x03) << offs);
+            }
+        }
+        impl Default for Ospeedr {
+            fn default() -> Ospeedr {
+                Ospeedr(0)
+            }
+        }
+        #[doc = "GPIO port configuration lock register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Lckr(pub u32);
+        impl Lckr {
+            #[doc = "Port x lock bit y (y= 0..15)"]
+            pub fn lck(&self, n: usize) -> super::vals::Lck {
                 assert!(n < 16usize);
                 let offs = 0usize + n * 1usize;
                 let val = (self.0 >> offs) & 0x01;
-                super::vals::Ot(val as u8)
+                super::vals::Lck(val as u8)
             }
-            #[doc = "Port x configuration bits (y = 0..15)"]
-            pub fn set_ot(&mut self, n: usize, val: super::vals::Ot) {
+            #[doc = "Port x lock bit y (y= 0..15)"]
+            pub fn set_lck(&mut self, n: usize, val: super::vals::Lck) {
                 assert!(n < 16usize);
                 let offs = 0usize + n * 1usize;
                 self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
             }
+            #[doc = "Port x lock bit y (y= 0..15)"]
+            pub const fn lckk(&self) -> super::vals::Lckk {
+                let val = (self.0 >> 16usize) & 0x01;
+                super::vals::Lckk(val as u8)
+            }
+            #[doc = "Port x lock bit y (y= 0..15)"]
+            pub fn set_lckk(&mut self, val: super::vals::Lckk) {
+                self.0 = (self.0 & !(0x01 << 16usize)) | (((val.0 as u32) & 0x01) << 16usize);
+            }
         }
-        impl Default for Otyper {
-            fn default() -> Otyper {
-                Otyper(0)
+        impl Default for Lckr {
+            fn default() -> Lckr {
+                Lckr(0)
+            }
+        }
+        #[doc = "GPIO port input data register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Idr(pub u32);
+        impl Idr {
+            #[doc = "Port input data (y = 0..15)"]
+            pub fn idr(&self, n: usize) -> super::vals::Idr {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
+                super::vals::Idr(val as u8)
+            }
+            #[doc = "Port input data (y = 0..15)"]
+            pub fn set_idr(&mut self, n: usize, val: super::vals::Idr) {
+                assert!(n < 16usize);
+                let offs = 0usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
+            }
+        }
+        impl Default for Idr {
+            fn default() -> Idr {
+                Idr(0)
             }
         }
         #[doc = "GPIO port mode register"]
@@ -1731,2484 +1712,2614 @@ pub mod gpio_v2 {
                 Moder(0)
             }
         }
-        #[doc = "GPIO alternate function register"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Afr(pub u32);
-        impl Afr {
-            #[doc = "Alternate function selection for port x bit y (y = 0..15)"]
-            pub fn afr(&self, n: usize) -> super::vals::Afr {
-                assert!(n < 8usize);
-                let offs = 0usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x0f;
-                super::vals::Afr(val as u8)
-            }
-            #[doc = "Alternate function selection for port x bit y (y = 0..15)"]
-            pub fn set_afr(&mut self, n: usize, val: super::vals::Afr) {
-                assert!(n < 8usize);
-                let offs = 0usize + n * 4usize;
-                self.0 = (self.0 & !(0x0f << offs)) | (((val.0 as u32) & 0x0f) << offs);
-            }
-        }
-        impl Default for Afr {
-            fn default() -> Afr {
-                Afr(0)
-            }
-        }
-        #[doc = "GPIO port output data register"]
+        #[doc = "GPIO port pull-up/pull-down register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Odr(pub u32);
-        impl Odr {
-            #[doc = "Port output data (y = 0..15)"]
-            pub fn odr(&self, n: usize) -> super::vals::Odr {
+        pub struct Pupdr(pub u32);
+        impl Pupdr {
+            #[doc = "Port x configuration bits (y = 0..15)"]
+            pub fn pupdr(&self, n: usize) -> super::vals::Pupdr {
                 assert!(n < 16usize);
-                let offs = 0usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                super::vals::Odr(val as u8)
+                let offs = 0usize + n * 2usize;
+                let val = (self.0 >> offs) & 0x03;
+                super::vals::Pupdr(val as u8)
             }
-            #[doc = "Port output data (y = 0..15)"]
-            pub fn set_odr(&mut self, n: usize, val: super::vals::Odr) {
+            #[doc = "Port x configuration bits (y = 0..15)"]
+            pub fn set_pupdr(&mut self, n: usize, val: super::vals::Pupdr) {
                 assert!(n < 16usize);
-                let offs = 0usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
+                let offs = 0usize + n * 2usize;
+                self.0 = (self.0 & !(0x03 << offs)) | (((val.0 as u32) & 0x03) << offs);
             }
         }
-        impl Default for Odr {
-            fn default() -> Odr {
-                Odr(0)
+        impl Default for Pupdr {
+            fn default() -> Pupdr {
+                Pupdr(0)
             }
         }
-        #[doc = "GPIO port configuration lock register"]
+        #[doc = "GPIO port output type register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Lckr(pub u32);
-        impl Lckr {
-            #[doc = "Port x lock bit y (y= 0..15)"]
-            pub fn lck(&self, n: usize) -> super::vals::Lck {
+        pub struct Otyper(pub u32);
+        impl Otyper {
+            #[doc = "Port x configuration bits (y = 0..15)"]
+            pub fn ot(&self, n: usize) -> super::vals::Ot {
                 assert!(n < 16usize);
                 let offs = 0usize + n * 1usize;
                 let val = (self.0 >> offs) & 0x01;
-                super::vals::Lck(val as u8)
+                super::vals::Ot(val as u8)
             }
-            #[doc = "Port x lock bit y (y= 0..15)"]
-            pub fn set_lck(&mut self, n: usize, val: super::vals::Lck) {
+            #[doc = "Port x configuration bits (y = 0..15)"]
+            pub fn set_ot(&mut self, n: usize, val: super::vals::Ot) {
                 assert!(n < 16usize);
                 let offs = 0usize + n * 1usize;
                 self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
             }
-            #[doc = "Port x lock bit y (y= 0..15)"]
-            pub const fn lckk(&self) -> super::vals::Lckk {
-                let val = (self.0 >> 16usize) & 0x01;
-                super::vals::Lckk(val as u8)
-            }
-            #[doc = "Port x lock bit y (y= 0..15)"]
-            pub fn set_lckk(&mut self, val: super::vals::Lckk) {
-                self.0 = (self.0 & !(0x01 << 16usize)) | (((val.0 as u32) & 0x01) << 16usize);
-            }
         }
-        impl Default for Lckr {
-            fn default() -> Lckr {
-                Lckr(0)
+        impl Default for Otyper {
+            fn default() -> Otyper {
+                Otyper(0)
             }
         }
     }
-}
-pub mod timer_v1 {
-    use crate::generic::*;
-    #[doc = "General purpose 16-bit timer"]
-    #[derive(Copy, Clone)]
-    pub struct TimGp16(pub *mut u8);
-    unsafe impl Send for TimGp16 {}
-    unsafe impl Sync for TimGp16 {}
-    impl TimGp16 {
-        #[doc = "control register 1"]
-        pub fn cr1(self) -> Reg<regs::Cr1Gp, RW> {
-            unsafe { Reg::from_ptr(self.0.add(0usize)) }
-        }
-        #[doc = "control register 2"]
-        pub fn cr2(self) -> Reg<regs::Cr2Gp, RW> {
-            unsafe { Reg::from_ptr(self.0.add(4usize)) }
-        }
-        #[doc = "slave mode control register"]
-        pub fn smcr(self) -> Reg<regs::Smcr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(8usize)) }
-        }
-        #[doc = "DMA/Interrupt enable register"]
-        pub fn dier(self) -> Reg<regs::DierGp, RW> {
-            unsafe { Reg::from_ptr(self.0.add(12usize)) }
-        }
-        #[doc = "status register"]
-        pub fn sr(self) -> Reg<regs::SrGp, RW> {
-            unsafe { Reg::from_ptr(self.0.add(16usize)) }
+    pub mod vals {
+        use crate::generic::*;
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Pupdr(pub u8);
+        impl Pupdr {
+            #[doc = "No pull-up, pull-down"]
+            pub const FLOATING: Self = Self(0);
+            #[doc = "Pull-up"]
+            pub const PULLUP: Self = Self(0x01);
+            #[doc = "Pull-down"]
+            pub const PULLDOWN: Self = Self(0x02);
         }
-        #[doc = "event generation register"]
-        pub fn egr(self) -> Reg<regs::EgrGp, W> {
-            unsafe { Reg::from_ptr(self.0.add(20usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Ot(pub u8);
+        impl Ot {
+            #[doc = "Output push-pull (reset state)"]
+            pub const PUSHPULL: Self = Self(0);
+            #[doc = "Output open-drain"]
+            pub const OPENDRAIN: Self = Self(0x01);
         }
-        #[doc = "capture/compare mode register 1 (input mode)"]
-        pub fn ccmr_input(self, n: usize) -> Reg<regs::CcmrInput, RW> {
-            assert!(n < 2usize);
-            unsafe { Reg::from_ptr(self.0.add(24usize + n * 4usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Afr(pub u8);
+        impl Afr {
+            #[doc = "AF0"]
+            pub const AF0: Self = Self(0);
+            #[doc = "AF1"]
+            pub const AF1: Self = Self(0x01);
+            #[doc = "AF2"]
+            pub const AF2: Self = Self(0x02);
+            #[doc = "AF3"]
+            pub const AF3: Self = Self(0x03);
+            #[doc = "AF4"]
+            pub const AF4: Self = Self(0x04);
+            #[doc = "AF5"]
+            pub const AF5: Self = Self(0x05);
+            #[doc = "AF6"]
+            pub const AF6: Self = Self(0x06);
+            #[doc = "AF7"]
+            pub const AF7: Self = Self(0x07);
+            #[doc = "AF8"]
+            pub const AF8: Self = Self(0x08);
+            #[doc = "AF9"]
+            pub const AF9: Self = Self(0x09);
+            #[doc = "AF10"]
+            pub const AF10: Self = Self(0x0a);
+            #[doc = "AF11"]
+            pub const AF11: Self = Self(0x0b);
+            #[doc = "AF12"]
+            pub const AF12: Self = Self(0x0c);
+            #[doc = "AF13"]
+            pub const AF13: Self = Self(0x0d);
+            #[doc = "AF14"]
+            pub const AF14: Self = Self(0x0e);
+            #[doc = "AF15"]
+            pub const AF15: Self = Self(0x0f);
         }
-        #[doc = "capture/compare mode register 1 (output mode)"]
-        pub fn ccmr_output(self, n: usize) -> Reg<regs::CcmrOutput, RW> {
-            assert!(n < 2usize);
-            unsafe { Reg::from_ptr(self.0.add(24usize + n * 4usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Brw(pub u8);
+        impl Brw {
+            #[doc = "Resets the corresponding ODRx bit"]
+            pub const RESET: Self = Self(0x01);
         }
-        #[doc = "capture/compare enable register"]
-        pub fn ccer(self) -> Reg<regs::CcerGp, RW> {
-            unsafe { Reg::from_ptr(self.0.add(32usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Lck(pub u8);
+        impl Lck {
+            #[doc = "Port configuration not locked"]
+            pub const UNLOCKED: Self = Self(0);
+            #[doc = "Port configuration locked"]
+            pub const LOCKED: Self = Self(0x01);
         }
-        #[doc = "counter"]
-        pub fn cnt(self) -> Reg<regs::Cnt16, RW> {
-            unsafe { Reg::from_ptr(self.0.add(36usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Moder(pub u8);
+        impl Moder {
+            #[doc = "Input mode (reset state)"]
+            pub const INPUT: Self = Self(0);
+            #[doc = "General purpose output mode"]
+            pub const OUTPUT: Self = Self(0x01);
+            #[doc = "Alternate function mode"]
+            pub const ALTERNATE: Self = Self(0x02);
+            #[doc = "Analog mode"]
+            pub const ANALOG: Self = Self(0x03);
         }
-        #[doc = "prescaler"]
-        pub fn psc(self) -> Reg<regs::Psc, RW> {
-            unsafe { Reg::from_ptr(self.0.add(40usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Idr(pub u8);
+        impl Idr {
+            #[doc = "Input is logic low"]
+            pub const LOW: Self = Self(0);
+            #[doc = "Input is logic high"]
+            pub const HIGH: Self = Self(0x01);
         }
-        #[doc = "auto-reload register"]
-        pub fn arr(self) -> Reg<regs::Arr16, RW> {
-            unsafe { Reg::from_ptr(self.0.add(44usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Ospeedr(pub u8);
+        impl Ospeedr {
+            #[doc = "Low speed"]
+            pub const LOWSPEED: Self = Self(0);
+            #[doc = "Medium speed"]
+            pub const MEDIUMSPEED: Self = Self(0x01);
+            #[doc = "High speed"]
+            pub const HIGHSPEED: Self = Self(0x02);
+            #[doc = "Very high speed"]
+            pub const VERYHIGHSPEED: Self = Self(0x03);
         }
-        #[doc = "capture/compare register"]
-        pub fn ccr(self, n: usize) -> Reg<regs::Ccr16, RW> {
-            assert!(n < 4usize);
-            unsafe { Reg::from_ptr(self.0.add(52usize + n * 4usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Bsw(pub u8);
+        impl Bsw {
+            #[doc = "Sets the corresponding ODRx bit"]
+            pub const SET: Self = Self(0x01);
         }
-        #[doc = "DMA control register"]
-        pub fn dcr(self) -> Reg<regs::Dcr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(72usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Lckk(pub u8);
+        impl Lckk {
+            #[doc = "Port configuration lock key not active"]
+            pub const NOTACTIVE: Self = Self(0);
+            #[doc = "Port configuration lock key active"]
+            pub const ACTIVE: Self = Self(0x01);
         }
-        #[doc = "DMA address for full transfer"]
-        pub fn dmar(self) -> Reg<regs::Dmar, RW> {
-            unsafe { Reg::from_ptr(self.0.add(76usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Odr(pub u8);
+        impl Odr {
+            #[doc = "Set output to logic low"]
+            pub const LOW: Self = Self(0);
+            #[doc = "Set output to logic high"]
+            pub const HIGH: Self = Self(0x01);
         }
     }
-    #[doc = "General purpose 32-bit timer"]
+}
+pub mod spi_v1 {
+    use crate::generic::*;
+    #[doc = "Serial peripheral interface"]
     #[derive(Copy, Clone)]
-    pub struct TimGp32(pub *mut u8);
-    unsafe impl Send for TimGp32 {}
-    unsafe impl Sync for TimGp32 {}
-    impl TimGp32 {
+    pub struct Spi(pub *mut u8);
+    unsafe impl Send for Spi {}
+    unsafe impl Sync for Spi {}
+    impl Spi {
         #[doc = "control register 1"]
-        pub fn cr1(self) -> Reg<regs::Cr1Gp, RW> {
+        pub fn cr1(self) -> Reg<regs::Cr1, RW> {
             unsafe { Reg::from_ptr(self.0.add(0usize)) }
         }
         #[doc = "control register 2"]
-        pub fn cr2(self) -> Reg<regs::Cr2Gp, RW> {
+        pub fn cr2(self) -> Reg<regs::Cr2, RW> {
             unsafe { Reg::from_ptr(self.0.add(4usize)) }
         }
-        #[doc = "slave mode control register"]
-        pub fn smcr(self) -> Reg<regs::Smcr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(8usize)) }
-        }
-        #[doc = "DMA/Interrupt enable register"]
-        pub fn dier(self) -> Reg<regs::DierGp, RW> {
-            unsafe { Reg::from_ptr(self.0.add(12usize)) }
-        }
         #[doc = "status register"]
-        pub fn sr(self) -> Reg<regs::SrGp, RW> {
-            unsafe { Reg::from_ptr(self.0.add(16usize)) }
-        }
-        #[doc = "event generation register"]
-        pub fn egr(self) -> Reg<regs::EgrGp, W> {
-            unsafe { Reg::from_ptr(self.0.add(20usize)) }
-        }
-        #[doc = "capture/compare mode register 1 (input mode)"]
-        pub fn ccmr_input(self, n: usize) -> Reg<regs::CcmrInput, RW> {
-            assert!(n < 2usize);
-            unsafe { Reg::from_ptr(self.0.add(24usize + n * 4usize)) }
-        }
-        #[doc = "capture/compare mode register 1 (output mode)"]
-        pub fn ccmr_output(self, n: usize) -> Reg<regs::CcmrOutput, RW> {
-            assert!(n < 2usize);
-            unsafe { Reg::from_ptr(self.0.add(24usize + n * 4usize)) }
-        }
-        #[doc = "capture/compare enable register"]
-        pub fn ccer(self) -> Reg<regs::CcerGp, RW> {
-            unsafe { Reg::from_ptr(self.0.add(32usize)) }
-        }
-        #[doc = "counter"]
-        pub fn cnt(self) -> Reg<regs::Cnt32, RW> {
-            unsafe { Reg::from_ptr(self.0.add(36usize)) }
-        }
-        #[doc = "prescaler"]
-        pub fn psc(self) -> Reg<regs::Psc, RW> {
-            unsafe { Reg::from_ptr(self.0.add(40usize)) }
-        }
-        #[doc = "auto-reload register"]
-        pub fn arr(self) -> Reg<regs::Arr32, RW> {
-            unsafe { Reg::from_ptr(self.0.add(44usize)) }
-        }
-        #[doc = "capture/compare register"]
-        pub fn ccr(self, n: usize) -> Reg<regs::Ccr32, RW> {
-            assert!(n < 4usize);
-            unsafe { Reg::from_ptr(self.0.add(52usize + n * 4usize)) }
-        }
-        #[doc = "DMA control register"]
-        pub fn dcr(self) -> Reg<regs::Dcr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(72usize)) }
-        }
-        #[doc = "DMA address for full transfer"]
-        pub fn dmar(self) -> Reg<regs::Dmar, RW> {
-            unsafe { Reg::from_ptr(self.0.add(76usize)) }
-        }
-    }
-    #[doc = "Basic timer"]
-    #[derive(Copy, Clone)]
-    pub struct TimBasic(pub *mut u8);
-    unsafe impl Send for TimBasic {}
-    unsafe impl Sync for TimBasic {}
-    impl TimBasic {
-        #[doc = "control register 1"]
-        pub fn cr1(self) -> Reg<regs::Cr1Basic, RW> {
-            unsafe { Reg::from_ptr(self.0.add(0usize)) }
-        }
-        #[doc = "control register 2"]
-        pub fn cr2(self) -> Reg<regs::Cr2Basic, RW> {
-            unsafe { Reg::from_ptr(self.0.add(4usize)) }
+        pub fn sr(self) -> Reg<regs::Sr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(8usize)) }
         }
-        #[doc = "DMA/Interrupt enable register"]
-        pub fn dier(self) -> Reg<regs::DierBasic, RW> {
+        #[doc = "data register"]
+        pub fn dr(self) -> Reg<regs::Dr, RW> {
             unsafe { Reg::from_ptr(self.0.add(12usize)) }
         }
-        #[doc = "status register"]
-        pub fn sr(self) -> Reg<regs::SrBasic, RW> {
+        #[doc = "CRC polynomial register"]
+        pub fn crcpr(self) -> Reg<regs::Crcpr, RW> {
             unsafe { Reg::from_ptr(self.0.add(16usize)) }
         }
-        #[doc = "event generation register"]
-        pub fn egr(self) -> Reg<regs::EgrBasic, W> {
+        #[doc = "RX CRC register"]
+        pub fn rxcrcr(self) -> Reg<regs::Rxcrcr, R> {
             unsafe { Reg::from_ptr(self.0.add(20usize)) }
         }
-        #[doc = "counter"]
-        pub fn cnt(self) -> Reg<regs::Cnt16, RW> {
-            unsafe { Reg::from_ptr(self.0.add(36usize)) }
-        }
-        #[doc = "prescaler"]
-        pub fn psc(self) -> Reg<regs::Psc, RW> {
-            unsafe { Reg::from_ptr(self.0.add(40usize)) }
-        }
-        #[doc = "auto-reload register"]
-        pub fn arr(self) -> Reg<regs::Arr16, RW> {
-            unsafe { Reg::from_ptr(self.0.add(44usize)) }
+        #[doc = "TX CRC register"]
+        pub fn txcrcr(self) -> Reg<regs::Txcrcr, R> {
+            unsafe { Reg::from_ptr(self.0.add(24usize)) }
         }
     }
-    #[doc = "Advanced-timers"]
-    #[derive(Copy, Clone)]
-    pub struct TimAdv(pub *mut u8);
-    unsafe impl Send for TimAdv {}
-    unsafe impl Sync for TimAdv {}
-    impl TimAdv {
-        #[doc = "control register 1"]
-        pub fn cr1(self) -> Reg<regs::Cr1Gp, RW> {
-            unsafe { Reg::from_ptr(self.0.add(0usize)) }
-        }
-        #[doc = "control register 2"]
-        pub fn cr2(self) -> Reg<regs::Cr2Adv, RW> {
-            unsafe { Reg::from_ptr(self.0.add(4usize)) }
-        }
-        #[doc = "slave mode control register"]
-        pub fn smcr(self) -> Reg<regs::Smcr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(8usize)) }
-        }
-        #[doc = "DMA/Interrupt enable register"]
-        pub fn dier(self) -> Reg<regs::DierAdv, RW> {
-            unsafe { Reg::from_ptr(self.0.add(12usize)) }
-        }
-        #[doc = "status register"]
-        pub fn sr(self) -> Reg<regs::SrAdv, RW> {
-            unsafe { Reg::from_ptr(self.0.add(16usize)) }
+    pub mod vals {
+        use crate::generic::*;
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Bidimode(pub u8);
+        impl Bidimode {
+            #[doc = "2-line unidirectional data mode selected"]
+            pub const UNIDIRECTIONAL: Self = Self(0);
+            #[doc = "1-line bidirectional data mode selected"]
+            pub const BIDIRECTIONAL: Self = Self(0x01);
         }
-        #[doc = "event generation register"]
-        pub fn egr(self) -> Reg<regs::EgrAdv, W> {
-            unsafe { Reg::from_ptr(self.0.add(20usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Iscfg(pub u8);
+        impl Iscfg {
+            #[doc = "Slave - transmit"]
+            pub const SLAVETX: Self = Self(0);
+            #[doc = "Slave - receive"]
+            pub const SLAVERX: Self = Self(0x01);
+            #[doc = "Master - transmit"]
+            pub const MASTERTX: Self = Self(0x02);
+            #[doc = "Master - receive"]
+            pub const MASTERRX: Self = Self(0x03);
         }
-        #[doc = "capture/compare mode register 1 (input mode)"]
-        pub fn ccmr_input(self, n: usize) -> Reg<regs::CcmrInput, RW> {
-            assert!(n < 2usize);
-            unsafe { Reg::from_ptr(self.0.add(24usize + n * 4usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Dff(pub u8);
+        impl Dff {
+            #[doc = "8-bit data frame format is selected for transmission/reception"]
+            pub const EIGHTBIT: Self = Self(0);
+            #[doc = "16-bit data frame format is selected for transmission/reception"]
+            pub const SIXTEENBIT: Self = Self(0x01);
         }
-        #[doc = "capture/compare mode register 1 (output mode)"]
-        pub fn ccmr_output(self, n: usize) -> Reg<regs::CcmrOutput, RW> {
-            assert!(n < 2usize);
-            unsafe { Reg::from_ptr(self.0.add(24usize + n * 4usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Bidioe(pub u8);
+        impl Bidioe {
+            #[doc = "Output disabled (receive-only mode)"]
+            pub const OUTPUTDISABLED: Self = Self(0);
+            #[doc = "Output enabled (transmit-only mode)"]
+            pub const OUTPUTENABLED: Self = Self(0x01);
         }
-        #[doc = "capture/compare enable register"]
-        pub fn ccer(self) -> Reg<regs::CcerAdv, RW> {
-            unsafe { Reg::from_ptr(self.0.add(32usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Rxonly(pub u8);
+        impl Rxonly {
+            #[doc = "Full duplex (Transmit and receive)"]
+            pub const FULLDUPLEX: Self = Self(0);
+            #[doc = "Output disabled (Receive-only mode)"]
+            pub const OUTPUTDISABLED: Self = Self(0x01);
         }
-        #[doc = "counter"]
-        pub fn cnt(self) -> Reg<regs::Cnt16, RW> {
-            unsafe { Reg::from_ptr(self.0.add(36usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Cpha(pub u8);
+        impl Cpha {
+            #[doc = "The first clock transition is the first data capture edge"]
+            pub const FIRSTEDGE: Self = Self(0);
+            #[doc = "The second clock transition is the first data capture edge"]
+            pub const SECONDEDGE: Self = Self(0x01);
         }
-        #[doc = "prescaler"]
-        pub fn psc(self) -> Reg<regs::Psc, RW> {
-            unsafe { Reg::from_ptr(self.0.add(40usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Frer(pub u8);
+        impl Frer {
+            #[doc = "No frame format error"]
+            pub const NOERROR: Self = Self(0);
+            #[doc = "A frame format error occurred"]
+            pub const ERROR: Self = Self(0x01);
         }
-        #[doc = "auto-reload register"]
-        pub fn arr(self) -> Reg<regs::Arr16, RW> {
-            unsafe { Reg::from_ptr(self.0.add(44usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Crcnext(pub u8);
+        impl Crcnext {
+            #[doc = "Next transmit value is from Tx buffer"]
+            pub const TXBUFFER: Self = Self(0);
+            #[doc = "Next transmit value is from Tx CRC register"]
+            pub const CRC: Self = Self(0x01);
         }
-        #[doc = "repetition counter register"]
-        pub fn rcr(self) -> Reg<regs::Rcr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(48usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Frf(pub u8);
+        impl Frf {
+            #[doc = "SPI Motorola mode"]
+            pub const MOTOROLA: Self = Self(0);
+            #[doc = "SPI TI mode"]
+            pub const TI: Self = Self(0x01);
         }
-        #[doc = "capture/compare register"]
-        pub fn ccr(self, n: usize) -> Reg<regs::Ccr16, RW> {
-            assert!(n < 4usize);
-            unsafe { Reg::from_ptr(self.0.add(52usize + n * 4usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Lsbfirst(pub u8);
+        impl Lsbfirst {
+            #[doc = "Data is transmitted/received with the MSB first"]
+            pub const MSBFIRST: Self = Self(0);
+            #[doc = "Data is transmitted/received with the LSB first"]
+            pub const LSBFIRST: Self = Self(0x01);
         }
-        #[doc = "break and dead-time register"]
-        pub fn bdtr(self) -> Reg<regs::Bdtr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(68usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Br(pub u8);
+        impl Br {
+            #[doc = "f_PCLK / 2"]
+            pub const DIV2: Self = Self(0);
+            #[doc = "f_PCLK / 4"]
+            pub const DIV4: Self = Self(0x01);
+            #[doc = "f_PCLK / 8"]
+            pub const DIV8: Self = Self(0x02);
+            #[doc = "f_PCLK / 16"]
+            pub const DIV16: Self = Self(0x03);
+            #[doc = "f_PCLK / 32"]
+            pub const DIV32: Self = Self(0x04);
+            #[doc = "f_PCLK / 64"]
+            pub const DIV64: Self = Self(0x05);
+            #[doc = "f_PCLK / 128"]
+            pub const DIV128: Self = Self(0x06);
+            #[doc = "f_PCLK / 256"]
+            pub const DIV256: Self = Self(0x07);
         }
-        #[doc = "DMA control register"]
-        pub fn dcr(self) -> Reg<regs::Dcr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(72usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Cpol(pub u8);
+        impl Cpol {
+            #[doc = "CK to 0 when idle"]
+            pub const IDLELOW: Self = Self(0);
+            #[doc = "CK to 1 when idle"]
+            pub const IDLEHIGH: Self = Self(0x01);
         }
-        #[doc = "DMA address for full transfer"]
-        pub fn dmar(self) -> Reg<regs::Dmar, RW> {
-            unsafe { Reg::from_ptr(self.0.add(76usize)) }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Mstr(pub u8);
+        impl Mstr {
+            #[doc = "Slave configuration"]
+            pub const SLAVE: Self = Self(0);
+            #[doc = "Master configuration"]
+            pub const MASTER: Self = Self(0x01);
         }
     }
     pub mod regs {
         use crate::generic::*;
-        #[doc = "counter"]
+        #[doc = "control register 1"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cnt32(pub u32);
-        impl Cnt32 {
-            #[doc = "counter value"]
-            pub const fn cnt(&self) -> u32 {
-                let val = (self.0 >> 0usize) & 0xffff_ffff;
-                val as u32
+        pub struct Cr1(pub u32);
+        impl Cr1 {
+            #[doc = "Clock phase"]
+            pub const fn cpha(&self) -> super::vals::Cpha {
+                let val = (self.0 >> 0usize) & 0x01;
+                super::vals::Cpha(val as u8)
             }
-            #[doc = "counter value"]
-            pub fn set_cnt(&mut self, val: u32) {
-                self.0 =
-                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
+            #[doc = "Clock phase"]
+            pub fn set_cpha(&mut self, val: super::vals::Cpha) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val.0 as u32) & 0x01) << 0usize);
             }
-        }
-        impl Default for Cnt32 {
-            fn default() -> Cnt32 {
-                Cnt32(0)
+            #[doc = "Clock polarity"]
+            pub const fn cpol(&self) -> super::vals::Cpol {
+                let val = (self.0 >> 1usize) & 0x01;
+                super::vals::Cpol(val as u8)
             }
-        }
-        #[doc = "counter"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cnt16(pub u32);
-        impl Cnt16 {
-            #[doc = "counter value"]
-            pub const fn cnt(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0xffff;
-                val as u16
+            #[doc = "Clock polarity"]
+            pub fn set_cpol(&mut self, val: super::vals::Cpol) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val.0 as u32) & 0x01) << 1usize);
             }
-            #[doc = "counter value"]
-            pub fn set_cnt(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
+            #[doc = "Master selection"]
+            pub const fn mstr(&self) -> super::vals::Mstr {
+                let val = (self.0 >> 2usize) & 0x01;
+                super::vals::Mstr(val as u8)
             }
-        }
-        impl Default for Cnt16 {
-            fn default() -> Cnt16 {
-                Cnt16(0)
+            #[doc = "Master selection"]
+            pub fn set_mstr(&mut self, val: super::vals::Mstr) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val.0 as u32) & 0x01) << 2usize);
             }
-        }
-        #[doc = "capture/compare mode register 2 (output mode)"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct CcmrOutput(pub u32);
-        impl CcmrOutput {
-            #[doc = "Capture/Compare 3 selection"]
-            pub fn ccs(&self, n: usize) -> super::vals::CcmrOutputCcs {
-                assert!(n < 2usize);
-                let offs = 0usize + n * 8usize;
-                let val = (self.0 >> offs) & 0x03;
-                super::vals::CcmrOutputCcs(val as u8)
+            #[doc = "Baud rate control"]
+            pub const fn br(&self) -> super::vals::Br {
+                let val = (self.0 >> 3usize) & 0x07;
+                super::vals::Br(val as u8)
             }
-            #[doc = "Capture/Compare 3 selection"]
-            pub fn set_ccs(&mut self, n: usize, val: super::vals::CcmrOutputCcs) {
-                assert!(n < 2usize);
-                let offs = 0usize + n * 8usize;
-                self.0 = (self.0 & !(0x03 << offs)) | (((val.0 as u32) & 0x03) << offs);
+            #[doc = "Baud rate control"]
+            pub fn set_br(&mut self, val: super::vals::Br) {
+                self.0 = (self.0 & !(0x07 << 3usize)) | (((val.0 as u32) & 0x07) << 3usize);
             }
-            #[doc = "Output compare 3 fast enable"]
-            pub fn ocfe(&self, n: usize) -> bool {
-                assert!(n < 2usize);
-                let offs = 2usize + n * 8usize;
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "SPI enable"]
+            pub const fn spe(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
                 val != 0
             }
-            #[doc = "Output compare 3 fast enable"]
-            pub fn set_ocfe(&mut self, n: usize, val: bool) {
-                assert!(n < 2usize);
-                let offs = 2usize + n * 8usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
-            }
-            #[doc = "Output compare 3 preload enable"]
-            pub fn ocpe(&self, n: usize) -> super::vals::Ocpe {
-                assert!(n < 2usize);
-                let offs = 3usize + n * 8usize;
-                let val = (self.0 >> offs) & 0x01;
-                super::vals::Ocpe(val as u8)
-            }
-            #[doc = "Output compare 3 preload enable"]
-            pub fn set_ocpe(&mut self, n: usize, val: super::vals::Ocpe) {
-                assert!(n < 2usize);
-                let offs = 3usize + n * 8usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
+            #[doc = "SPI enable"]
+            pub fn set_spe(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
-            #[doc = "Output compare 3 mode"]
-            pub fn ocm(&self, n: usize) -> super::vals::Ocm {
-                assert!(n < 2usize);
-                let offs = 4usize + n * 8usize;
-                let val = (self.0 >> offs) & 0x07;
-                super::vals::Ocm(val as u8)
+            #[doc = "Frame format"]
+            pub const fn lsbfirst(&self) -> super::vals::Lsbfirst {
+                let val = (self.0 >> 7usize) & 0x01;
+                super::vals::Lsbfirst(val as u8)
             }
-            #[doc = "Output compare 3 mode"]
-            pub fn set_ocm(&mut self, n: usize, val: super::vals::Ocm) {
-                assert!(n < 2usize);
-                let offs = 4usize + n * 8usize;
-                self.0 = (self.0 & !(0x07 << offs)) | (((val.0 as u32) & 0x07) << offs);
+            #[doc = "Frame format"]
+            pub fn set_lsbfirst(&mut self, val: super::vals::Lsbfirst) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
             }
-            #[doc = "Output compare 3 clear enable"]
-            pub fn occe(&self, n: usize) -> bool {
-                assert!(n < 2usize);
-                let offs = 7usize + n * 8usize;
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "Internal slave select"]
+            pub const fn ssi(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
                 val != 0
             }
-            #[doc = "Output compare 3 clear enable"]
-            pub fn set_occe(&mut self, n: usize, val: bool) {
-                assert!(n < 2usize);
-                let offs = 7usize + n * 8usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
-            }
-        }
-        impl Default for CcmrOutput {
-            fn default() -> CcmrOutput {
-                CcmrOutput(0)
+            #[doc = "Internal slave select"]
+            pub fn set_ssi(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
-        }
-        #[doc = "DMA/Interrupt enable register"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct DierGp(pub u32);
-        impl DierGp {
-            #[doc = "Update interrupt enable"]
-            pub const fn uie(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
+            #[doc = "Software slave management"]
+            pub const fn ssm(&self) -> bool {
+                let val = (self.0 >> 9usize) & 0x01;
                 val != 0
             }
-            #[doc = "Update interrupt enable"]
-            pub fn set_uie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            #[doc = "Software slave management"]
+            pub fn set_ssm(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
             }
-            #[doc = "Capture/Compare 1 interrupt enable"]
-            pub fn ccie(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
+            #[doc = "Receive only"]
+            pub const fn rxonly(&self) -> super::vals::Rxonly {
+                let val = (self.0 >> 10usize) & 0x01;
+                super::vals::Rxonly(val as u8)
             }
-            #[doc = "Capture/Compare 1 interrupt enable"]
-            pub fn set_ccie(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Receive only"]
+            pub fn set_rxonly(&mut self, val: super::vals::Rxonly) {
+                self.0 = (self.0 & !(0x01 << 10usize)) | (((val.0 as u32) & 0x01) << 10usize);
             }
-            #[doc = "Trigger interrupt enable"]
-            pub const fn tie(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
-                val != 0
+            #[doc = "Data frame format"]
+            pub const fn dff(&self) -> super::vals::Dff {
+                let val = (self.0 >> 11usize) & 0x01;
+                super::vals::Dff(val as u8)
             }
-            #[doc = "Trigger interrupt enable"]
-            pub fn set_tie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            #[doc = "Data frame format"]
+            pub fn set_dff(&mut self, val: super::vals::Dff) {
+                self.0 = (self.0 & !(0x01 << 11usize)) | (((val.0 as u32) & 0x01) << 11usize);
             }
-            #[doc = "Update DMA request enable"]
-            pub const fn ude(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
-                val != 0
+            #[doc = "CRC transfer next"]
+            pub const fn crcnext(&self) -> super::vals::Crcnext {
+                let val = (self.0 >> 12usize) & 0x01;
+                super::vals::Crcnext(val as u8)
             }
-            #[doc = "Update DMA request enable"]
-            pub fn set_ude(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            #[doc = "CRC transfer next"]
+            pub fn set_crcnext(&mut self, val: super::vals::Crcnext) {
+                self.0 = (self.0 & !(0x01 << 12usize)) | (((val.0 as u32) & 0x01) << 12usize);
             }
-            #[doc = "Capture/Compare 1 DMA request enable"]
-            pub fn ccde(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 9usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "Hardware CRC calculation enable"]
+            pub const fn crcen(&self) -> bool {
+                let val = (self.0 >> 13usize) & 0x01;
                 val != 0
             }
-            #[doc = "Capture/Compare 1 DMA request enable"]
-            pub fn set_ccde(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 9usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Hardware CRC calculation enable"]
+            pub fn set_crcen(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 13usize)) | (((val as u32) & 0x01) << 13usize);
             }
-            #[doc = "Trigger DMA request enable"]
-            pub const fn tde(&self) -> bool {
+            #[doc = "Output enable in bidirectional mode"]
+            pub const fn bidioe(&self) -> super::vals::Bidioe {
                 let val = (self.0 >> 14usize) & 0x01;
-                val != 0
+                super::vals::Bidioe(val as u8)
             }
-            #[doc = "Trigger DMA request enable"]
-            pub fn set_tde(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 14usize)) | (((val as u32) & 0x01) << 14usize);
+            #[doc = "Output enable in bidirectional mode"]
+            pub fn set_bidioe(&mut self, val: super::vals::Bidioe) {
+                self.0 = (self.0 & !(0x01 << 14usize)) | (((val.0 as u32) & 0x01) << 14usize);
+            }
+            #[doc = "Bidirectional data mode enable"]
+            pub const fn bidimode(&self) -> super::vals::Bidimode {
+                let val = (self.0 >> 15usize) & 0x01;
+                super::vals::Bidimode(val as u8)
+            }
+            #[doc = "Bidirectional data mode enable"]
+            pub fn set_bidimode(&mut self, val: super::vals::Bidimode) {
+                self.0 = (self.0 & !(0x01 << 15usize)) | (((val.0 as u32) & 0x01) << 15usize);
             }
         }
-        impl Default for DierGp {
-            fn default() -> DierGp {
-                DierGp(0)
+        impl Default for Cr1 {
+            fn default() -> Cr1 {
+                Cr1(0)
             }
         }
-        #[doc = "auto-reload register"]
+        #[doc = "data register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Arr32(pub u32);
-        impl Arr32 {
-            #[doc = "Auto-reload value"]
-            pub const fn arr(&self) -> u32 {
-                let val = (self.0 >> 0usize) & 0xffff_ffff;
-                val as u32
+        pub struct Dr(pub u32);
+        impl Dr {
+            #[doc = "Data register"]
+            pub const fn dr(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0xffff;
+                val as u16
             }
-            #[doc = "Auto-reload value"]
-            pub fn set_arr(&mut self, val: u32) {
-                self.0 =
-                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
+            #[doc = "Data register"]
+            pub fn set_dr(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
         }
-        impl Default for Arr32 {
-            fn default() -> Arr32 {
-                Arr32(0)
+        impl Default for Dr {
+            fn default() -> Dr {
+                Dr(0)
             }
         }
-        #[doc = "control register 1"]
+        #[doc = "CRC polynomial register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr1Gp(pub u32);
-        impl Cr1Gp {
-            #[doc = "Counter enable"]
-            pub const fn cen(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Counter enable"]
-            pub fn set_cen(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
-            }
-            #[doc = "Update disable"]
-            pub const fn udis(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Update disable"]
-            pub fn set_udis(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
-            }
-            #[doc = "Update request source"]
-            pub const fn urs(&self) -> super::vals::Urs {
-                let val = (self.0 >> 2usize) & 0x01;
-                super::vals::Urs(val as u8)
-            }
-            #[doc = "Update request source"]
-            pub fn set_urs(&mut self, val: super::vals::Urs) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val.0 as u32) & 0x01) << 2usize);
-            }
-            #[doc = "One-pulse mode"]
-            pub const fn opm(&self) -> super::vals::Opm {
-                let val = (self.0 >> 3usize) & 0x01;
-                super::vals::Opm(val as u8)
-            }
-            #[doc = "One-pulse mode"]
-            pub fn set_opm(&mut self, val: super::vals::Opm) {
-                self.0 = (self.0 & !(0x01 << 3usize)) | (((val.0 as u32) & 0x01) << 3usize);
-            }
-            #[doc = "Direction"]
-            pub const fn dir(&self) -> super::vals::Dir {
-                let val = (self.0 >> 4usize) & 0x01;
-                super::vals::Dir(val as u8)
-            }
-            #[doc = "Direction"]
-            pub fn set_dir(&mut self, val: super::vals::Dir) {
-                self.0 = (self.0 & !(0x01 << 4usize)) | (((val.0 as u32) & 0x01) << 4usize);
-            }
-            #[doc = "Center-aligned mode selection"]
-            pub const fn cms(&self) -> super::vals::Cms {
-                let val = (self.0 >> 5usize) & 0x03;
-                super::vals::Cms(val as u8)
-            }
-            #[doc = "Center-aligned mode selection"]
-            pub fn set_cms(&mut self, val: super::vals::Cms) {
-                self.0 = (self.0 & !(0x03 << 5usize)) | (((val.0 as u32) & 0x03) << 5usize);
+        pub struct Crcpr(pub u32);
+        impl Crcpr {
+            #[doc = "CRC polynomial register"]
+            pub const fn crcpoly(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0xffff;
+                val as u16
             }
-            #[doc = "Auto-reload preload enable"]
-            pub const fn arpe(&self) -> super::vals::Arpe {
-                let val = (self.0 >> 7usize) & 0x01;
-                super::vals::Arpe(val as u8)
+            #[doc = "CRC polynomial register"]
+            pub fn set_crcpoly(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
-            #[doc = "Auto-reload preload enable"]
-            pub fn set_arpe(&mut self, val: super::vals::Arpe) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
+        }
+        impl Default for Crcpr {
+            fn default() -> Crcpr {
+                Crcpr(0)
             }
-            #[doc = "Clock division"]
-            pub const fn ckd(&self) -> super::vals::Ckd {
-                let val = (self.0 >> 8usize) & 0x03;
-                super::vals::Ckd(val as u8)
+        }
+        #[doc = "RX CRC register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Rxcrcr(pub u32);
+        impl Rxcrcr {
+            #[doc = "Rx CRC register"]
+            pub const fn rx_crc(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0xffff;
+                val as u16
             }
-            #[doc = "Clock division"]
-            pub fn set_ckd(&mut self, val: super::vals::Ckd) {
-                self.0 = (self.0 & !(0x03 << 8usize)) | (((val.0 as u32) & 0x03) << 8usize);
+            #[doc = "Rx CRC register"]
+            pub fn set_rx_crc(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
         }
-        impl Default for Cr1Gp {
-            fn default() -> Cr1Gp {
-                Cr1Gp(0)
+        impl Default for Rxcrcr {
+            fn default() -> Rxcrcr {
+                Rxcrcr(0)
             }
         }
-        #[doc = "event generation register"]
+        #[doc = "TX CRC register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct EgrBasic(pub u32);
-        impl EgrBasic {
-            #[doc = "Update generation"]
-            pub const fn ug(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
-                val != 0
+        pub struct Txcrcr(pub u32);
+        impl Txcrcr {
+            #[doc = "Tx CRC register"]
+            pub const fn tx_crc(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0xffff;
+                val as u16
             }
-            #[doc = "Update generation"]
-            pub fn set_ug(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            #[doc = "Tx CRC register"]
+            pub fn set_tx_crc(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
         }
-        impl Default for EgrBasic {
-            fn default() -> EgrBasic {
-                EgrBasic(0)
+        impl Default for Txcrcr {
+            fn default() -> Txcrcr {
+                Txcrcr(0)
             }
         }
-        #[doc = "event generation register"]
+        #[doc = "status register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct EgrAdv(pub u32);
-        impl EgrAdv {
-            #[doc = "Update generation"]
-            pub const fn ug(&self) -> bool {
+        pub struct Sr(pub u32);
+        impl Sr {
+            #[doc = "Receive buffer not empty"]
+            pub const fn rxne(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Update generation"]
-            pub fn set_ug(&mut self, val: bool) {
+            #[doc = "Receive buffer not empty"]
+            pub fn set_rxne(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Capture/compare 1 generation"]
-            pub fn ccg(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "Transmit buffer empty"]
+            pub const fn txe(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
                 val != 0
             }
-            #[doc = "Capture/compare 1 generation"]
-            pub fn set_ccg(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Transmit buffer empty"]
+            pub fn set_txe(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "Capture/Compare control update generation"]
-            pub const fn comg(&self) -> bool {
+            #[doc = "CRC error flag"]
+            pub const fn crcerr(&self) -> bool {
+                let val = (self.0 >> 4usize) & 0x01;
+                val != 0
+            }
+            #[doc = "CRC error flag"]
+            pub fn set_crcerr(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
+            }
+            #[doc = "Mode fault"]
+            pub const fn modf(&self) -> bool {
                 let val = (self.0 >> 5usize) & 0x01;
                 val != 0
             }
-            #[doc = "Capture/Compare control update generation"]
-            pub fn set_comg(&mut self, val: bool) {
+            #[doc = "Mode fault"]
+            pub fn set_modf(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
             }
-            #[doc = "Trigger generation"]
-            pub const fn tg(&self) -> bool {
+            #[doc = "Overrun flag"]
+            pub const fn ovr(&self) -> bool {
                 let val = (self.0 >> 6usize) & 0x01;
                 val != 0
             }
-            #[doc = "Trigger generation"]
-            pub fn set_tg(&mut self, val: bool) {
+            #[doc = "Overrun flag"]
+            pub fn set_ovr(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
-            #[doc = "Break generation"]
-            pub const fn bg(&self) -> bool {
+            #[doc = "Busy flag"]
+            pub const fn bsy(&self) -> bool {
                 let val = (self.0 >> 7usize) & 0x01;
                 val != 0
             }
-            #[doc = "Break generation"]
-            pub fn set_bg(&mut self, val: bool) {
+            #[doc = "Busy flag"]
+            pub fn set_bsy(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
             }
+            #[doc = "TI frame format error"]
+            pub const fn fre(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
+                val != 0
+            }
+            #[doc = "TI frame format error"]
+            pub fn set_fre(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            }
         }
-        impl Default for EgrAdv {
-            fn default() -> EgrAdv {
-                EgrAdv(0)
+        impl Default for Sr {
+            fn default() -> Sr {
+                Sr(0)
             }
         }
-        #[doc = "status register"]
+        #[doc = "control register 2"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct SrAdv(pub u32);
-        impl SrAdv {
-            #[doc = "Update interrupt flag"]
-            pub const fn uif(&self) -> bool {
+        pub struct Cr2(pub u32);
+        impl Cr2 {
+            #[doc = "Rx buffer DMA enable"]
+            pub const fn rxdmaen(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Update interrupt flag"]
-            pub fn set_uif(&mut self, val: bool) {
+            #[doc = "Rx buffer DMA enable"]
+            pub fn set_rxdmaen(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Capture/compare 1 interrupt flag"]
-            pub fn ccif(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "Tx buffer DMA enable"]
+            pub const fn txdmaen(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
                 val != 0
             }
-            #[doc = "Capture/compare 1 interrupt flag"]
-            pub fn set_ccif(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Tx buffer DMA enable"]
+            pub fn set_txdmaen(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "COM interrupt flag"]
-            pub const fn comif(&self) -> bool {
+            #[doc = "SS output enable"]
+            pub const fn ssoe(&self) -> bool {
+                let val = (self.0 >> 2usize) & 0x01;
+                val != 0
+            }
+            #[doc = "SS output enable"]
+            pub fn set_ssoe(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
+            }
+            #[doc = "Frame format"]
+            pub const fn frf(&self) -> super::vals::Frf {
+                let val = (self.0 >> 4usize) & 0x01;
+                super::vals::Frf(val as u8)
+            }
+            #[doc = "Frame format"]
+            pub fn set_frf(&mut self, val: super::vals::Frf) {
+                self.0 = (self.0 & !(0x01 << 4usize)) | (((val.0 as u32) & 0x01) << 4usize);
+            }
+            #[doc = "Error interrupt enable"]
+            pub const fn errie(&self) -> bool {
                 let val = (self.0 >> 5usize) & 0x01;
                 val != 0
             }
-            #[doc = "COM interrupt flag"]
-            pub fn set_comif(&mut self, val: bool) {
+            #[doc = "Error interrupt enable"]
+            pub fn set_errie(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
             }
-            #[doc = "Trigger interrupt flag"]
-            pub const fn tif(&self) -> bool {
+            #[doc = "RX buffer not empty interrupt enable"]
+            pub const fn rxneie(&self) -> bool {
                 let val = (self.0 >> 6usize) & 0x01;
                 val != 0
             }
-            #[doc = "Trigger interrupt flag"]
-            pub fn set_tif(&mut self, val: bool) {
+            #[doc = "RX buffer not empty interrupt enable"]
+            pub fn set_rxneie(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
-            #[doc = "Break interrupt flag"]
-            pub const fn bif(&self) -> bool {
+            #[doc = "Tx buffer empty interrupt enable"]
+            pub const fn txeie(&self) -> bool {
                 let val = (self.0 >> 7usize) & 0x01;
                 val != 0
             }
-            #[doc = "Break interrupt flag"]
-            pub fn set_bif(&mut self, val: bool) {
+            #[doc = "Tx buffer empty interrupt enable"]
+            pub fn set_txeie(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
             }
-            #[doc = "Capture/Compare 1 overcapture flag"]
-            pub fn ccof(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 9usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
-            }
-            #[doc = "Capture/Compare 1 overcapture flag"]
-            pub fn set_ccof(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 9usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
-            }
         }
-        impl Default for SrAdv {
-            fn default() -> SrAdv {
-                SrAdv(0)
+        impl Default for Cr2 {
+            fn default() -> Cr2 {
+                Cr2(0)
             }
         }
-        #[doc = "capture/compare enable register"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct CcerAdv(pub u32);
-        impl CcerAdv {
-            #[doc = "Capture/Compare 1 output enable"]
-            pub fn cce(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 0usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
-            }
-            #[doc = "Capture/Compare 1 output enable"]
-            pub fn set_cce(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 0usize + n * 4usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
-            }
-            #[doc = "Capture/Compare 1 output Polarity"]
-            pub fn ccp(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
-            }
-            #[doc = "Capture/Compare 1 output Polarity"]
-            pub fn set_ccp(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 4usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
-            }
-            #[doc = "Capture/Compare 1 complementary output enable"]
-            pub fn ccne(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 2usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
-            }
-            #[doc = "Capture/Compare 1 complementary output enable"]
-            pub fn set_ccne(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 2usize + n * 4usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
-            }
-            #[doc = "Capture/Compare 1 output Polarity"]
-            pub fn ccnp(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 3usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
-            }
-            #[doc = "Capture/Compare 1 output Polarity"]
-            pub fn set_ccnp(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 3usize + n * 4usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
-            }
+    }
+}
+pub mod syscfg_h7 {
+    use crate::generic::*;
+    #[doc = "System configuration controller"]
+    #[derive(Copy, Clone)]
+    pub struct Syscfg(pub *mut u8);
+    unsafe impl Send for Syscfg {}
+    unsafe impl Sync for Syscfg {}
+    impl Syscfg {
+        #[doc = "peripheral mode configuration register"]
+        pub fn pmcr(self) -> Reg<regs::Pmcr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(4usize)) }
         }
-        impl Default for CcerAdv {
-            fn default() -> CcerAdv {
-                CcerAdv(0)
-            }
+        #[doc = "external interrupt configuration register 1"]
+        pub fn exticr(self, n: usize) -> Reg<regs::Exticr, RW> {
+            assert!(n < 4usize);
+            unsafe { Reg::from_ptr(self.0.add(8usize + n * 4usize)) }
         }
-        #[doc = "DMA address for full transfer"]
+        #[doc = "compensation cell control/status register"]
+        pub fn cccsr(self) -> Reg<regs::Cccsr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(32usize)) }
+        }
+        #[doc = "SYSCFG compensation cell value register"]
+        pub fn ccvr(self) -> Reg<regs::Ccvr, R> {
+            unsafe { Reg::from_ptr(self.0.add(36usize)) }
+        }
+        #[doc = "SYSCFG compensation cell code register"]
+        pub fn cccr(self) -> Reg<regs::Cccr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(40usize)) }
+        }
+        #[doc = "SYSCFG power control register"]
+        pub fn pwrcr(self) -> Reg<regs::Pwrcr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(44usize)) }
+        }
+        #[doc = "SYSCFG package register"]
+        pub fn pkgr(self) -> Reg<regs::Pkgr, R> {
+            unsafe { Reg::from_ptr(self.0.add(292usize)) }
+        }
+        #[doc = "SYSCFG user register 0"]
+        pub fn ur0(self) -> Reg<regs::Ur0, R> {
+            unsafe { Reg::from_ptr(self.0.add(768usize)) }
+        }
+        #[doc = "SYSCFG user register 2"]
+        pub fn ur2(self) -> Reg<regs::Ur2, RW> {
+            unsafe { Reg::from_ptr(self.0.add(776usize)) }
+        }
+        #[doc = "SYSCFG user register 3"]
+        pub fn ur3(self) -> Reg<regs::Ur3, RW> {
+            unsafe { Reg::from_ptr(self.0.add(780usize)) }
+        }
+        #[doc = "SYSCFG user register 4"]
+        pub fn ur4(self) -> Reg<regs::Ur4, R> {
+            unsafe { Reg::from_ptr(self.0.add(784usize)) }
+        }
+        #[doc = "SYSCFG user register 5"]
+        pub fn ur5(self) -> Reg<regs::Ur5, R> {
+            unsafe { Reg::from_ptr(self.0.add(788usize)) }
+        }
+        #[doc = "SYSCFG user register 6"]
+        pub fn ur6(self) -> Reg<regs::Ur6, R> {
+            unsafe { Reg::from_ptr(self.0.add(792usize)) }
+        }
+        #[doc = "SYSCFG user register 7"]
+        pub fn ur7(self) -> Reg<regs::Ur7, R> {
+            unsafe { Reg::from_ptr(self.0.add(796usize)) }
+        }
+        #[doc = "SYSCFG user register 8"]
+        pub fn ur8(self) -> Reg<regs::Ur8, R> {
+            unsafe { Reg::from_ptr(self.0.add(800usize)) }
+        }
+        #[doc = "SYSCFG user register 9"]
+        pub fn ur9(self) -> Reg<regs::Ur9, R> {
+            unsafe { Reg::from_ptr(self.0.add(804usize)) }
+        }
+        #[doc = "SYSCFG user register 10"]
+        pub fn ur10(self) -> Reg<regs::Ur10, R> {
+            unsafe { Reg::from_ptr(self.0.add(808usize)) }
+        }
+        #[doc = "SYSCFG user register 11"]
+        pub fn ur11(self) -> Reg<regs::Ur11, R> {
+            unsafe { Reg::from_ptr(self.0.add(812usize)) }
+        }
+        #[doc = "SYSCFG user register 12"]
+        pub fn ur12(self) -> Reg<regs::Ur12, R> {
+            unsafe { Reg::from_ptr(self.0.add(816usize)) }
+        }
+        #[doc = "SYSCFG user register 13"]
+        pub fn ur13(self) -> Reg<regs::Ur13, R> {
+            unsafe { Reg::from_ptr(self.0.add(820usize)) }
+        }
+        #[doc = "SYSCFG user register 14"]
+        pub fn ur14(self) -> Reg<regs::Ur14, RW> {
+            unsafe { Reg::from_ptr(self.0.add(824usize)) }
+        }
+        #[doc = "SYSCFG user register 15"]
+        pub fn ur15(self) -> Reg<regs::Ur15, R> {
+            unsafe { Reg::from_ptr(self.0.add(828usize)) }
+        }
+        #[doc = "SYSCFG user register 16"]
+        pub fn ur16(self) -> Reg<regs::Ur16, R> {
+            unsafe { Reg::from_ptr(self.0.add(832usize)) }
+        }
+        #[doc = "SYSCFG user register 17"]
+        pub fn ur17(self) -> Reg<regs::Ur17, R> {
+            unsafe { Reg::from_ptr(self.0.add(836usize)) }
+        }
+    }
+    pub mod regs {
+        use crate::generic::*;
+        #[doc = "SYSCFG user register 2"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Dmar(pub u32);
-        impl Dmar {
-            #[doc = "DMA register for burst accesses"]
-            pub const fn dmab(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0xffff;
+        pub struct Ur2(pub u32);
+        impl Ur2 {
+            #[doc = "BOR_LVL Brownout Reset Threshold Level"]
+            pub const fn borh(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x03;
+                val as u8
+            }
+            #[doc = "BOR_LVL Brownout Reset Threshold Level"]
+            pub fn set_borh(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x03 << 0usize)) | (((val as u32) & 0x03) << 0usize);
+            }
+            #[doc = "Boot Address 0"]
+            pub const fn boot_add0(&self) -> u16 {
+                let val = (self.0 >> 16usize) & 0xffff;
                 val as u16
             }
-            #[doc = "DMA register for burst accesses"]
-            pub fn set_dmab(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
+            #[doc = "Boot Address 0"]
+            pub fn set_boot_add0(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 16usize)) | (((val as u32) & 0xffff) << 16usize);
             }
         }
-        impl Default for Dmar {
-            fn default() -> Dmar {
-                Dmar(0)
+        impl Default for Ur2 {
+            fn default() -> Ur2 {
+                Ur2(0)
             }
         }
-        #[doc = "control register 1"]
+        #[doc = "SYSCFG user register 8"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr1Basic(pub u32);
-        impl Cr1Basic {
-            #[doc = "Counter enable"]
-            pub const fn cen(&self) -> bool {
+        pub struct Ur8(pub u32);
+        impl Ur8 {
+            #[doc = "Mass erase protected area disabled for bank 2"]
+            pub const fn mepad_2(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Counter enable"]
-            pub fn set_cen(&mut self, val: bool) {
+            #[doc = "Mass erase protected area disabled for bank 2"]
+            pub fn set_mepad_2(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Update disable"]
-            pub const fn udis(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
+            #[doc = "Mass erase secured area disabled for bank 2"]
+            pub const fn mesad_2(&self) -> bool {
+                let val = (self.0 >> 16usize) & 0x01;
                 val != 0
             }
-            #[doc = "Update disable"]
-            pub fn set_udis(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
-            }
-            #[doc = "Update request source"]
-            pub const fn urs(&self) -> super::vals::Urs {
-                let val = (self.0 >> 2usize) & 0x01;
-                super::vals::Urs(val as u8)
-            }
-            #[doc = "Update request source"]
-            pub fn set_urs(&mut self, val: super::vals::Urs) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val.0 as u32) & 0x01) << 2usize);
-            }
-            #[doc = "One-pulse mode"]
-            pub const fn opm(&self) -> super::vals::Opm {
-                let val = (self.0 >> 3usize) & 0x01;
-                super::vals::Opm(val as u8)
-            }
-            #[doc = "One-pulse mode"]
-            pub fn set_opm(&mut self, val: super::vals::Opm) {
-                self.0 = (self.0 & !(0x01 << 3usize)) | (((val.0 as u32) & 0x01) << 3usize);
-            }
-            #[doc = "Auto-reload preload enable"]
-            pub const fn arpe(&self) -> super::vals::Arpe {
-                let val = (self.0 >> 7usize) & 0x01;
-                super::vals::Arpe(val as u8)
-            }
-            #[doc = "Auto-reload preload enable"]
-            pub fn set_arpe(&mut self, val: super::vals::Arpe) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
+            #[doc = "Mass erase secured area disabled for bank 2"]
+            pub fn set_mesad_2(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
             }
         }
-        impl Default for Cr1Basic {
-            fn default() -> Cr1Basic {
-                Cr1Basic(0)
+        impl Default for Ur8 {
+            fn default() -> Ur8 {
+                Ur8(0)
             }
         }
-        #[doc = "repetition counter register"]
+        #[doc = "SYSCFG user register 9"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Rcr(pub u32);
-        impl Rcr {
-            #[doc = "Repetition counter value"]
-            pub const fn rep(&self) -> u8 {
+        pub struct Ur9(pub u32);
+        impl Ur9 {
+            #[doc = "Write protection for flash bank 2"]
+            pub const fn wrpn_2(&self) -> u8 {
                 let val = (self.0 >> 0usize) & 0xff;
                 val as u8
             }
-            #[doc = "Repetition counter value"]
-            pub fn set_rep(&mut self, val: u8) {
+            #[doc = "Write protection for flash bank 2"]
+            pub fn set_wrpn_2(&mut self, val: u8) {
                 self.0 = (self.0 & !(0xff << 0usize)) | (((val as u32) & 0xff) << 0usize);
             }
+            #[doc = "Protected area start address for bank 2"]
+            pub const fn pa_beg_2(&self) -> u16 {
+                let val = (self.0 >> 16usize) & 0x0fff;
+                val as u16
+            }
+            #[doc = "Protected area start address for bank 2"]
+            pub fn set_pa_beg_2(&mut self, val: u16) {
+                self.0 = (self.0 & !(0x0fff << 16usize)) | (((val as u32) & 0x0fff) << 16usize);
+            }
         }
-        impl Default for Rcr {
-            fn default() -> Rcr {
-                Rcr(0)
+        impl Default for Ur9 {
+            fn default() -> Ur9 {
+                Ur9(0)
             }
         }
-        #[doc = "capture/compare mode register 1 (input mode)"]
+        #[doc = "SYSCFG compensation cell code register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct CcmrInput(pub u32);
-        impl CcmrInput {
-            #[doc = "Capture/Compare 1 selection"]
-            pub fn ccs(&self, n: usize) -> super::vals::CcmrInputCcs {
-                assert!(n < 2usize);
-                let offs = 0usize + n * 8usize;
-                let val = (self.0 >> offs) & 0x03;
-                super::vals::CcmrInputCcs(val as u8)
-            }
-            #[doc = "Capture/Compare 1 selection"]
-            pub fn set_ccs(&mut self, n: usize, val: super::vals::CcmrInputCcs) {
-                assert!(n < 2usize);
-                let offs = 0usize + n * 8usize;
-                self.0 = (self.0 & !(0x03 << offs)) | (((val.0 as u32) & 0x03) << offs);
-            }
-            #[doc = "Input capture 1 prescaler"]
-            pub fn icpsc(&self, n: usize) -> u8 {
-                assert!(n < 2usize);
-                let offs = 2usize + n * 8usize;
-                let val = (self.0 >> offs) & 0x03;
+        pub struct Cccr(pub u32);
+        impl Cccr {
+            #[doc = "NMOS compensation code"]
+            pub const fn ncc(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x0f;
                 val as u8
             }
-            #[doc = "Input capture 1 prescaler"]
-            pub fn set_icpsc(&mut self, n: usize, val: u8) {
-                assert!(n < 2usize);
-                let offs = 2usize + n * 8usize;
-                self.0 = (self.0 & !(0x03 << offs)) | (((val as u32) & 0x03) << offs);
+            #[doc = "NMOS compensation code"]
+            pub fn set_ncc(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
             }
-            #[doc = "Input capture 1 filter"]
-            pub fn icf(&self, n: usize) -> super::vals::Icf {
-                assert!(n < 2usize);
-                let offs = 4usize + n * 8usize;
-                let val = (self.0 >> offs) & 0x0f;
-                super::vals::Icf(val as u8)
+            #[doc = "PMOS compensation code"]
+            pub const fn pcc(&self) -> u8 {
+                let val = (self.0 >> 4usize) & 0x0f;
+                val as u8
             }
-            #[doc = "Input capture 1 filter"]
-            pub fn set_icf(&mut self, n: usize, val: super::vals::Icf) {
-                assert!(n < 2usize);
-                let offs = 4usize + n * 8usize;
-                self.0 = (self.0 & !(0x0f << offs)) | (((val.0 as u32) & 0x0f) << offs);
+            #[doc = "PMOS compensation code"]
+            pub fn set_pcc(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x0f << 4usize)) | (((val as u32) & 0x0f) << 4usize);
             }
         }
-        impl Default for CcmrInput {
-            fn default() -> CcmrInput {
-                CcmrInput(0)
+        impl Default for Cccr {
+            fn default() -> Cccr {
+                Cccr(0)
             }
         }
-        #[doc = "control register 2"]
+        #[doc = "SYSCFG user register 17"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr2Gp(pub u32);
-        impl Cr2Gp {
-            #[doc = "Capture/compare DMA selection"]
-            pub const fn ccds(&self) -> super::vals::Ccds {
-                let val = (self.0 >> 3usize) & 0x01;
-                super::vals::Ccds(val as u8)
-            }
-            #[doc = "Capture/compare DMA selection"]
-            pub fn set_ccds(&mut self, val: super::vals::Ccds) {
-                self.0 = (self.0 & !(0x01 << 3usize)) | (((val.0 as u32) & 0x01) << 3usize);
-            }
-            #[doc = "Master mode selection"]
-            pub const fn mms(&self) -> super::vals::Mms {
-                let val = (self.0 >> 4usize) & 0x07;
-                super::vals::Mms(val as u8)
-            }
-            #[doc = "Master mode selection"]
-            pub fn set_mms(&mut self, val: super::vals::Mms) {
-                self.0 = (self.0 & !(0x07 << 4usize)) | (((val.0 as u32) & 0x07) << 4usize);
-            }
-            #[doc = "TI1 selection"]
-            pub const fn ti1s(&self) -> super::vals::Tis {
-                let val = (self.0 >> 7usize) & 0x01;
-                super::vals::Tis(val as u8)
+        pub struct Ur17(pub u32);
+        impl Ur17 {
+            #[doc = "I/O high speed / low voltage"]
+            pub const fn io_hslv(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
+                val != 0
             }
-            #[doc = "TI1 selection"]
-            pub fn set_ti1s(&mut self, val: super::vals::Tis) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
+            #[doc = "I/O high speed / low voltage"]
+            pub fn set_io_hslv(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
         }
-        impl Default for Cr2Gp {
-            fn default() -> Cr2Gp {
-                Cr2Gp(0)
+        impl Default for Ur17 {
+            fn default() -> Ur17 {
+                Ur17(0)
             }
         }
-        #[doc = "break and dead-time register"]
+        #[doc = "SYSCFG user register 14"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Bdtr(pub u32);
-        impl Bdtr {
-            #[doc = "Dead-time generator setup"]
-            pub const fn dtg(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0xff;
-                val as u8
+        pub struct Ur14(pub u32);
+        impl Ur14 {
+            #[doc = "D1 Stop Reset"]
+            pub const fn d1stprst(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
+                val != 0
             }
-            #[doc = "Dead-time generator setup"]
-            pub fn set_dtg(&mut self, val: u8) {
-                self.0 = (self.0 & !(0xff << 0usize)) | (((val as u32) & 0xff) << 0usize);
+            #[doc = "D1 Stop Reset"]
+            pub fn set_d1stprst(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Lock configuration"]
-            pub const fn lock(&self) -> u8 {
-                let val = (self.0 >> 8usize) & 0x03;
-                val as u8
+        }
+        impl Default for Ur14 {
+            fn default() -> Ur14 {
+                Ur14(0)
             }
-            #[doc = "Lock configuration"]
-            pub fn set_lock(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x03 << 8usize)) | (((val as u32) & 0x03) << 8usize);
+        }
+        #[doc = "SYSCFG user register 7"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Ur7(pub u32);
+        impl Ur7 {
+            #[doc = "Secured area start address for bank 1"]
+            pub const fn sa_beg_1(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0x0fff;
+                val as u16
             }
-            #[doc = "Off-state selection for Idle mode"]
-            pub const fn ossi(&self) -> super::vals::Ossi {
-                let val = (self.0 >> 10usize) & 0x01;
-                super::vals::Ossi(val as u8)
+            #[doc = "Secured area start address for bank 1"]
+            pub fn set_sa_beg_1(&mut self, val: u16) {
+                self.0 = (self.0 & !(0x0fff << 0usize)) | (((val as u32) & 0x0fff) << 0usize);
             }
-            #[doc = "Off-state selection for Idle mode"]
-            pub fn set_ossi(&mut self, val: super::vals::Ossi) {
-                self.0 = (self.0 & !(0x01 << 10usize)) | (((val.0 as u32) & 0x01) << 10usize);
+            #[doc = "Secured area end address for bank 1"]
+            pub const fn sa_end_1(&self) -> u16 {
+                let val = (self.0 >> 16usize) & 0x0fff;
+                val as u16
             }
-            #[doc = "Off-state selection for Run mode"]
-            pub const fn ossr(&self) -> super::vals::Ossr {
-                let val = (self.0 >> 11usize) & 0x01;
-                super::vals::Ossr(val as u8)
+            #[doc = "Secured area end address for bank 1"]
+            pub fn set_sa_end_1(&mut self, val: u16) {
+                self.0 = (self.0 & !(0x0fff << 16usize)) | (((val as u32) & 0x0fff) << 16usize);
             }
-            #[doc = "Off-state selection for Run mode"]
-            pub fn set_ossr(&mut self, val: super::vals::Ossr) {
-                self.0 = (self.0 & !(0x01 << 11usize)) | (((val.0 as u32) & 0x01) << 11usize);
+        }
+        impl Default for Ur7 {
+            fn default() -> Ur7 {
+                Ur7(0)
             }
-            #[doc = "Break enable"]
-            pub const fn bke(&self) -> bool {
-                let val = (self.0 >> 12usize) & 0x01;
+        }
+        #[doc = "SYSCFG user register 12"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Ur12(pub u32);
+        impl Ur12 {
+            #[doc = "Secure mode"]
+            pub const fn secure(&self) -> bool {
+                let val = (self.0 >> 16usize) & 0x01;
                 val != 0
             }
-            #[doc = "Break enable"]
-            pub fn set_bke(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 12usize)) | (((val as u32) & 0x01) << 12usize);
-            }
-            #[doc = "Break polarity"]
-            pub const fn bkp(&self) -> bool {
-                let val = (self.0 >> 13usize) & 0x01;
-                val != 0
+            #[doc = "Secure mode"]
+            pub fn set_secure(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
             }
-            #[doc = "Break polarity"]
-            pub fn set_bkp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 13usize)) | (((val as u32) & 0x01) << 13usize);
+        }
+        impl Default for Ur12 {
+            fn default() -> Ur12 {
+                Ur12(0)
             }
-            #[doc = "Automatic output enable"]
-            pub const fn aoe(&self) -> bool {
-                let val = (self.0 >> 14usize) & 0x01;
+        }
+        #[doc = "SYSCFG user register 0"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Ur0(pub u32);
+        impl Ur0 {
+            #[doc = "Bank Swap"]
+            pub const fn bks(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Automatic output enable"]
-            pub fn set_aoe(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 14usize)) | (((val as u32) & 0x01) << 14usize);
+            #[doc = "Bank Swap"]
+            pub fn set_bks(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Main output enable"]
-            pub const fn moe(&self) -> bool {
-                let val = (self.0 >> 15usize) & 0x01;
-                val != 0
+            #[doc = "Readout protection"]
+            pub const fn rdp(&self) -> u8 {
+                let val = (self.0 >> 16usize) & 0xff;
+                val as u8
             }
-            #[doc = "Main output enable"]
-            pub fn set_moe(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 15usize)) | (((val as u32) & 0x01) << 15usize);
+            #[doc = "Readout protection"]
+            pub fn set_rdp(&mut self, val: u8) {
+                self.0 = (self.0 & !(0xff << 16usize)) | (((val as u32) & 0xff) << 16usize);
             }
         }
-        impl Default for Bdtr {
-            fn default() -> Bdtr {
-                Bdtr(0)
+        impl Default for Ur0 {
+            fn default() -> Ur0 {
+                Ur0(0)
             }
         }
-        #[doc = "auto-reload register"]
+        #[doc = "SYSCFG user register 11"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Arr16(pub u32);
-        impl Arr16 {
-            #[doc = "Auto-reload value"]
-            pub const fn arr(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0xffff;
+        pub struct Ur11(pub u32);
+        impl Ur11 {
+            #[doc = "Secured area end address for bank 2"]
+            pub const fn sa_end_2(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0x0fff;
                 val as u16
             }
-            #[doc = "Auto-reload value"]
-            pub fn set_arr(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
+            #[doc = "Secured area end address for bank 2"]
+            pub fn set_sa_end_2(&mut self, val: u16) {
+                self.0 = (self.0 & !(0x0fff << 0usize)) | (((val as u32) & 0x0fff) << 0usize);
+            }
+            #[doc = "Independent Watchdog 1 mode"]
+            pub const fn iwdg1m(&self) -> bool {
+                let val = (self.0 >> 16usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Independent Watchdog 1 mode"]
+            pub fn set_iwdg1m(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
             }
         }
-        impl Default for Arr16 {
-            fn default() -> Arr16 {
-                Arr16(0)
+        impl Default for Ur11 {
+            fn default() -> Ur11 {
+                Ur11(0)
             }
         }
-        #[doc = "event generation register"]
+        #[doc = "SYSCFG user register 16"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct EgrGp(pub u32);
-        impl EgrGp {
-            #[doc = "Update generation"]
-            pub const fn ug(&self) -> bool {
+        pub struct Ur16(pub u32);
+        impl Ur16 {
+            #[doc = "Freeze independent watchdog in Stop mode"]
+            pub const fn fziwdgstp(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Update generation"]
-            pub fn set_ug(&mut self, val: bool) {
+            #[doc = "Freeze independent watchdog in Stop mode"]
+            pub fn set_fziwdgstp(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Capture/compare 1 generation"]
-            pub fn ccg(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "Private key programmed"]
+            pub const fn pkp(&self) -> bool {
+                let val = (self.0 >> 16usize) & 0x01;
                 val != 0
             }
-            #[doc = "Capture/compare 1 generation"]
-            pub fn set_ccg(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
-            }
-            #[doc = "Capture/Compare control update generation"]
-            pub const fn comg(&self) -> bool {
-                let val = (self.0 >> 5usize) & 0x01;
-                val != 0
+            #[doc = "Private key programmed"]
+            pub fn set_pkp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
             }
-            #[doc = "Capture/Compare control update generation"]
-            pub fn set_comg(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+        }
+        impl Default for Ur16 {
+            fn default() -> Ur16 {
+                Ur16(0)
             }
-            #[doc = "Trigger generation"]
-            pub const fn tg(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
-                val != 0
+        }
+        #[doc = "SYSCFG user register 13"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Ur13(pub u32);
+        impl Ur13 {
+            #[doc = "Secured DTCM RAM Size"]
+            pub const fn sdrs(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x03;
+                val as u8
             }
-            #[doc = "Trigger generation"]
-            pub fn set_tg(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            #[doc = "Secured DTCM RAM Size"]
+            pub fn set_sdrs(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x03 << 0usize)) | (((val as u32) & 0x03) << 0usize);
             }
-            #[doc = "Break generation"]
-            pub const fn bg(&self) -> bool {
-                let val = (self.0 >> 7usize) & 0x01;
+            #[doc = "D1 Standby reset"]
+            pub const fn d1sbrst(&self) -> bool {
+                let val = (self.0 >> 16usize) & 0x01;
                 val != 0
             }
-            #[doc = "Break generation"]
-            pub fn set_bg(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            #[doc = "D1 Standby reset"]
+            pub fn set_d1sbrst(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
             }
         }
-        impl Default for EgrGp {
-            fn default() -> EgrGp {
-                EgrGp(0)
+        impl Default for Ur13 {
+            fn default() -> Ur13 {
+                Ur13(0)
             }
         }
-        #[doc = "DMA control register"]
+        #[doc = "SYSCFG user register 5"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Dcr(pub u32);
-        impl Dcr {
-            #[doc = "DMA base address"]
-            pub const fn dba(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x1f;
-                val as u8
+        pub struct Ur5(pub u32);
+        impl Ur5 {
+            #[doc = "Mass erase secured area disabled for bank 1"]
+            pub const fn mesad_1(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
+                val != 0
             }
-            #[doc = "DMA base address"]
-            pub fn set_dba(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x1f << 0usize)) | (((val as u32) & 0x1f) << 0usize);
+            #[doc = "Mass erase secured area disabled for bank 1"]
+            pub fn set_mesad_1(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "DMA burst length"]
-            pub const fn dbl(&self) -> u8 {
-                let val = (self.0 >> 8usize) & 0x1f;
+            #[doc = "Write protection for flash bank 1"]
+            pub const fn wrpn_1(&self) -> u8 {
+                let val = (self.0 >> 16usize) & 0xff;
                 val as u8
             }
-            #[doc = "DMA burst length"]
-            pub fn set_dbl(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x1f << 8usize)) | (((val as u32) & 0x1f) << 8usize);
+            #[doc = "Write protection for flash bank 1"]
+            pub fn set_wrpn_1(&mut self, val: u8) {
+                self.0 = (self.0 & !(0xff << 16usize)) | (((val as u32) & 0xff) << 16usize);
             }
         }
-        impl Default for Dcr {
-            fn default() -> Dcr {
-                Dcr(0)
+        impl Default for Ur5 {
+            fn default() -> Ur5 {
+                Ur5(0)
             }
         }
-        #[doc = "slave mode control register"]
+        #[doc = "compensation cell control/status register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Smcr(pub u32);
-        impl Smcr {
-            #[doc = "Slave mode selection"]
-            pub const fn sms(&self) -> super::vals::Sms {
-                let val = (self.0 >> 0usize) & 0x07;
-                super::vals::Sms(val as u8)
-            }
-            #[doc = "Slave mode selection"]
-            pub fn set_sms(&mut self, val: super::vals::Sms) {
-                self.0 = (self.0 & !(0x07 << 0usize)) | (((val.0 as u32) & 0x07) << 0usize);
-            }
-            #[doc = "Trigger selection"]
-            pub const fn ts(&self) -> super::vals::Ts {
-                let val = (self.0 >> 4usize) & 0x07;
-                super::vals::Ts(val as u8)
-            }
-            #[doc = "Trigger selection"]
-            pub fn set_ts(&mut self, val: super::vals::Ts) {
-                self.0 = (self.0 & !(0x07 << 4usize)) | (((val.0 as u32) & 0x07) << 4usize);
+        pub struct Cccsr(pub u32);
+        impl Cccsr {
+            #[doc = "enable"]
+            pub const fn en(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
+                val != 0
             }
-            #[doc = "Master/Slave mode"]
-            pub const fn msm(&self) -> super::vals::Msm {
-                let val = (self.0 >> 7usize) & 0x01;
-                super::vals::Msm(val as u8)
+            #[doc = "enable"]
+            pub fn set_en(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Master/Slave mode"]
-            pub fn set_msm(&mut self, val: super::vals::Msm) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
+            #[doc = "Code selection"]
+            pub const fn cs(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
+                val != 0
             }
-            #[doc = "External trigger filter"]
-            pub const fn etf(&self) -> super::vals::Etf {
-                let val = (self.0 >> 8usize) & 0x0f;
-                super::vals::Etf(val as u8)
+            #[doc = "Code selection"]
+            pub fn set_cs(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "External trigger filter"]
-            pub fn set_etf(&mut self, val: super::vals::Etf) {
-                self.0 = (self.0 & !(0x0f << 8usize)) | (((val.0 as u32) & 0x0f) << 8usize);
+            #[doc = "Compensation cell ready flag"]
+            pub const fn ready(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
+                val != 0
             }
-            #[doc = "External trigger prescaler"]
-            pub const fn etps(&self) -> super::vals::Etps {
-                let val = (self.0 >> 12usize) & 0x03;
-                super::vals::Etps(val as u8)
+            #[doc = "Compensation cell ready flag"]
+            pub fn set_ready(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
-            #[doc = "External trigger prescaler"]
-            pub fn set_etps(&mut self, val: super::vals::Etps) {
-                self.0 = (self.0 & !(0x03 << 12usize)) | (((val.0 as u32) & 0x03) << 12usize);
+            #[doc = "High-speed at low-voltage"]
+            pub const fn hslv(&self) -> bool {
+                let val = (self.0 >> 16usize) & 0x01;
+                val != 0
             }
-            #[doc = "External clock enable"]
-            pub const fn ece(&self) -> super::vals::Ece {
-                let val = (self.0 >> 14usize) & 0x01;
-                super::vals::Ece(val as u8)
+            #[doc = "High-speed at low-voltage"]
+            pub fn set_hslv(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
             }
-            #[doc = "External clock enable"]
-            pub fn set_ece(&mut self, val: super::vals::Ece) {
-                self.0 = (self.0 & !(0x01 << 14usize)) | (((val.0 as u32) & 0x01) << 14usize);
+        }
+        impl Default for Cccsr {
+            fn default() -> Cccsr {
+                Cccsr(0)
             }
-            #[doc = "External trigger polarity"]
-            pub const fn etp(&self) -> super::vals::Etp {
-                let val = (self.0 >> 15usize) & 0x01;
-                super::vals::Etp(val as u8)
+        }
+        #[doc = "SYSCFG user register 4"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Ur4(pub u32);
+        impl Ur4 {
+            #[doc = "Mass Erase Protected Area Disabled for bank 1"]
+            pub const fn mepad_1(&self) -> bool {
+                let val = (self.0 >> 16usize) & 0x01;
+                val != 0
             }
-            #[doc = "External trigger polarity"]
-            pub fn set_etp(&mut self, val: super::vals::Etp) {
-                self.0 = (self.0 & !(0x01 << 15usize)) | (((val.0 as u32) & 0x01) << 15usize);
+            #[doc = "Mass Erase Protected Area Disabled for bank 1"]
+            pub fn set_mepad_1(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
             }
         }
-        impl Default for Smcr {
-            fn default() -> Smcr {
-                Smcr(0)
+        impl Default for Ur4 {
+            fn default() -> Ur4 {
+                Ur4(0)
             }
         }
-        #[doc = "DMA/Interrupt enable register"]
+        #[doc = "SYSCFG user register 10"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct DierBasic(pub u32);
-        impl DierBasic {
-            #[doc = "Update interrupt enable"]
-            pub const fn uie(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
-                val != 0
+        pub struct Ur10(pub u32);
+        impl Ur10 {
+            #[doc = "Protected area end address for bank 2"]
+            pub const fn pa_end_2(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0x0fff;
+                val as u16
             }
-            #[doc = "Update interrupt enable"]
-            pub fn set_uie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            #[doc = "Protected area end address for bank 2"]
+            pub fn set_pa_end_2(&mut self, val: u16) {
+                self.0 = (self.0 & !(0x0fff << 0usize)) | (((val as u32) & 0x0fff) << 0usize);
             }
-            #[doc = "Update DMA request enable"]
-            pub const fn ude(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
-                val != 0
+            #[doc = "Secured area start address for bank 2"]
+            pub const fn sa_beg_2(&self) -> u16 {
+                let val = (self.0 >> 16usize) & 0x0fff;
+                val as u16
             }
-            #[doc = "Update DMA request enable"]
-            pub fn set_ude(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            #[doc = "Secured area start address for bank 2"]
+            pub fn set_sa_beg_2(&mut self, val: u16) {
+                self.0 = (self.0 & !(0x0fff << 16usize)) | (((val as u32) & 0x0fff) << 16usize);
             }
         }
-        impl Default for DierBasic {
-            fn default() -> DierBasic {
-                DierBasic(0)
+        impl Default for Ur10 {
+            fn default() -> Ur10 {
+                Ur10(0)
             }
         }
-        #[doc = "control register 2"]
+        #[doc = "SYSCFG user register 15"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr2Adv(pub u32);
-        impl Cr2Adv {
-            #[doc = "Capture/compare preloaded control"]
-            pub const fn ccpc(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Capture/compare preloaded control"]
-            pub fn set_ccpc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
-            }
-            #[doc = "Capture/compare control update selection"]
-            pub const fn ccus(&self) -> bool {
-                let val = (self.0 >> 2usize) & 0x01;
+        pub struct Ur15(pub u32);
+        impl Ur15 {
+            #[doc = "Freeze independent watchdog in Standby mode"]
+            pub const fn fziwdgstb(&self) -> bool {
+                let val = (self.0 >> 16usize) & 0x01;
                 val != 0
             }
-            #[doc = "Capture/compare control update selection"]
-            pub fn set_ccus(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
+            #[doc = "Freeze independent watchdog in Standby mode"]
+            pub fn set_fziwdgstb(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
             }
-            #[doc = "Capture/compare DMA selection"]
-            pub const fn ccds(&self) -> super::vals::Ccds {
-                let val = (self.0 >> 3usize) & 0x01;
-                super::vals::Ccds(val as u8)
+        }
+        impl Default for Ur15 {
+            fn default() -> Ur15 {
+                Ur15(0)
             }
-            #[doc = "Capture/compare DMA selection"]
-            pub fn set_ccds(&mut self, val: super::vals::Ccds) {
-                self.0 = (self.0 & !(0x01 << 3usize)) | (((val.0 as u32) & 0x01) << 3usize);
+        }
+        #[doc = "SYSCFG user register 3"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Ur3(pub u32);
+        impl Ur3 {
+            #[doc = "Boot Address 1"]
+            pub const fn boot_add1(&self) -> u16 {
+                let val = (self.0 >> 16usize) & 0xffff;
+                val as u16
             }
-            #[doc = "Master mode selection"]
-            pub const fn mms(&self) -> super::vals::Mms {
-                let val = (self.0 >> 4usize) & 0x07;
-                super::vals::Mms(val as u8)
+            #[doc = "Boot Address 1"]
+            pub fn set_boot_add1(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 16usize)) | (((val as u32) & 0xffff) << 16usize);
             }
-            #[doc = "Master mode selection"]
-            pub fn set_mms(&mut self, val: super::vals::Mms) {
-                self.0 = (self.0 & !(0x07 << 4usize)) | (((val.0 as u32) & 0x07) << 4usize);
+        }
+        impl Default for Ur3 {
+            fn default() -> Ur3 {
+                Ur3(0)
             }
-            #[doc = "TI1 selection"]
-            pub const fn ti1s(&self) -> super::vals::Tis {
-                let val = (self.0 >> 7usize) & 0x01;
-                super::vals::Tis(val as u8)
+        }
+        #[doc = "SYSCFG package register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Pkgr(pub u32);
+        impl Pkgr {
+            #[doc = "Package"]
+            pub const fn pkg(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x0f;
+                val as u8
             }
-            #[doc = "TI1 selection"]
-            pub fn set_ti1s(&mut self, val: super::vals::Tis) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
+            #[doc = "Package"]
+            pub fn set_pkg(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
             }
-            #[doc = "Output Idle state 1"]
-            pub fn ois(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 8usize + n * 2usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
+        }
+        impl Default for Pkgr {
+            fn default() -> Pkgr {
+                Pkgr(0)
             }
-            #[doc = "Output Idle state 1"]
-            pub fn set_ois(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 8usize + n * 2usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+        }
+        #[doc = "SYSCFG user register 6"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Ur6(pub u32);
+        impl Ur6 {
+            #[doc = "Protected area start address for bank 1"]
+            pub const fn pa_beg_1(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0x0fff;
+                val as u16
             }
-            #[doc = "Output Idle state 1"]
-            pub const fn ois1n(&self) -> bool {
-                let val = (self.0 >> 9usize) & 0x01;
-                val != 0
+            #[doc = "Protected area start address for bank 1"]
+            pub fn set_pa_beg_1(&mut self, val: u16) {
+                self.0 = (self.0 & !(0x0fff << 0usize)) | (((val as u32) & 0x0fff) << 0usize);
             }
-            #[doc = "Output Idle state 1"]
-            pub fn set_ois1n(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
+            #[doc = "Protected area end address for bank 1"]
+            pub const fn pa_end_1(&self) -> u16 {
+                let val = (self.0 >> 16usize) & 0x0fff;
+                val as u16
             }
-            #[doc = "Output Idle state 2"]
-            pub const fn ois2n(&self) -> bool {
-                let val = (self.0 >> 11usize) & 0x01;
-                val != 0
+            #[doc = "Protected area end address for bank 1"]
+            pub fn set_pa_end_1(&mut self, val: u16) {
+                self.0 = (self.0 & !(0x0fff << 16usize)) | (((val as u32) & 0x0fff) << 16usize);
             }
-            #[doc = "Output Idle state 2"]
-            pub fn set_ois2n(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 11usize)) | (((val as u32) & 0x01) << 11usize);
+        }
+        impl Default for Ur6 {
+            fn default() -> Ur6 {
+                Ur6(0)
             }
-            #[doc = "Output Idle state 3"]
-            pub const fn ois3n(&self) -> bool {
-                let val = (self.0 >> 13usize) & 0x01;
-                val != 0
+        }
+        #[doc = "external interrupt configuration register 2"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Exticr(pub u32);
+        impl Exticr {
+            #[doc = "EXTI x configuration (x = 4 to 7)"]
+            pub fn exti(&self, n: usize) -> u8 {
+                assert!(n < 4usize);
+                let offs = 0usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x0f;
+                val as u8
             }
-            #[doc = "Output Idle state 3"]
-            pub fn set_ois3n(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 13usize)) | (((val as u32) & 0x01) << 13usize);
+            #[doc = "EXTI x configuration (x = 4 to 7)"]
+            pub fn set_exti(&mut self, n: usize, val: u8) {
+                assert!(n < 4usize);
+                let offs = 0usize + n * 4usize;
+                self.0 = (self.0 & !(0x0f << offs)) | (((val as u32) & 0x0f) << offs);
             }
         }
-        impl Default for Cr2Adv {
-            fn default() -> Cr2Adv {
-                Cr2Adv(0)
+        impl Default for Exticr {
+            fn default() -> Exticr {
+                Exticr(0)
             }
         }
-        #[doc = "status register"]
+        #[doc = "SYSCFG compensation cell value register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct SrBasic(pub u32);
-        impl SrBasic {
-            #[doc = "Update interrupt flag"]
-            pub const fn uif(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
-                val != 0
+        pub struct Ccvr(pub u32);
+        impl Ccvr {
+            #[doc = "NMOS compensation value"]
+            pub const fn ncv(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x0f;
+                val as u8
             }
-            #[doc = "Update interrupt flag"]
-            pub fn set_uif(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            #[doc = "NMOS compensation value"]
+            pub fn set_ncv(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
+            }
+            #[doc = "PMOS compensation value"]
+            pub const fn pcv(&self) -> u8 {
+                let val = (self.0 >> 4usize) & 0x0f;
+                val as u8
+            }
+            #[doc = "PMOS compensation value"]
+            pub fn set_pcv(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x0f << 4usize)) | (((val as u32) & 0x0f) << 4usize);
             }
         }
-        impl Default for SrBasic {
-            fn default() -> SrBasic {
-                SrBasic(0)
+        impl Default for Ccvr {
+            fn default() -> Ccvr {
+                Ccvr(0)
             }
         }
-        #[doc = "DMA/Interrupt enable register"]
+        #[doc = "peripheral mode configuration register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct DierAdv(pub u32);
-        impl DierAdv {
-            #[doc = "Update interrupt enable"]
-            pub const fn uie(&self) -> bool {
+        pub struct Pmcr(pub u32);
+        impl Pmcr {
+            #[doc = "I2C1 Fm+"]
+            pub const fn i2c1fmp(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Update interrupt enable"]
-            pub fn set_uie(&mut self, val: bool) {
+            #[doc = "I2C1 Fm+"]
+            pub fn set_i2c1fmp(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Capture/Compare 1 interrupt enable"]
-            pub fn ccie(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "I2C2 Fm+"]
+            pub const fn i2c2fmp(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
                 val != 0
             }
-            #[doc = "Capture/Compare 1 interrupt enable"]
-            pub fn set_ccie(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "I2C2 Fm+"]
+            pub fn set_i2c2fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "COM interrupt enable"]
-            pub const fn comie(&self) -> bool {
-                let val = (self.0 >> 5usize) & 0x01;
+            #[doc = "I2C3 Fm+"]
+            pub const fn i2c3fmp(&self) -> bool {
+                let val = (self.0 >> 2usize) & 0x01;
                 val != 0
             }
-            #[doc = "COM interrupt enable"]
-            pub fn set_comie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+            #[doc = "I2C3 Fm+"]
+            pub fn set_i2c3fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
             }
-            #[doc = "Trigger interrupt enable"]
-            pub const fn tie(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
+            #[doc = "I2C4 Fm+"]
+            pub const fn i2c4fmp(&self) -> bool {
+                let val = (self.0 >> 3usize) & 0x01;
                 val != 0
             }
-            #[doc = "Trigger interrupt enable"]
-            pub fn set_tie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            #[doc = "I2C4 Fm+"]
+            pub fn set_i2c4fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
             }
-            #[doc = "Break interrupt enable"]
-            pub const fn bie(&self) -> bool {
-                let val = (self.0 >> 7usize) & 0x01;
+            #[doc = "PB(6) Fm+"]
+            pub const fn pb6fmp(&self) -> bool {
+                let val = (self.0 >> 4usize) & 0x01;
                 val != 0
             }
-            #[doc = "Break interrupt enable"]
-            pub fn set_bie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            #[doc = "PB(6) Fm+"]
+            pub fn set_pb6fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
             }
-            #[doc = "Update DMA request enable"]
-            pub const fn ude(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
+            #[doc = "PB(7) Fast Mode Plus"]
+            pub const fn pb7fmp(&self) -> bool {
+                let val = (self.0 >> 5usize) & 0x01;
                 val != 0
             }
-            #[doc = "Update DMA request enable"]
-            pub fn set_ude(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            #[doc = "PB(7) Fast Mode Plus"]
+            pub fn set_pb7fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
             }
-            #[doc = "Capture/Compare 1 DMA request enable"]
-            pub fn ccde(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 9usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "PB(8) Fast Mode Plus"]
+            pub const fn pb8fmp(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
                 val != 0
             }
-            #[doc = "Capture/Compare 1 DMA request enable"]
-            pub fn set_ccde(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 9usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "PB(8) Fast Mode Plus"]
+            pub fn set_pb8fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
-            #[doc = "COM DMA request enable"]
-            pub const fn comde(&self) -> bool {
-                let val = (self.0 >> 13usize) & 0x01;
+            #[doc = "PB(9) Fm+"]
+            pub const fn pb9fmp(&self) -> bool {
+                let val = (self.0 >> 7usize) & 0x01;
                 val != 0
             }
-            #[doc = "COM DMA request enable"]
-            pub fn set_comde(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 13usize)) | (((val as u32) & 0x01) << 13usize);
+            #[doc = "PB(9) Fm+"]
+            pub fn set_pb9fmp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
             }
-            #[doc = "Trigger DMA request enable"]
-            pub const fn tde(&self) -> bool {
-                let val = (self.0 >> 14usize) & 0x01;
+            #[doc = "Booster Enable"]
+            pub const fn booste(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
                 val != 0
             }
-            #[doc = "Trigger DMA request enable"]
-            pub fn set_tde(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 14usize)) | (((val as u32) & 0x01) << 14usize);
-            }
-        }
-        impl Default for DierAdv {
-            fn default() -> DierAdv {
-                DierAdv(0)
+            #[doc = "Booster Enable"]
+            pub fn set_booste(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
-        }
-        #[doc = "status register"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct SrGp(pub u32);
-        impl SrGp {
-            #[doc = "Update interrupt flag"]
-            pub const fn uif(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
+            #[doc = "Analog switch supply voltage selection"]
+            pub const fn boostvddsel(&self) -> bool {
+                let val = (self.0 >> 9usize) & 0x01;
                 val != 0
             }
-            #[doc = "Update interrupt flag"]
-            pub fn set_uif(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            #[doc = "Analog switch supply voltage selection"]
+            pub fn set_boostvddsel(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
             }
-            #[doc = "Capture/compare 1 interrupt flag"]
-            pub fn ccif(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
+            #[doc = "Ethernet PHY Interface Selection"]
+            pub const fn epis(&self) -> u8 {
+                let val = (self.0 >> 21usize) & 0x07;
+                val as u8
             }
-            #[doc = "Capture/compare 1 interrupt flag"]
-            pub fn set_ccif(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Ethernet PHY Interface Selection"]
+            pub fn set_epis(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x07 << 21usize)) | (((val as u32) & 0x07) << 21usize);
             }
-            #[doc = "COM interrupt flag"]
-            pub const fn comif(&self) -> bool {
-                let val = (self.0 >> 5usize) & 0x01;
+            #[doc = "PA0 Switch Open"]
+            pub const fn pa0so(&self) -> bool {
+                let val = (self.0 >> 24usize) & 0x01;
                 val != 0
             }
-            #[doc = "COM interrupt flag"]
-            pub fn set_comif(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+            #[doc = "PA0 Switch Open"]
+            pub fn set_pa0so(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 24usize)) | (((val as u32) & 0x01) << 24usize);
             }
-            #[doc = "Trigger interrupt flag"]
-            pub const fn tif(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
+            #[doc = "PA1 Switch Open"]
+            pub const fn pa1so(&self) -> bool {
+                let val = (self.0 >> 25usize) & 0x01;
                 val != 0
             }
-            #[doc = "Trigger interrupt flag"]
-            pub fn set_tif(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            #[doc = "PA1 Switch Open"]
+            pub fn set_pa1so(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 25usize)) | (((val as u32) & 0x01) << 25usize);
             }
-            #[doc = "Break interrupt flag"]
-            pub const fn bif(&self) -> bool {
-                let val = (self.0 >> 7usize) & 0x01;
+            #[doc = "PC2 Switch Open"]
+            pub const fn pc2so(&self) -> bool {
+                let val = (self.0 >> 26usize) & 0x01;
                 val != 0
             }
-            #[doc = "Break interrupt flag"]
-            pub fn set_bif(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            #[doc = "PC2 Switch Open"]
+            pub fn set_pc2so(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 26usize)) | (((val as u32) & 0x01) << 26usize);
             }
-            #[doc = "Capture/Compare 1 overcapture flag"]
-            pub fn ccof(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 9usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "PC3 Switch Open"]
+            pub const fn pc3so(&self) -> bool {
+                let val = (self.0 >> 27usize) & 0x01;
                 val != 0
             }
-            #[doc = "Capture/Compare 1 overcapture flag"]
-            pub fn set_ccof(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 9usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "PC3 Switch Open"]
+            pub fn set_pc3so(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 27usize)) | (((val as u32) & 0x01) << 27usize);
             }
         }
-        impl Default for SrGp {
-            fn default() -> SrGp {
-                SrGp(0)
+        impl Default for Pmcr {
+            fn default() -> Pmcr {
+                Pmcr(0)
             }
         }
-        #[doc = "capture/compare register 1"]
+        #[doc = "SYSCFG power control register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ccr32(pub u32);
-        impl Ccr32 {
-            #[doc = "Capture/Compare 1 value"]
-            pub const fn ccr(&self) -> u32 {
-                let val = (self.0 >> 0usize) & 0xffff_ffff;
-                val as u32
+        pub struct Pwrcr(pub u32);
+        impl Pwrcr {
+            #[doc = "Overdrive enable"]
+            pub const fn oden(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x0f;
+                val as u8
             }
-            #[doc = "Capture/Compare 1 value"]
-            pub fn set_ccr(&mut self, val: u32) {
-                self.0 =
-                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
+            #[doc = "Overdrive enable"]
+            pub fn set_oden(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
             }
         }
-        impl Default for Ccr32 {
-            fn default() -> Ccr32 {
-                Ccr32(0)
+        impl Default for Pwrcr {
+            fn default() -> Pwrcr {
+                Pwrcr(0)
             }
         }
-        #[doc = "capture/compare register 1"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ccr16(pub u32);
-        impl Ccr16 {
-            #[doc = "Capture/Compare 1 value"]
-            pub const fn ccr(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0xffff;
-                val as u16
-            }
-            #[doc = "Capture/Compare 1 value"]
-            pub fn set_ccr(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
-            }
+    }
+}
+pub mod rng_v1 {
+    use crate::generic::*;
+    #[doc = "Random number generator"]
+    #[derive(Copy, Clone)]
+    pub struct Rng(pub *mut u8);
+    unsafe impl Send for Rng {}
+    unsafe impl Sync for Rng {}
+    impl Rng {
+        #[doc = "control register"]
+        pub fn cr(self) -> Reg<regs::Cr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(0usize)) }
         }
-        impl Default for Ccr16 {
-            fn default() -> Ccr16 {
-                Ccr16(0)
-            }
+        #[doc = "status register"]
+        pub fn sr(self) -> Reg<regs::Sr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(4usize)) }
         }
-        #[doc = "capture/compare enable register"]
+        #[doc = "data register"]
+        pub fn dr(self) -> Reg<u32, R> {
+            unsafe { Reg::from_ptr(self.0.add(8usize)) }
+        }
+    }
+    pub mod regs {
+        use crate::generic::*;
+        #[doc = "status register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct CcerGp(pub u32);
-        impl CcerGp {
-            #[doc = "Capture/Compare 1 output enable"]
-            pub fn cce(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 0usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x01;
+        pub struct Sr(pub u32);
+        impl Sr {
+            #[doc = "Data ready"]
+            pub const fn drdy(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Capture/Compare 1 output enable"]
-            pub fn set_cce(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 0usize + n * 4usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Data ready"]
+            pub fn set_drdy(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Capture/Compare 1 output Polarity"]
-            pub fn ccp(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "Clock error current status"]
+            pub const fn cecs(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
                 val != 0
             }
-            #[doc = "Capture/Compare 1 output Polarity"]
-            pub fn set_ccp(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 1usize + n * 4usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Clock error current status"]
+            pub fn set_cecs(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "Capture/Compare 1 output Polarity"]
-            pub fn ccnp(&self, n: usize) -> bool {
-                assert!(n < 4usize);
-                let offs = 3usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x01;
+            #[doc = "Seed error current status"]
+            pub const fn secs(&self) -> bool {
+                let val = (self.0 >> 2usize) & 0x01;
                 val != 0
             }
-            #[doc = "Capture/Compare 1 output Polarity"]
-            pub fn set_ccnp(&mut self, n: usize, val: bool) {
-                assert!(n < 4usize);
-                let offs = 3usize + n * 4usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Seed error current status"]
+            pub fn set_secs(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
             }
-        }
-        impl Default for CcerGp {
-            fn default() -> CcerGp {
-                CcerGp(0)
+            #[doc = "Clock error interrupt status"]
+            pub const fn ceis(&self) -> bool {
+                let val = (self.0 >> 5usize) & 0x01;
+                val != 0
             }
-        }
-        #[doc = "control register 2"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr2Basic(pub u32);
-        impl Cr2Basic {
-            #[doc = "Master mode selection"]
-            pub const fn mms(&self) -> super::vals::Mms {
-                let val = (self.0 >> 4usize) & 0x07;
-                super::vals::Mms(val as u8)
+            #[doc = "Clock error interrupt status"]
+            pub fn set_ceis(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
             }
-            #[doc = "Master mode selection"]
-            pub fn set_mms(&mut self, val: super::vals::Mms) {
-                self.0 = (self.0 & !(0x07 << 4usize)) | (((val.0 as u32) & 0x07) << 4usize);
+            #[doc = "Seed error interrupt status"]
+            pub const fn seis(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Seed error interrupt status"]
+            pub fn set_seis(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
         }
-        impl Default for Cr2Basic {
-            fn default() -> Cr2Basic {
-                Cr2Basic(0)
+        impl Default for Sr {
+            fn default() -> Sr {
+                Sr(0)
             }
         }
-        #[doc = "prescaler"]
+        #[doc = "control register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Psc(pub u32);
-        impl Psc {
-            #[doc = "Prescaler value"]
-            pub const fn psc(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0xffff;
-                val as u16
+        pub struct Cr(pub u32);
+        impl Cr {
+            #[doc = "Random number generator enable"]
+            pub const fn rngen(&self) -> bool {
+                let val = (self.0 >> 2usize) & 0x01;
+                val != 0
             }
-            #[doc = "Prescaler value"]
-            pub fn set_psc(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
+            #[doc = "Random number generator enable"]
+            pub fn set_rngen(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
+            }
+            #[doc = "Interrupt enable"]
+            pub const fn ie(&self) -> bool {
+                let val = (self.0 >> 3usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Interrupt enable"]
+            pub fn set_ie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
             }
         }
-        impl Default for Psc {
-            fn default() -> Psc {
-                Psc(0)
+        impl Default for Cr {
+            fn default() -> Cr {
+                Cr(0)
             }
         }
     }
-    pub mod vals {
-        use crate::generic::*;
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Arpe(pub u8);
-        impl Arpe {
-            #[doc = "TIMx_APRR register is not buffered"]
-            pub const DISABLED: Self = Self(0);
-            #[doc = "TIMx_APRR register is buffered"]
-            pub const ENABLED: Self = Self(0x01);
+}
+pub mod usart_v1 {
+    use crate::generic::*;
+    #[doc = "Universal synchronous asynchronous receiver transmitter"]
+    #[derive(Copy, Clone)]
+    pub struct Usart(pub *mut u8);
+    unsafe impl Send for Usart {}
+    unsafe impl Sync for Usart {}
+    impl Usart {
+        #[doc = "Status register"]
+        pub fn sr(self) -> Reg<regs::Sr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(0usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Etps(pub u8);
-        impl Etps {
-            #[doc = "Prescaler OFF"]
-            pub const DIV1: Self = Self(0);
-            #[doc = "ETRP frequency divided by 2"]
-            pub const DIV2: Self = Self(0x01);
-            #[doc = "ETRP frequency divided by 4"]
-            pub const DIV4: Self = Self(0x02);
-            #[doc = "ETRP frequency divided by 8"]
-            pub const DIV8: Self = Self(0x03);
+        #[doc = "Data register"]
+        pub fn dr(self) -> Reg<regs::Dr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(4usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ossi(pub u8);
-        impl Ossi {
-            #[doc = "When inactive, OC/OCN outputs are disabled"]
-            pub const DISABLED: Self = Self(0);
-            #[doc = "When inactive, OC/OCN outputs are forced to idle level"]
-            pub const IDLELEVEL: Self = Self(0x01);
+        #[doc = "Baud rate register"]
+        pub fn brr(self) -> Reg<regs::Brr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(8usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Etp(pub u8);
-        impl Etp {
-            #[doc = "ETR is noninverted, active at high level or rising edge"]
-            pub const NOTINVERTED: Self = Self(0);
-            #[doc = "ETR is inverted, active at low level or falling edge"]
-            pub const INVERTED: Self = Self(0x01);
+        #[doc = "Control register 1"]
+        pub fn cr1(self) -> Reg<regs::Cr1, RW> {
+            unsafe { Reg::from_ptr(self.0.add(12usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ossr(pub u8);
-        impl Ossr {
-            #[doc = "When inactive, OC/OCN outputs are disabled"]
-            pub const DISABLED: Self = Self(0);
-            #[doc = "When inactive, OC/OCN outputs are enabled with their inactive level"]
-            pub const IDLELEVEL: Self = Self(0x01);
+        #[doc = "Control register 2"]
+        pub fn cr2(self) -> Reg<regs::Cr2Usart, RW> {
+            unsafe { Reg::from_ptr(self.0.add(16usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Mms(pub u8);
-        impl Mms {
-            #[doc = "The UG bit from the TIMx_EGR register is used as trigger output"]
-            pub const RESET: Self = Self(0);
-            #[doc = "The counter enable signal, CNT_EN, is used as trigger output"]
-            pub const ENABLE: Self = Self(0x01);
-            #[doc = "The update event is selected as trigger output"]
-            pub const UPDATE: Self = Self(0x02);
-            #[doc = "The trigger output send a positive pulse when the CC1IF flag it to be set, as soon as a capture or a compare match occurred"]
-            pub const COMPAREPULSE: Self = Self(0x03);
-            #[doc = "OC1REF signal is used as trigger output"]
-            pub const COMPAREOC1: Self = Self(0x04);
-            #[doc = "OC2REF signal is used as trigger output"]
-            pub const COMPAREOC2: Self = Self(0x05);
-            #[doc = "OC3REF signal is used as trigger output"]
-            pub const COMPAREOC3: Self = Self(0x06);
-            #[doc = "OC4REF signal is used as trigger output"]
-            pub const COMPAREOC4: Self = Self(0x07);
+        #[doc = "Control register 3"]
+        pub fn cr3(self) -> Reg<regs::Cr3Usart, RW> {
+            unsafe { Reg::from_ptr(self.0.add(20usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ocpe(pub u8);
-        impl Ocpe {
-            #[doc = "Preload register on CCR2 disabled. New values written to CCR2 are taken into account immediately"]
-            pub const DISABLED: Self = Self(0);
-            #[doc = "Preload register on CCR2 enabled. Preload value is loaded into active register on each update event"]
-            pub const ENABLED: Self = Self(0x01);
+        #[doc = "Guard time and prescaler register"]
+        pub fn gtpr(self) -> Reg<regs::Gtpr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(24usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Opm(pub u8);
-        impl Opm {
-            #[doc = "Counter is not stopped at update event"]
-            pub const DISABLED: Self = Self(0);
-            #[doc = "Counter stops counting at the next update event (clearing the CEN bit)"]
-            pub const ENABLED: Self = Self(0x01);
+    }
+    #[doc = "Universal asynchronous receiver transmitter"]
+    #[derive(Copy, Clone)]
+    pub struct Uart(pub *mut u8);
+    unsafe impl Send for Uart {}
+    unsafe impl Sync for Uart {}
+    impl Uart {
+        #[doc = "Status register"]
+        pub fn sr(self) -> Reg<regs::Sr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(0usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Urs(pub u8);
-        impl Urs {
-            #[doc = "Any of counter overflow/underflow, setting UG, or update through slave mode, generates an update interrupt or DMA request"]
-            pub const ANYEVENT: Self = Self(0);
-            #[doc = "Only counter overflow/underflow generates an update interrupt or DMA request"]
-            pub const COUNTERONLY: Self = Self(0x01);
+        #[doc = "Data register"]
+        pub fn dr(self) -> Reg<regs::Dr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(4usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Dir(pub u8);
-        impl Dir {
-            #[doc = "Counter used as upcounter"]
-            pub const UP: Self = Self(0);
-            #[doc = "Counter used as downcounter"]
-            pub const DOWN: Self = Self(0x01);
+        #[doc = "Baud rate register"]
+        pub fn brr(self) -> Reg<regs::Brr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(8usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Icf(pub u8);
-        impl Icf {
-            #[doc = "No filter, sampling is done at fDTS"]
-            pub const NOFILTER: Self = Self(0);
-            #[doc = "fSAMPLING=fCK_INT, N=2"]
-            pub const FCK_INT_N2: Self = Self(0x01);
-            #[doc = "fSAMPLING=fCK_INT, N=4"]
-            pub const FCK_INT_N4: Self = Self(0x02);
-            #[doc = "fSAMPLING=fCK_INT, N=8"]
-            pub const FCK_INT_N8: Self = Self(0x03);
-            #[doc = "fSAMPLING=fDTS/2, N=6"]
-            pub const FDTS_DIV2_N6: Self = Self(0x04);
-            #[doc = "fSAMPLING=fDTS/2, N=8"]
-            pub const FDTS_DIV2_N8: Self = Self(0x05);
-            #[doc = "fSAMPLING=fDTS/4, N=6"]
-            pub const FDTS_DIV4_N6: Self = Self(0x06);
-            #[doc = "fSAMPLING=fDTS/4, N=8"]
-            pub const FDTS_DIV4_N8: Self = Self(0x07);
-            #[doc = "fSAMPLING=fDTS/8, N=6"]
-            pub const FDTS_DIV8_N6: Self = Self(0x08);
-            #[doc = "fSAMPLING=fDTS/8, N=8"]
-            pub const FDTS_DIV8_N8: Self = Self(0x09);
-            #[doc = "fSAMPLING=fDTS/16, N=5"]
-            pub const FDTS_DIV16_N5: Self = Self(0x0a);
-            #[doc = "fSAMPLING=fDTS/16, N=6"]
-            pub const FDTS_DIV16_N6: Self = Self(0x0b);
-            #[doc = "fSAMPLING=fDTS/16, N=8"]
-            pub const FDTS_DIV16_N8: Self = Self(0x0c);
-            #[doc = "fSAMPLING=fDTS/32, N=5"]
-            pub const FDTS_DIV32_N5: Self = Self(0x0d);
-            #[doc = "fSAMPLING=fDTS/32, N=6"]
-            pub const FDTS_DIV32_N6: Self = Self(0x0e);
-            #[doc = "fSAMPLING=fDTS/32, N=8"]
-            pub const FDTS_DIV32_N8: Self = Self(0x0f);
+        #[doc = "Control register 1"]
+        pub fn cr1(self) -> Reg<regs::Cr1, RW> {
+            unsafe { Reg::from_ptr(self.0.add(12usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Etf(pub u8);
-        impl Etf {
-            #[doc = "No filter, sampling is done at fDTS"]
-            pub const NOFILTER: Self = Self(0);
-            #[doc = "fSAMPLING=fCK_INT, N=2"]
-            pub const FCK_INT_N2: Self = Self(0x01);
-            #[doc = "fSAMPLING=fCK_INT, N=4"]
-            pub const FCK_INT_N4: Self = Self(0x02);
-            #[doc = "fSAMPLING=fCK_INT, N=8"]
-            pub const FCK_INT_N8: Self = Self(0x03);
-            #[doc = "fSAMPLING=fDTS/2, N=6"]
-            pub const FDTS_DIV2_N6: Self = Self(0x04);
-            #[doc = "fSAMPLING=fDTS/2, N=8"]
-            pub const FDTS_DIV2_N8: Self = Self(0x05);
-            #[doc = "fSAMPLING=fDTS/4, N=6"]
-            pub const FDTS_DIV4_N6: Self = Self(0x06);
-            #[doc = "fSAMPLING=fDTS/4, N=8"]
-            pub const FDTS_DIV4_N8: Self = Self(0x07);
-            #[doc = "fSAMPLING=fDTS/8, N=6"]
-            pub const FDTS_DIV8_N6: Self = Self(0x08);
-            #[doc = "fSAMPLING=fDTS/8, N=8"]
-            pub const FDTS_DIV8_N8: Self = Self(0x09);
-            #[doc = "fSAMPLING=fDTS/16, N=5"]
-            pub const FDTS_DIV16_N5: Self = Self(0x0a);
-            #[doc = "fSAMPLING=fDTS/16, N=6"]
-            pub const FDTS_DIV16_N6: Self = Self(0x0b);
-            #[doc = "fSAMPLING=fDTS/16, N=8"]
-            pub const FDTS_DIV16_N8: Self = Self(0x0c);
-            #[doc = "fSAMPLING=fDTS/32, N=5"]
-            pub const FDTS_DIV32_N5: Self = Self(0x0d);
-            #[doc = "fSAMPLING=fDTS/32, N=6"]
-            pub const FDTS_DIV32_N6: Self = Self(0x0e);
-            #[doc = "fSAMPLING=fDTS/32, N=8"]
-            pub const FDTS_DIV32_N8: Self = Self(0x0f);
+        #[doc = "Control register 2"]
+        pub fn cr2(self) -> Reg<regs::Cr2, RW> {
+            unsafe { Reg::from_ptr(self.0.add(16usize)) }
+        }
+        #[doc = "Control register 3"]
+        pub fn cr3(self) -> Reg<regs::Cr3, RW> {
+            unsafe { Reg::from_ptr(self.0.add(20usize)) }
         }
+    }
+    pub mod vals {
+        use crate::generic::*;
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ocm(pub u8);
-        impl Ocm {
-            #[doc = "The comparison between the output compare register TIMx_CCRy and the counter TIMx_CNT has no effect on the outputs"]
-            pub const FROZEN: Self = Self(0);
-            #[doc = "Set channel to active level on match. OCyREF signal is forced high when the counter matches the capture/compare register"]
-            pub const ACTIVEONMATCH: Self = Self(0x01);
-            #[doc = "Set channel to inactive level on match. OCyREF signal is forced low when the counter matches the capture/compare register"]
-            pub const INACTIVEONMATCH: Self = Self(0x02);
-            #[doc = "OCyREF toggles when TIMx_CNT=TIMx_CCRy"]
-            pub const TOGGLE: Self = Self(0x03);
-            #[doc = "OCyREF is forced low"]
-            pub const FORCEINACTIVE: Self = Self(0x04);
-            #[doc = "OCyREF is forced high"]
-            pub const FORCEACTIVE: Self = Self(0x05);
-            #[doc = "In upcounting, channel is active as long as TIMx_CNT<TIMx_CCRy else inactive. In downcounting, channel is inactive as long as TIMx_CNT>TIMx_CCRy else active"]
-            pub const PWMMODE1: Self = Self(0x06);
-            #[doc = "Inversely to PwmMode1"]
-            pub const PWMMODE2: Self = Self(0x07);
+        pub struct M(pub u8);
+        impl M {
+            #[doc = "8 data bits"]
+            pub const M8: Self = Self(0);
+            #[doc = "9 data bits"]
+            pub const M9: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Tis(pub u8);
-        impl Tis {
-            #[doc = "The TIMx_CH1 pin is connected to TI1 input"]
-            pub const NORMAL: Self = Self(0);
-            #[doc = "The TIMx_CH1, CH2, CH3 pins are connected to TI1 input"]
-            pub const XOR: Self = Self(0x01);
+        pub struct Cpha(pub u8);
+        impl Cpha {
+            #[doc = "The first clock transition is the first data capture edge"]
+            pub const FIRST: Self = Self(0);
+            #[doc = "The second clock transition is the first data capture edge"]
+            pub const SECOND: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct CcmrInputCcs(pub u8);
-        impl CcmrInputCcs {
-            #[doc = "CCx channel is configured as input, normal mapping: ICx mapped to TIx"]
-            pub const TI4: Self = Self(0x01);
-            #[doc = "CCx channel is configured as input, alternate mapping (switches 1 with 2, 3 with 4)"]
-            pub const TI3: Self = Self(0x02);
-            #[doc = "CCx channel is configured as input, ICx is mapped on TRC"]
-            pub const TRC: Self = Self(0x03);
+        pub struct Irlp(pub u8);
+        impl Irlp {
+            #[doc = "Normal mode"]
+            pub const NORMAL: Self = Self(0);
+            #[doc = "Low-power mode"]
+            pub const LOWPOWER: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Msm(pub u8);
-        impl Msm {
-            #[doc = "No action"]
-            pub const NOSYNC: Self = Self(0);
-            #[doc = "The effect of an event on the trigger input (TRGI) is delayed to allow a perfect synchronization between the current timer and its slaves (through TRGO). It is useful if we want to synchronize several timers on a single external event."]
-            pub const SYNC: Self = Self(0x01);
+        pub struct Lbdl(pub u8);
+        impl Lbdl {
+            #[doc = "10-bit break detection"]
+            pub const LBDL10: Self = Self(0);
+            #[doc = "11-bit break detection"]
+            pub const LBDL11: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ccds(pub u8);
-        impl Ccds {
-            #[doc = "CCx DMA request sent when CCx event occurs"]
-            pub const ONCOMPARE: Self = Self(0);
-            #[doc = "CCx DMA request sent when update event occurs"]
-            pub const ONUPDATE: Self = Self(0x01);
+        pub struct Sbk(pub u8);
+        impl Sbk {
+            #[doc = "No break character is transmitted"]
+            pub const NOBREAK: Self = Self(0);
+            #[doc = "Break character transmitted"]
+            pub const BREAK: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Cms(pub u8);
-        impl Cms {
-            #[doc = "The counter counts up or down depending on the direction bit"]
-            pub const EDGEALIGNED: Self = Self(0);
-            #[doc = "The counter counts up and down alternatively. Output compare interrupt flags are set only when the counter is counting down."]
-            pub const CENTERALIGNED1: Self = Self(0x01);
-            #[doc = "The counter counts up and down alternatively. Output compare interrupt flags are set only when the counter is counting up."]
-            pub const CENTERALIGNED2: Self = Self(0x02);
-            #[doc = "The counter counts up and down alternatively. Output compare interrupt flags are set both when the counter is counting up or down."]
-            pub const CENTERALIGNED3: Self = Self(0x03);
+        pub struct Hdsel(pub u8);
+        impl Hdsel {
+            #[doc = "Half duplex mode is not selected"]
+            pub const FULLDUPLEX: Self = Self(0);
+            #[doc = "Half duplex mode is selected"]
+            pub const HALFDUPLEX: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct CcmrOutputCcs(pub u8);
-        impl CcmrOutputCcs {
-            #[doc = "CCx channel is configured as output"]
-            pub const OUTPUT: Self = Self(0);
+        pub struct Rwu(pub u8);
+        impl Rwu {
+            #[doc = "Receiver in active mode"]
+            pub const ACTIVE: Self = Self(0);
+            #[doc = "Receiver in mute mode"]
+            pub const MUTE: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ece(pub u8);
-        impl Ece {
-            #[doc = "External clock mode 2 disabled"]
-            pub const DISABLED: Self = Self(0);
-            #[doc = "External clock mode 2 enabled. The counter is clocked by any active edge on the ETRF signal."]
-            pub const ENABLED: Self = Self(0x01);
+        pub struct Wake(pub u8);
+        impl Wake {
+            #[doc = "USART wakeup on idle line"]
+            pub const IDLELINE: Self = Self(0);
+            #[doc = "USART wakeup on address mark"]
+            pub const ADDRESSMARK: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Sms(pub u8);
-        impl Sms {
-            #[doc = "Slave mode disabled - if CEN = ‘1 then the prescaler is clocked directly by the internal clock."]
-            pub const DISABLED: Self = Self(0);
-            #[doc = "Encoder mode 1 - Counter counts up/down on TI2FP1 edge depending on TI1FP2 level."]
-            pub const ENCODER_MODE_1: Self = Self(0x01);
-            #[doc = "Encoder mode 2 - Counter counts up/down on TI1FP2 edge depending on TI2FP1 level."]
-            pub const ENCODER_MODE_2: Self = Self(0x02);
-            #[doc = "Encoder mode 3 - Counter counts up/down on both TI1FP1 and TI2FP2 edges depending on the level of the other input."]
-            pub const ENCODER_MODE_3: Self = Self(0x03);
-            #[doc = "Reset Mode - Rising edge of the selected trigger input (TRGI) reinitializes the counter and generates an update of the registers."]
-            pub const RESET_MODE: Self = Self(0x04);
-            #[doc = "Gated Mode - The counter clock is enabled when the trigger input (TRGI) is high. The counter stops (but is not reset) as soon as the trigger becomes low. Both start and stop of the counter are controlled."]
-            pub const GATED_MODE: Self = Self(0x05);
-            #[doc = "Trigger Mode - The counter starts at a rising edge of the trigger TRGI (but it is not reset). Only the start of the counter is controlled."]
-            pub const TRIGGER_MODE: Self = Self(0x06);
-            #[doc = "External Clock Mode 1 - Rising edges of the selected trigger (TRGI) clock the counter."]
-            pub const EXT_CLOCK_MODE: Self = Self(0x07);
+        pub struct Stop(pub u8);
+        impl Stop {
+            #[doc = "1 stop bit"]
+            pub const STOP1: Self = Self(0);
+            #[doc = "0.5 stop bits"]
+            pub const STOP0P5: Self = Self(0x01);
+            #[doc = "2 stop bits"]
+            pub const STOP2: Self = Self(0x02);
+            #[doc = "1.5 stop bits"]
+            pub const STOP1P5: Self = Self(0x03);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ckd(pub u8);
-        impl Ckd {
-            #[doc = "t_DTS = t_CK_INT"]
-            pub const DIV1: Self = Self(0);
-            #[doc = "t_DTS = 2 × t_CK_INT"]
-            pub const DIV2: Self = Self(0x01);
-            #[doc = "t_DTS = 4 × t_CK_INT"]
-            pub const DIV4: Self = Self(0x02);
+        pub struct Ps(pub u8);
+        impl Ps {
+            #[doc = "Even parity"]
+            pub const EVEN: Self = Self(0);
+            #[doc = "Odd parity"]
+            pub const ODD: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ts(pub u8);
-        impl Ts {
-            #[doc = "Internal Trigger 0 (ITR0)"]
-            pub const ITR0: Self = Self(0);
-            #[doc = "Internal Trigger 1 (ITR1)"]
-            pub const ITR1: Self = Self(0x01);
-            #[doc = "Internal Trigger 2 (ITR2)"]
-            pub const ITR2: Self = Self(0x02);
-            #[doc = "TI1 Edge Detector (TI1F_ED)"]
-            pub const TI1F_ED: Self = Self(0x04);
-            #[doc = "Filtered Timer Input 1 (TI1FP1)"]
-            pub const TI1FP1: Self = Self(0x05);
-            #[doc = "Filtered Timer Input 2 (TI2FP2)"]
-            pub const TI2FP2: Self = Self(0x06);
-            #[doc = "External Trigger input (ETRF)"]
-            pub const ETRF: Self = Self(0x07);
-        }
-    }
-}
-pub mod syscfg_l4 {
-    use crate::generic::*;
-    #[doc = "System configuration controller"]
-    #[derive(Copy, Clone)]
-    pub struct Syscfg(pub *mut u8);
-    unsafe impl Send for Syscfg {}
-    unsafe impl Sync for Syscfg {}
-    impl Syscfg {
-        #[doc = "memory remap register"]
-        pub fn memrmp(self) -> Reg<regs::Memrmp, RW> {
-            unsafe { Reg::from_ptr(self.0.add(0usize)) }
-        }
-        #[doc = "configuration register 1"]
-        pub fn cfgr1(self) -> Reg<regs::Cfgr1, RW> {
-            unsafe { Reg::from_ptr(self.0.add(4usize)) }
-        }
-        #[doc = "external interrupt configuration register 1"]
-        pub fn exticr(self, n: usize) -> Reg<regs::Exticr, RW> {
-            assert!(n < 4usize);
-            unsafe { Reg::from_ptr(self.0.add(8usize + n * 4usize)) }
-        }
-        #[doc = "SCSR"]
-        pub fn scsr(self) -> Reg<regs::Scsr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(24usize)) }
-        }
-        #[doc = "CFGR2"]
-        pub fn cfgr2(self) -> Reg<regs::Cfgr2, RW> {
-            unsafe { Reg::from_ptr(self.0.add(28usize)) }
-        }
-        #[doc = "SWPR"]
-        pub fn swpr(self) -> Reg<regs::Swpr, W> {
-            unsafe { Reg::from_ptr(self.0.add(32usize)) }
-        }
-        #[doc = "SKR"]
-        pub fn skr(self) -> Reg<regs::Skr, W> {
-            unsafe { Reg::from_ptr(self.0.add(36usize)) }
+        pub struct Cpol(pub u8);
+        impl Cpol {
+            #[doc = "Steady low value on CK pin outside transmission window"]
+            pub const LOW: Self = Self(0);
+            #[doc = "Steady high value on CK pin outside transmission window"]
+            pub const HIGH: Self = Self(0x01);
         }
     }
     pub mod regs {
         use crate::generic::*;
-        #[doc = "SCSR"]
+        #[doc = "Control register 3"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Scsr(pub u32);
-        impl Scsr {
-            #[doc = "SRAM2 Erase"]
-            pub const fn sram2er(&self) -> bool {
+        pub struct Cr3Usart(pub u32);
+        impl Cr3Usart {
+            #[doc = "Error interrupt enable"]
+            pub const fn eie(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "SRAM2 Erase"]
-            pub fn set_sram2er(&mut self, val: bool) {
+            #[doc = "Error interrupt enable"]
+            pub fn set_eie(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "SRAM2 busy by erase operation"]
-            pub const fn sram2bsy(&self) -> bool {
+            #[doc = "IrDA mode enable"]
+            pub const fn iren(&self) -> bool {
                 let val = (self.0 >> 1usize) & 0x01;
                 val != 0
             }
-            #[doc = "SRAM2 busy by erase operation"]
-            pub fn set_sram2bsy(&mut self, val: bool) {
+            #[doc = "IrDA mode enable"]
+            pub fn set_iren(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
+            #[doc = "IrDA low-power"]
+            pub const fn irlp(&self) -> super::vals::Irlp {
+                let val = (self.0 >> 2usize) & 0x01;
+                super::vals::Irlp(val as u8)
+            }
+            #[doc = "IrDA low-power"]
+            pub fn set_irlp(&mut self, val: super::vals::Irlp) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val.0 as u32) & 0x01) << 2usize);
+            }
+            #[doc = "Half-duplex selection"]
+            pub const fn hdsel(&self) -> super::vals::Hdsel {
+                let val = (self.0 >> 3usize) & 0x01;
+                super::vals::Hdsel(val as u8)
+            }
+            #[doc = "Half-duplex selection"]
+            pub fn set_hdsel(&mut self, val: super::vals::Hdsel) {
+                self.0 = (self.0 & !(0x01 << 3usize)) | (((val.0 as u32) & 0x01) << 3usize);
+            }
+            #[doc = "Smartcard NACK enable"]
+            pub const fn nack(&self) -> bool {
+                let val = (self.0 >> 4usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Smartcard NACK enable"]
+            pub fn set_nack(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
+            }
+            #[doc = "Smartcard mode enable"]
+            pub const fn scen(&self) -> bool {
+                let val = (self.0 >> 5usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Smartcard mode enable"]
+            pub fn set_scen(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+            }
+            #[doc = "DMA enable receiver"]
+            pub const fn dmar(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
+                val != 0
+            }
+            #[doc = "DMA enable receiver"]
+            pub fn set_dmar(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            }
+            #[doc = "DMA enable transmitter"]
+            pub const fn dmat(&self) -> bool {
+                let val = (self.0 >> 7usize) & 0x01;
+                val != 0
+            }
+            #[doc = "DMA enable transmitter"]
+            pub fn set_dmat(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            }
+            #[doc = "RTS enable"]
+            pub const fn rtse(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
+                val != 0
+            }
+            #[doc = "RTS enable"]
+            pub fn set_rtse(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            }
+            #[doc = "CTS enable"]
+            pub const fn ctse(&self) -> bool {
+                let val = (self.0 >> 9usize) & 0x01;
+                val != 0
+            }
+            #[doc = "CTS enable"]
+            pub fn set_ctse(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
+            }
+            #[doc = "CTS interrupt enable"]
+            pub const fn ctsie(&self) -> bool {
+                let val = (self.0 >> 10usize) & 0x01;
+                val != 0
+            }
+            #[doc = "CTS interrupt enable"]
+            pub fn set_ctsie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 10usize)) | (((val as u32) & 0x01) << 10usize);
+            }
         }
-        impl Default for Scsr {
-            fn default() -> Scsr {
-                Scsr(0)
+        impl Default for Cr3Usart {
+            fn default() -> Cr3Usart {
+                Cr3Usart(0)
             }
         }
-        #[doc = "SKR"]
+        #[doc = "Control register 3"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Skr(pub u32);
-        impl Skr {
-            #[doc = "SRAM2 write protection key for software erase"]
-            pub const fn key(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0xff;
-                val as u8
+        pub struct Cr3(pub u32);
+        impl Cr3 {
+            #[doc = "Error interrupt enable"]
+            pub const fn eie(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
+                val != 0
             }
-            #[doc = "SRAM2 write protection key for software erase"]
-            pub fn set_key(&mut self, val: u8) {
-                self.0 = (self.0 & !(0xff << 0usize)) | (((val as u32) & 0xff) << 0usize);
+            #[doc = "Error interrupt enable"]
+            pub fn set_eie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            }
+            #[doc = "IrDA mode enable"]
+            pub const fn iren(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
+                val != 0
+            }
+            #[doc = "IrDA mode enable"]
+            pub fn set_iren(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
+            }
+            #[doc = "IrDA low-power"]
+            pub const fn irlp(&self) -> super::vals::Irlp {
+                let val = (self.0 >> 2usize) & 0x01;
+                super::vals::Irlp(val as u8)
+            }
+            #[doc = "IrDA low-power"]
+            pub fn set_irlp(&mut self, val: super::vals::Irlp) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val.0 as u32) & 0x01) << 2usize);
+            }
+            #[doc = "Half-duplex selection"]
+            pub const fn hdsel(&self) -> super::vals::Hdsel {
+                let val = (self.0 >> 3usize) & 0x01;
+                super::vals::Hdsel(val as u8)
+            }
+            #[doc = "Half-duplex selection"]
+            pub fn set_hdsel(&mut self, val: super::vals::Hdsel) {
+                self.0 = (self.0 & !(0x01 << 3usize)) | (((val.0 as u32) & 0x01) << 3usize);
+            }
+            #[doc = "DMA enable receiver"]
+            pub const fn dmar(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
+                val != 0
+            }
+            #[doc = "DMA enable receiver"]
+            pub fn set_dmar(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            }
+            #[doc = "DMA enable transmitter"]
+            pub const fn dmat(&self) -> bool {
+                let val = (self.0 >> 7usize) & 0x01;
+                val != 0
+            }
+            #[doc = "DMA enable transmitter"]
+            pub fn set_dmat(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
             }
         }
-        impl Default for Skr {
-            fn default() -> Skr {
-                Skr(0)
+        impl Default for Cr3 {
+            fn default() -> Cr3 {
+                Cr3(0)
             }
         }
-        #[doc = "external interrupt configuration register 4"]
+        #[doc = "Baud rate register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Exticr(pub u32);
-        impl Exticr {
-            #[doc = "EXTI12 configuration bits"]
-            pub fn exti(&self, n: usize) -> u8 {
-                assert!(n < 4usize);
-                let offs = 0usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x0f;
+        pub struct Brr(pub u32);
+        impl Brr {
+            #[doc = "fraction of USARTDIV"]
+            pub const fn div_fraction(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x0f;
                 val as u8
             }
-            #[doc = "EXTI12 configuration bits"]
-            pub fn set_exti(&mut self, n: usize, val: u8) {
-                assert!(n < 4usize);
-                let offs = 0usize + n * 4usize;
-                self.0 = (self.0 & !(0x0f << offs)) | (((val as u32) & 0x0f) << offs);
+            #[doc = "fraction of USARTDIV"]
+            pub fn set_div_fraction(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
+            }
+            #[doc = "mantissa of USARTDIV"]
+            pub const fn div_mantissa(&self) -> u16 {
+                let val = (self.0 >> 4usize) & 0x0fff;
+                val as u16
+            }
+            #[doc = "mantissa of USARTDIV"]
+            pub fn set_div_mantissa(&mut self, val: u16) {
+                self.0 = (self.0 & !(0x0fff << 4usize)) | (((val as u32) & 0x0fff) << 4usize);
             }
         }
-        impl Default for Exticr {
-            fn default() -> Exticr {
-                Exticr(0)
+        impl Default for Brr {
+            fn default() -> Brr {
+                Brr(0)
             }
         }
-        #[doc = "memory remap register"]
+        #[doc = "Control register 1"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Memrmp(pub u32);
-        impl Memrmp {
-            #[doc = "Memory mapping selection"]
-            pub const fn mem_mode(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x07;
-                val as u8
+        pub struct Cr1(pub u32);
+        impl Cr1 {
+            #[doc = "Send break"]
+            pub const fn sbk(&self) -> super::vals::Sbk {
+                let val = (self.0 >> 0usize) & 0x01;
+                super::vals::Sbk(val as u8)
             }
-            #[doc = "Memory mapping selection"]
-            pub fn set_mem_mode(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x07 << 0usize)) | (((val as u32) & 0x07) << 0usize);
+            #[doc = "Send break"]
+            pub fn set_sbk(&mut self, val: super::vals::Sbk) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val.0 as u32) & 0x01) << 0usize);
             }
-            #[doc = "QUADSPI memory mapping swap"]
-            pub const fn qfs(&self) -> bool {
+            #[doc = "Receiver wakeup"]
+            pub const fn rwu(&self) -> super::vals::Rwu {
+                let val = (self.0 >> 1usize) & 0x01;
+                super::vals::Rwu(val as u8)
+            }
+            #[doc = "Receiver wakeup"]
+            pub fn set_rwu(&mut self, val: super::vals::Rwu) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val.0 as u32) & 0x01) << 1usize);
+            }
+            #[doc = "Receiver enable"]
+            pub const fn re(&self) -> bool {
+                let val = (self.0 >> 2usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Receiver enable"]
+            pub fn set_re(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
+            }
+            #[doc = "Transmitter enable"]
+            pub const fn te(&self) -> bool {
                 let val = (self.0 >> 3usize) & 0x01;
                 val != 0
             }
-            #[doc = "QUADSPI memory mapping swap"]
-            pub fn set_qfs(&mut self, val: bool) {
+            #[doc = "Transmitter enable"]
+            pub fn set_te(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
             }
-            #[doc = "Flash Bank mode selection"]
-            pub const fn fb_mode(&self) -> bool {
+            #[doc = "IDLE interrupt enable"]
+            pub const fn idleie(&self) -> bool {
+                let val = (self.0 >> 4usize) & 0x01;
+                val != 0
+            }
+            #[doc = "IDLE interrupt enable"]
+            pub fn set_idleie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
+            }
+            #[doc = "RXNE interrupt enable"]
+            pub const fn rxneie(&self) -> bool {
+                let val = (self.0 >> 5usize) & 0x01;
+                val != 0
+            }
+            #[doc = "RXNE interrupt enable"]
+            pub fn set_rxneie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+            }
+            #[doc = "Transmission complete interrupt enable"]
+            pub const fn tcie(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Transmission complete interrupt enable"]
+            pub fn set_tcie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            }
+            #[doc = "TXE interrupt enable"]
+            pub const fn txeie(&self) -> bool {
+                let val = (self.0 >> 7usize) & 0x01;
+                val != 0
+            }
+            #[doc = "TXE interrupt enable"]
+            pub fn set_txeie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            }
+            #[doc = "PE interrupt enable"]
+            pub const fn peie(&self) -> bool {
                 let val = (self.0 >> 8usize) & 0x01;
                 val != 0
             }
-            #[doc = "Flash Bank mode selection"]
-            pub fn set_fb_mode(&mut self, val: bool) {
+            #[doc = "PE interrupt enable"]
+            pub fn set_peie(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
+            #[doc = "Parity selection"]
+            pub const fn ps(&self) -> super::vals::Ps {
+                let val = (self.0 >> 9usize) & 0x01;
+                super::vals::Ps(val as u8)
+            }
+            #[doc = "Parity selection"]
+            pub fn set_ps(&mut self, val: super::vals::Ps) {
+                self.0 = (self.0 & !(0x01 << 9usize)) | (((val.0 as u32) & 0x01) << 9usize);
+            }
+            #[doc = "Parity control enable"]
+            pub const fn pce(&self) -> bool {
+                let val = (self.0 >> 10usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Parity control enable"]
+            pub fn set_pce(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 10usize)) | (((val as u32) & 0x01) << 10usize);
+            }
+            #[doc = "Wakeup method"]
+            pub const fn wake(&self) -> super::vals::Wake {
+                let val = (self.0 >> 11usize) & 0x01;
+                super::vals::Wake(val as u8)
+            }
+            #[doc = "Wakeup method"]
+            pub fn set_wake(&mut self, val: super::vals::Wake) {
+                self.0 = (self.0 & !(0x01 << 11usize)) | (((val.0 as u32) & 0x01) << 11usize);
+            }
+            #[doc = "Word length"]
+            pub const fn m(&self) -> super::vals::M {
+                let val = (self.0 >> 12usize) & 0x01;
+                super::vals::M(val as u8)
+            }
+            #[doc = "Word length"]
+            pub fn set_m(&mut self, val: super::vals::M) {
+                self.0 = (self.0 & !(0x01 << 12usize)) | (((val.0 as u32) & 0x01) << 12usize);
+            }
+            #[doc = "USART enable"]
+            pub const fn ue(&self) -> bool {
+                let val = (self.0 >> 13usize) & 0x01;
+                val != 0
+            }
+            #[doc = "USART enable"]
+            pub fn set_ue(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 13usize)) | (((val as u32) & 0x01) << 13usize);
+            }
         }
-        impl Default for Memrmp {
-            fn default() -> Memrmp {
-                Memrmp(0)
+        impl Default for Cr1 {
+            fn default() -> Cr1 {
+                Cr1(0)
             }
         }
-        #[doc = "CFGR2"]
+        #[doc = "Guard time and prescaler register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cfgr2(pub u32);
-        impl Cfgr2 {
-            #[doc = "Cortex LOCKUP (Hardfault) output enable bit"]
-            pub const fn cll(&self) -> bool {
+        pub struct Gtpr(pub u32);
+        impl Gtpr {
+            #[doc = "Prescaler value"]
+            pub const fn psc(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0xff;
+                val as u8
+            }
+            #[doc = "Prescaler value"]
+            pub fn set_psc(&mut self, val: u8) {
+                self.0 = (self.0 & !(0xff << 0usize)) | (((val as u32) & 0xff) << 0usize);
+            }
+            #[doc = "Guard time value"]
+            pub const fn gt(&self) -> u8 {
+                let val = (self.0 >> 8usize) & 0xff;
+                val as u8
+            }
+            #[doc = "Guard time value"]
+            pub fn set_gt(&mut self, val: u8) {
+                self.0 = (self.0 & !(0xff << 8usize)) | (((val as u32) & 0xff) << 8usize);
+            }
+        }
+        impl Default for Gtpr {
+            fn default() -> Gtpr {
+                Gtpr(0)
+            }
+        }
+        #[doc = "Data register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Dr(pub u32);
+        impl Dr {
+            #[doc = "Data value"]
+            pub const fn dr(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0x01ff;
+                val as u16
+            }
+            #[doc = "Data value"]
+            pub fn set_dr(&mut self, val: u16) {
+                self.0 = (self.0 & !(0x01ff << 0usize)) | (((val as u32) & 0x01ff) << 0usize);
+            }
+        }
+        impl Default for Dr {
+            fn default() -> Dr {
+                Dr(0)
+            }
+        }
+        #[doc = "Status register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Sr(pub u32);
+        impl Sr {
+            #[doc = "Parity error"]
+            pub const fn pe(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Cortex LOCKUP (Hardfault) output enable bit"]
-            pub fn set_cll(&mut self, val: bool) {
+            #[doc = "Parity error"]
+            pub fn set_pe(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "SRAM2 parity lock bit"]
-            pub const fn spl(&self) -> bool {
+            #[doc = "Framing error"]
+            pub const fn fe(&self) -> bool {
                 let val = (self.0 >> 1usize) & 0x01;
                 val != 0
             }
-            #[doc = "SRAM2 parity lock bit"]
-            pub fn set_spl(&mut self, val: bool) {
+            #[doc = "Framing error"]
+            pub fn set_fe(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "PVD lock enable bit"]
-            pub const fn pvdl(&self) -> bool {
+            #[doc = "Noise error flag"]
+            pub const fn ne(&self) -> bool {
                 let val = (self.0 >> 2usize) & 0x01;
                 val != 0
             }
-            #[doc = "PVD lock enable bit"]
-            pub fn set_pvdl(&mut self, val: bool) {
+            #[doc = "Noise error flag"]
+            pub fn set_ne(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
             }
-            #[doc = "ECC Lock"]
-            pub const fn eccl(&self) -> bool {
+            #[doc = "Overrun error"]
+            pub const fn ore(&self) -> bool {
                 let val = (self.0 >> 3usize) & 0x01;
                 val != 0
             }
-            #[doc = "ECC Lock"]
-            pub fn set_eccl(&mut self, val: bool) {
+            #[doc = "Overrun error"]
+            pub fn set_ore(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
             }
-            #[doc = "SRAM2 parity error flag"]
-            pub const fn spf(&self) -> bool {
+            #[doc = "IDLE line detected"]
+            pub const fn idle(&self) -> bool {
+                let val = (self.0 >> 4usize) & 0x01;
+                val != 0
+            }
+            #[doc = "IDLE line detected"]
+            pub fn set_idle(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
+            }
+            #[doc = "Read data register not empty"]
+            pub const fn rxne(&self) -> bool {
+                let val = (self.0 >> 5usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Read data register not empty"]
+            pub fn set_rxne(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+            }
+            #[doc = "Transmission complete"]
+            pub const fn tc(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Transmission complete"]
+            pub fn set_tc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            }
+            #[doc = "Transmit data register empty"]
+            pub const fn txe(&self) -> bool {
+                let val = (self.0 >> 7usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Transmit data register empty"]
+            pub fn set_txe(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            }
+            #[doc = "LIN break detection flag"]
+            pub const fn lbd(&self) -> bool {
                 let val = (self.0 >> 8usize) & 0x01;
                 val != 0
             }
-            #[doc = "SRAM2 parity error flag"]
-            pub fn set_spf(&mut self, val: bool) {
+            #[doc = "LIN break detection flag"]
+            pub fn set_lbd(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
         }
-        impl Default for Cfgr2 {
-            fn default() -> Cfgr2 {
-                Cfgr2(0)
+        impl Default for Sr {
+            fn default() -> Sr {
+                Sr(0)
             }
         }
-        #[doc = "configuration register 1"]
+        #[doc = "Status register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cfgr1(pub u32);
-        impl Cfgr1 {
-            #[doc = "Firewall disable"]
-            pub const fn fwdis(&self) -> bool {
+        pub struct SrUsart(pub u32);
+        impl SrUsart {
+            #[doc = "Parity error"]
+            pub const fn pe(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Firewall disable"]
-            pub fn set_fwdis(&mut self, val: bool) {
+            #[doc = "Parity error"]
+            pub fn set_pe(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "I/O analog switch voltage booster enable"]
-            pub const fn boosten(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
+            #[doc = "Framing error"]
+            pub const fn fe(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
                 val != 0
             }
-            #[doc = "I/O analog switch voltage booster enable"]
-            pub fn set_boosten(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            #[doc = "Framing error"]
+            pub fn set_fe(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB6"]
-            pub const fn i2c_pb6_fmp(&self) -> bool {
-                let val = (self.0 >> 16usize) & 0x01;
+            #[doc = "Noise error flag"]
+            pub const fn ne(&self) -> bool {
+                let val = (self.0 >> 2usize) & 0x01;
                 val != 0
             }
-            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB6"]
-            pub fn set_i2c_pb6_fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
+            #[doc = "Noise error flag"]
+            pub fn set_ne(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
             }
-            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB7"]
-            pub const fn i2c_pb7_fmp(&self) -> bool {
-                let val = (self.0 >> 17usize) & 0x01;
+            #[doc = "Overrun error"]
+            pub const fn ore(&self) -> bool {
+                let val = (self.0 >> 3usize) & 0x01;
                 val != 0
             }
-            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB7"]
-            pub fn set_i2c_pb7_fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 17usize)) | (((val as u32) & 0x01) << 17usize);
+            #[doc = "Overrun error"]
+            pub fn set_ore(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
             }
-            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB8"]
-            pub const fn i2c_pb8_fmp(&self) -> bool {
-                let val = (self.0 >> 18usize) & 0x01;
+            #[doc = "IDLE line detected"]
+            pub const fn idle(&self) -> bool {
+                let val = (self.0 >> 4usize) & 0x01;
                 val != 0
             }
-            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB8"]
-            pub fn set_i2c_pb8_fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 18usize)) | (((val as u32) & 0x01) << 18usize);
+            #[doc = "IDLE line detected"]
+            pub fn set_idle(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
             }
-            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB9"]
-            pub const fn i2c_pb9_fmp(&self) -> bool {
-                let val = (self.0 >> 19usize) & 0x01;
+            #[doc = "Read data register not empty"]
+            pub const fn rxne(&self) -> bool {
+                let val = (self.0 >> 5usize) & 0x01;
                 val != 0
             }
-            #[doc = "Fast-mode Plus (Fm+) driving capability activation on PB9"]
-            pub fn set_i2c_pb9_fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 19usize)) | (((val as u32) & 0x01) << 19usize);
+            #[doc = "Read data register not empty"]
+            pub fn set_rxne(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
             }
-            #[doc = "I2C1 Fast-mode Plus driving capability activation"]
-            pub const fn i2c1_fmp(&self) -> bool {
-                let val = (self.0 >> 20usize) & 0x01;
+            #[doc = "Transmission complete"]
+            pub const fn tc(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
                 val != 0
             }
-            #[doc = "I2C1 Fast-mode Plus driving capability activation"]
-            pub fn set_i2c1_fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 20usize)) | (((val as u32) & 0x01) << 20usize);
+            #[doc = "Transmission complete"]
+            pub fn set_tc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
-            #[doc = "I2C2 Fast-mode Plus driving capability activation"]
-            pub const fn i2c2_fmp(&self) -> bool {
-                let val = (self.0 >> 21usize) & 0x01;
+            #[doc = "Transmit data register empty"]
+            pub const fn txe(&self) -> bool {
+                let val = (self.0 >> 7usize) & 0x01;
                 val != 0
             }
-            #[doc = "I2C2 Fast-mode Plus driving capability activation"]
-            pub fn set_i2c2_fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 21usize)) | (((val as u32) & 0x01) << 21usize);
+            #[doc = "Transmit data register empty"]
+            pub fn set_txe(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
             }
-            #[doc = "I2C3 Fast-mode Plus driving capability activation"]
-            pub const fn i2c3_fmp(&self) -> bool {
-                let val = (self.0 >> 22usize) & 0x01;
+            #[doc = "LIN break detection flag"]
+            pub const fn lbd(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
                 val != 0
             }
-            #[doc = "I2C3 Fast-mode Plus driving capability activation"]
-            pub fn set_i2c3_fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 22usize)) | (((val as u32) & 0x01) << 22usize);
+            #[doc = "LIN break detection flag"]
+            pub fn set_lbd(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
-            #[doc = "Floating Point Unit interrupts enable bits"]
-            pub const fn fpu_ie(&self) -> u8 {
-                let val = (self.0 >> 26usize) & 0x3f;
-                val as u8
+            #[doc = "CTS flag"]
+            pub const fn cts(&self) -> bool {
+                let val = (self.0 >> 9usize) & 0x01;
+                val != 0
             }
-            #[doc = "Floating Point Unit interrupts enable bits"]
-            pub fn set_fpu_ie(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x3f << 26usize)) | (((val as u32) & 0x3f) << 26usize);
+            #[doc = "CTS flag"]
+            pub fn set_cts(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
             }
         }
-        impl Default for Cfgr1 {
-            fn default() -> Cfgr1 {
-                Cfgr1(0)
+        impl Default for SrUsart {
+            fn default() -> SrUsart {
+                SrUsart(0)
             }
         }
-        #[doc = "SWPR"]
+        #[doc = "Control register 2"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Swpr(pub u32);
-        impl Swpr {
-            #[doc = "SRAWM2 write protection."]
-            pub fn pwp(&self, n: usize) -> bool {
-                assert!(n < 32usize);
-                let offs = 0usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
+        pub struct Cr2(pub u32);
+        impl Cr2 {
+            #[doc = "Address of the USART node"]
+            pub const fn add(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x0f;
+                val as u8
+            }
+            #[doc = "Address of the USART node"]
+            pub fn set_add(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
+            }
+            #[doc = "lin break detection length"]
+            pub const fn lbdl(&self) -> super::vals::Lbdl {
+                let val = (self.0 >> 5usize) & 0x01;
+                super::vals::Lbdl(val as u8)
+            }
+            #[doc = "lin break detection length"]
+            pub fn set_lbdl(&mut self, val: super::vals::Lbdl) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val.0 as u32) & 0x01) << 5usize);
+            }
+            #[doc = "LIN break detection interrupt enable"]
+            pub const fn lbdie(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
                 val != 0
             }
-            #[doc = "SRAWM2 write protection."]
-            pub fn set_pwp(&mut self, n: usize, val: bool) {
-                assert!(n < 32usize);
-                let offs = 0usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "LIN break detection interrupt enable"]
+            pub fn set_lbdie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
-        }
-        impl Default for Swpr {
-            fn default() -> Swpr {
-                Swpr(0)
+            #[doc = "STOP bits"]
+            pub const fn stop(&self) -> super::vals::Stop {
+                let val = (self.0 >> 12usize) & 0x03;
+                super::vals::Stop(val as u8)
             }
-        }
-    }
-}
-pub mod generic {
-    use core::marker::PhantomData;
-    #[derive(Copy, Clone)]
-    pub struct RW;
-    #[derive(Copy, Clone)]
-    pub struct R;
-    #[derive(Copy, Clone)]
-    pub struct W;
-    mod sealed {
-        use super::*;
-        pub trait Access {}
-        impl Access for R {}
-        impl Access for W {}
-        impl Access for RW {}
-    }
-    pub trait Access: sealed::Access + Copy {}
-    impl Access for R {}
-    impl Access for W {}
-    impl Access for RW {}
-    pub trait Read: Access {}
-    impl Read for RW {}
-    impl Read for R {}
-    pub trait Write: Access {}
-    impl Write for RW {}
-    impl Write for W {}
-    #[derive(Copy, Clone)]
-    pub struct Reg<T: Copy, A: Access> {
-        ptr: *mut u8,
-        phantom: PhantomData<*mut (T, A)>,
-    }
-    unsafe impl<T: Copy, A: Access> Send for Reg<T, A> {}
-    unsafe impl<T: Copy, A: Access> Sync for Reg<T, A> {}
-    impl<T: Copy, A: Access> Reg<T, A> {
-        pub fn from_ptr(ptr: *mut u8) -> Self {
-            Self {
-                ptr,
-                phantom: PhantomData,
+            #[doc = "STOP bits"]
+            pub fn set_stop(&mut self, val: super::vals::Stop) {
+                self.0 = (self.0 & !(0x03 << 12usize)) | (((val.0 as u32) & 0x03) << 12usize);
+            }
+            #[doc = "LIN mode enable"]
+            pub const fn linen(&self) -> bool {
+                let val = (self.0 >> 14usize) & 0x01;
+                val != 0
+            }
+            #[doc = "LIN mode enable"]
+            pub fn set_linen(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 14usize)) | (((val as u32) & 0x01) << 14usize);
             }
         }
-        pub fn ptr(&self) -> *mut T {
-            self.ptr as _
-        }
-    }
-    impl<T: Copy, A: Read> Reg<T, A> {
-        pub unsafe fn read(&self) -> T {
-            (self.ptr as *mut T).read_volatile()
-        }
-    }
-    impl<T: Copy, A: Write> Reg<T, A> {
-        pub unsafe fn write_value(&self, val: T) {
-            (self.ptr as *mut T).write_volatile(val)
+        impl Default for Cr2 {
+            fn default() -> Cr2 {
+                Cr2(0)
+            }
         }
-    }
-    impl<T: Default + Copy, A: Write> Reg<T, A> {
-        pub unsafe fn write<R>(&self, f: impl FnOnce(&mut T) -> R) -> R {
-            let mut val = Default::default();
-            let res = f(&mut val);
-            self.write_value(val);
-            res
+        #[doc = "Control register 2"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Cr2Usart(pub u32);
+        impl Cr2Usart {
+            #[doc = "Address of the USART node"]
+            pub const fn add(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x0f;
+                val as u8
+            }
+            #[doc = "Address of the USART node"]
+            pub fn set_add(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
+            }
+            #[doc = "lin break detection length"]
+            pub const fn lbdl(&self) -> super::vals::Lbdl {
+                let val = (self.0 >> 5usize) & 0x01;
+                super::vals::Lbdl(val as u8)
+            }
+            #[doc = "lin break detection length"]
+            pub fn set_lbdl(&mut self, val: super::vals::Lbdl) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val.0 as u32) & 0x01) << 5usize);
+            }
+            #[doc = "LIN break detection interrupt enable"]
+            pub const fn lbdie(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
+                val != 0
+            }
+            #[doc = "LIN break detection interrupt enable"]
+            pub fn set_lbdie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            }
+            #[doc = "Last bit clock pulse"]
+            pub const fn lbcl(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Last bit clock pulse"]
+            pub fn set_lbcl(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            }
+            #[doc = "Clock phase"]
+            pub const fn cpha(&self) -> super::vals::Cpha {
+                let val = (self.0 >> 9usize) & 0x01;
+                super::vals::Cpha(val as u8)
+            }
+            #[doc = "Clock phase"]
+            pub fn set_cpha(&mut self, val: super::vals::Cpha) {
+                self.0 = (self.0 & !(0x01 << 9usize)) | (((val.0 as u32) & 0x01) << 9usize);
+            }
+            #[doc = "Clock polarity"]
+            pub const fn cpol(&self) -> super::vals::Cpol {
+                let val = (self.0 >> 10usize) & 0x01;
+                super::vals::Cpol(val as u8)
+            }
+            #[doc = "Clock polarity"]
+            pub fn set_cpol(&mut self, val: super::vals::Cpol) {
+                self.0 = (self.0 & !(0x01 << 10usize)) | (((val.0 as u32) & 0x01) << 10usize);
+            }
+            #[doc = "Clock enable"]
+            pub const fn clken(&self) -> bool {
+                let val = (self.0 >> 11usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Clock enable"]
+            pub fn set_clken(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 11usize)) | (((val as u32) & 0x01) << 11usize);
+            }
+            #[doc = "STOP bits"]
+            pub const fn stop(&self) -> super::vals::Stop {
+                let val = (self.0 >> 12usize) & 0x03;
+                super::vals::Stop(val as u8)
+            }
+            #[doc = "STOP bits"]
+            pub fn set_stop(&mut self, val: super::vals::Stop) {
+                self.0 = (self.0 & !(0x03 << 12usize)) | (((val.0 as u32) & 0x03) << 12usize);
+            }
+            #[doc = "LIN mode enable"]
+            pub const fn linen(&self) -> bool {
+                let val = (self.0 >> 14usize) & 0x01;
+                val != 0
+            }
+            #[doc = "LIN mode enable"]
+            pub fn set_linen(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 14usize)) | (((val as u32) & 0x01) << 14usize);
+            }
         }
-    }
-    impl<T: Copy, A: Read + Write> Reg<T, A> {
-        pub unsafe fn modify<R>(&self, f: impl FnOnce(&mut T) -> R) -> R {
-            let mut val = self.read();
-            let res = f(&mut val);
-            self.write_value(val);
-            res
+        impl Default for Cr2Usart {
+            fn default() -> Cr2Usart {
+                Cr2Usart(0)
+            }
         }
     }
 }
@@ -4308,313 +4419,6 @@ pub mod sdmmc_v2 {
     }
     pub mod regs {
         use crate::generic::*;
-        #[doc = "The receive and transmit FIFOs can be read or written as 32-bit wide registers. The FIFOs contain 32 entries on 32 sequential addresses. This allows the CPU to use its load and store multiple operands to read from/write to the FIFO."]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Idmactrlr(pub u32);
-        impl Idmactrlr {
-            #[doc = "IDMA enable This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub const fn idmaen(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
-                val != 0
-            }
-            #[doc = "IDMA enable This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub fn set_idmaen(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
-            }
-            #[doc = "Buffer mode selection. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub const fn idmabmode(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Buffer mode selection. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub fn set_idmabmode(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
-            }
-            #[doc = "Double buffer mode active buffer indication This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). When IDMA is enabled this bit is toggled by hardware."]
-            pub const fn idmabact(&self) -> bool {
-                let val = (self.0 >> 2usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Double buffer mode active buffer indication This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). When IDMA is enabled this bit is toggled by hardware."]
-            pub fn set_idmabact(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
-            }
-        }
-        impl Default for Idmactrlr {
-            fn default() -> Idmactrlr {
-                Idmactrlr(0)
-            }
-        }
-        #[doc = "The SDMMC_DLENR register contains the number of data bytes to be transferred. The value is loaded into the data counter when data transfer starts."]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Dlenr(pub u32);
-        impl Dlenr {
-            #[doc = "Data length value This register can only be written by firmware when DPSM is inactive (DPSMACT = 0). Number of data bytes to be transferred. When DDR = 1 DATALENGTH is truncated to a multiple of 2. (The last odd byte is not transfered) When DATALENGTH = 0 no data will be transfered, when requested by a CPSMEN and CMDTRANS = 1 also no command will be transfered. DTEN and CPSMEN are cleared to 0."]
-            pub const fn datalength(&self) -> u32 {
-                let val = (self.0 >> 0usize) & 0x01ff_ffff;
-                val as u32
-            }
-            #[doc = "Data length value This register can only be written by firmware when DPSM is inactive (DPSMACT = 0). Number of data bytes to be transferred. When DDR = 1 DATALENGTH is truncated to a multiple of 2. (The last odd byte is not transfered) When DATALENGTH = 0 no data will be transfered, when requested by a CPSMEN and CMDTRANS = 1 also no command will be transfered. DTEN and CPSMEN are cleared to 0."]
-            pub fn set_datalength(&mut self, val: u32) {
-                self.0 =
-                    (self.0 & !(0x01ff_ffff << 0usize)) | (((val as u32) & 0x01ff_ffff) << 0usize);
-            }
-        }
-        impl Default for Dlenr {
-            fn default() -> Dlenr {
-                Dlenr(0)
-            }
-        }
-        #[doc = "The SDMMC_CLKCR register controls the SDMMC_CK output clock, the SDMMC_RX_CLK receive clock, and the bus width."]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Clkcr(pub u32);
-        impl Clkcr {
-            #[doc = "Clock divide factor This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0). This field defines the divide factor between the input clock (SDMMCCLK) and the output clock (SDMMC_CK): SDMMC_CK frequency = SDMMCCLK / [2 * CLKDIV]. 0xx: etc.. xxx: etc.."]
-            pub const fn clkdiv(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0x03ff;
-                val as u16
-            }
-            #[doc = "Clock divide factor This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0). This field defines the divide factor between the input clock (SDMMCCLK) and the output clock (SDMMC_CK): SDMMC_CK frequency = SDMMCCLK / [2 * CLKDIV]. 0xx: etc.. xxx: etc.."]
-            pub fn set_clkdiv(&mut self, val: u16) {
-                self.0 = (self.0 & !(0x03ff << 0usize)) | (((val as u32) & 0x03ff) << 0usize);
-            }
-            #[doc = "Power saving configuration bit This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0) For power saving, the SDMMC_CK clock output can be disabled when the bus is idle by setting PWRSAV:"]
-            pub const fn pwrsav(&self) -> bool {
-                let val = (self.0 >> 12usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Power saving configuration bit This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0) For power saving, the SDMMC_CK clock output can be disabled when the bus is idle by setting PWRSAV:"]
-            pub fn set_pwrsav(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 12usize)) | (((val as u32) & 0x01) << 12usize);
-            }
-            #[doc = "Wide bus mode enable bit This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0)"]
-            pub const fn widbus(&self) -> u8 {
-                let val = (self.0 >> 14usize) & 0x03;
-                val as u8
-            }
-            #[doc = "Wide bus mode enable bit This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0)"]
-            pub fn set_widbus(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x03 << 14usize)) | (((val as u32) & 0x03) << 14usize);
-            }
-            #[doc = "SDMMC_CK dephasing selection bit for data and Command. This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0). When clock division = 1 (CLKDIV = 0), this bit has no effect. Data and Command change on SDMMC_CK falling edge. When clock division &gt;1 (CLKDIV &gt; 0) &amp; DDR = 0: - SDMMC_CK edge occurs on SDMMCCLK rising edge. When clock division >1 (CLKDIV > 0) & DDR = 1: - Data changed on the SDMMCCLK falling edge succeeding a SDMMC_CK edge. - SDMMC_CK edge occurs on SDMMCCLK rising edge. - Data changed on the SDMMC_CK falling edge succeeding a SDMMC_CK edge. - SDMMC_CK edge occurs on SDMMCCLK rising edge."]
-            pub const fn negedge(&self) -> bool {
-                let val = (self.0 >> 16usize) & 0x01;
-                val != 0
-            }
-            #[doc = "SDMMC_CK dephasing selection bit for data and Command. This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0). When clock division = 1 (CLKDIV = 0), this bit has no effect. Data and Command change on SDMMC_CK falling edge. When clock division &gt;1 (CLKDIV &gt; 0) &amp; DDR = 0: - SDMMC_CK edge occurs on SDMMCCLK rising edge. When clock division >1 (CLKDIV > 0) & DDR = 1: - Data changed on the SDMMCCLK falling edge succeeding a SDMMC_CK edge. - SDMMC_CK edge occurs on SDMMCCLK rising edge. - Data changed on the SDMMC_CK falling edge succeeding a SDMMC_CK edge. - SDMMC_CK edge occurs on SDMMCCLK rising edge."]
-            pub fn set_negedge(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
-            }
-            #[doc = "Hardware flow control enable This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0) When Hardware flow control is enabled, the meaning of the TXFIFOE and RXFIFOF flags change, please see SDMMC status register definition in Section56.8.11."]
-            pub const fn hwfc_en(&self) -> bool {
-                let val = (self.0 >> 17usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Hardware flow control enable This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0) When Hardware flow control is enabled, the meaning of the TXFIFOE and RXFIFOF flags change, please see SDMMC status register definition in Section56.8.11."]
-            pub fn set_hwfc_en(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 17usize)) | (((val as u32) & 0x01) << 17usize);
-            }
-            #[doc = "Data rate signaling selection This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0) DDR rate shall only be selected with 4-bit or 8-bit wide bus mode. (WIDBUS &gt; 00). DDR = 1 has no effect when WIDBUS = 00 (1-bit wide bus). DDR rate shall only be selected with clock division &gt;1. (CLKDIV &gt; 0)"]
-            pub const fn ddr(&self) -> bool {
-                let val = (self.0 >> 18usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Data rate signaling selection This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0) DDR rate shall only be selected with 4-bit or 8-bit wide bus mode. (WIDBUS &gt; 00). DDR = 1 has no effect when WIDBUS = 00 (1-bit wide bus). DDR rate shall only be selected with clock division &gt;1. (CLKDIV &gt; 0)"]
-            pub fn set_ddr(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 18usize)) | (((val as u32) & 0x01) << 18usize);
-            }
-            #[doc = "Bus speed mode selection between DS, HS, SDR12, SDR25 and SDR50, DDR50, SDR104. This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0)"]
-            pub const fn busspeed(&self) -> bool {
-                let val = (self.0 >> 19usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Bus speed mode selection between DS, HS, SDR12, SDR25 and SDR50, DDR50, SDR104. This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0)"]
-            pub fn set_busspeed(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 19usize)) | (((val as u32) & 0x01) << 19usize);
-            }
-            #[doc = "Receive clock selection. These bits can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0)"]
-            pub const fn selclkrx(&self) -> u8 {
-                let val = (self.0 >> 20usize) & 0x03;
-                val as u8
-            }
-            #[doc = "Receive clock selection. These bits can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0)"]
-            pub fn set_selclkrx(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x03 << 20usize)) | (((val as u32) & 0x03) << 20usize);
-            }
-        }
-        impl Default for Clkcr {
-            fn default() -> Clkcr {
-                Clkcr(0)
-            }
-        }
-        #[doc = "The SDMMC_IDMABASE0R register contains the memory buffer base address in single buffer configuration and the buffer 0 base address in double buffer configuration."]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Idmabase0r(pub u32);
-        impl Idmabase0r {
-            #[doc = "Buffer 0 memory base address bits [31:2], shall be word aligned (bit [1:0]
-are always 0 and read only). This register can be written by firmware when DPSM is inactive (DPSMACT = 0), and can dynamically be written by firmware when DPSM active (DPSMACT = 1) and memory buffer 0 is inactive (IDMABACT = 1)."]
-            pub const fn idmabase0(&self) -> u32 {
-                let val = (self.0 >> 0usize) & 0xffff_ffff;
-                val as u32
-            }
-            #[doc = "Buffer 0 memory base address bits [31:2], shall be word aligned (bit [1:0]
-are always 0 and read only). This register can be written by firmware when DPSM is inactive (DPSMACT = 0), and can dynamically be written by firmware when DPSM active (DPSMACT = 1) and memory buffer 0 is inactive (IDMABACT = 1)."]
-            pub fn set_idmabase0(&mut self, val: u32) {
-                self.0 =
-                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
-            }
-        }
-        impl Default for Idmabase0r {
-            fn default() -> Idmabase0r {
-                Idmabase0r(0)
-            }
-        }
-        #[doc = "The SDMMC_RESP1/2/3/4R registers contain the status of a card, which is part of the received response."]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Resp2r(pub u32);
-        impl Resp2r {
-            #[doc = "see Table404."]
-            pub const fn cardstatus2(&self) -> u32 {
-                let val = (self.0 >> 0usize) & 0xffff_ffff;
-                val as u32
-            }
-            #[doc = "see Table404."]
-            pub fn set_cardstatus2(&mut self, val: u32) {
-                self.0 =
-                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
-            }
-        }
-        impl Default for Resp2r {
-            fn default() -> Resp2r {
-                Resp2r(0)
-            }
-        }
-        #[doc = "The SDMMC_IDMABSIZER register contains the buffers size when in double buffer configuration."]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Idmabsizer(pub u32);
-        impl Idmabsizer {
-            #[doc = "Number of transfers per buffer. This 8-bit value shall be multiplied by 8 to get the size of the buffer in 32-bit words and by 32 to get the size of the buffer in bytes. Example: IDMABNDT = 0x01: buffer size = 8 words = 32 bytes. These bits can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub const fn idmabndt(&self) -> u8 {
-                let val = (self.0 >> 5usize) & 0xff;
-                val as u8
-            }
-            #[doc = "Number of transfers per buffer. This 8-bit value shall be multiplied by 8 to get the size of the buffer in 32-bit words and by 32 to get the size of the buffer in bytes. Example: IDMABNDT = 0x01: buffer size = 8 words = 32 bytes. These bits can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub fn set_idmabndt(&mut self, val: u8) {
-                self.0 = (self.0 & !(0xff << 5usize)) | (((val as u32) & 0xff) << 5usize);
-            }
-        }
-        impl Default for Idmabsizer {
-            fn default() -> Idmabsizer {
-                Idmabsizer(0)
-            }
-        }
-        #[doc = "The SDMMC_DCTRL register control the data path state machine (DPSM)."]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Dctrl(pub u32);
-        impl Dctrl {
-            #[doc = "Data transfer enable bit This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). This bit is cleared by Hardware when data transfer completes. This bit shall only be used to transfer data when no associated data transfer command is used, i.e. shall not be used with SD or eMMC cards."]
-            pub const fn dten(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Data transfer enable bit This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). This bit is cleared by Hardware when data transfer completes. This bit shall only be used to transfer data when no associated data transfer command is used, i.e. shall not be used with SD or eMMC cards."]
-            pub fn set_dten(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
-            }
-            #[doc = "Data transfer direction selection This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub const fn dtdir(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Data transfer direction selection This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub fn set_dtdir(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
-            }
-            #[doc = "Data transfer mode selection. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub const fn dtmode(&self) -> u8 {
-                let val = (self.0 >> 2usize) & 0x03;
-                val as u8
-            }
-            #[doc = "Data transfer mode selection. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub fn set_dtmode(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x03 << 2usize)) | (((val as u32) & 0x03) << 2usize);
-            }
-            #[doc = "Data block size This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). Define the data block length when the block data transfer mode is selected: When DATALENGTH is not a multiple of DBLOCKSIZE, the transfered data is truncated at a multiple of DBLOCKSIZE. (Any remain data will not be transfered.) When DDR = 1, DBLOCKSIZE = 0000 shall not be used. (No data will be transfered)"]
-            pub const fn dblocksize(&self) -> u8 {
-                let val = (self.0 >> 4usize) & 0x0f;
-                val as u8
-            }
-            #[doc = "Data block size This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). Define the data block length when the block data transfer mode is selected: When DATALENGTH is not a multiple of DBLOCKSIZE, the transfered data is truncated at a multiple of DBLOCKSIZE. (Any remain data will not be transfered.) When DDR = 1, DBLOCKSIZE = 0000 shall not be used. (No data will be transfered)"]
-            pub fn set_dblocksize(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x0f << 4usize)) | (((val as u32) & 0x0f) << 4usize);
-            }
-            #[doc = "Read wait start. If this bit is set, read wait operation starts."]
-            pub const fn rwstart(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Read wait start. If this bit is set, read wait operation starts."]
-            pub fn set_rwstart(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
-            }
-            #[doc = "Read wait stop This bit is written by firmware and auto cleared by hardware when the DPSM moves from the READ_WAIT state to the WAIT_R or IDLE state."]
-            pub const fn rwstop(&self) -> bool {
-                let val = (self.0 >> 9usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Read wait stop This bit is written by firmware and auto cleared by hardware when the DPSM moves from the READ_WAIT state to the WAIT_R or IDLE state."]
-            pub fn set_rwstop(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
-            }
-            #[doc = "Read wait mode. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub const fn rwmod(&self) -> bool {
-                let val = (self.0 >> 10usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Read wait mode. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub fn set_rwmod(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 10usize)) | (((val as u32) & 0x01) << 10usize);
-            }
-            #[doc = "SD I/O interrupt enable functions This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). If this bit is set, the DPSM enables the SD I/O card specific interrupt operation."]
-            pub const fn sdioen(&self) -> bool {
-                let val = (self.0 >> 11usize) & 0x01;
-                val != 0
-            }
-            #[doc = "SD I/O interrupt enable functions This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). If this bit is set, the DPSM enables the SD I/O card specific interrupt operation."]
-            pub fn set_sdioen(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 11usize)) | (((val as u32) & 0x01) << 11usize);
-            }
-            #[doc = "Enable the reception of the boot acknowledgment. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub const fn bootacken(&self) -> bool {
-                let val = (self.0 >> 12usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Enable the reception of the boot acknowledgment. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
-            pub fn set_bootacken(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 12usize)) | (((val as u32) & 0x01) << 12usize);
-            }
-            #[doc = "FIFO reset, will flush any remaining data. This bit can only be written by firmware when IDMAEN= 0 and DPSM is active (DPSMACT = 1). This bit will only take effect when a transfer error or transfer hold occurs."]
-            pub const fn fiforst(&self) -> bool {
-                let val = (self.0 >> 13usize) & 0x01;
-                val != 0
-            }
-            #[doc = "FIFO reset, will flush any remaining data. This bit can only be written by firmware when IDMAEN= 0 and DPSM is active (DPSMACT = 1). This bit will only take effect when a transfer error or transfer hold occurs."]
-            pub fn set_fiforst(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 13usize)) | (((val as u32) & 0x01) << 13usize);
-            }
-        }
-        impl Default for Dctrl {
-            fn default() -> Dctrl {
-                Dctrl(0)
-            }
-        }
         #[doc = "The SDMMC_CMDR register contains the command index and command type bits. The command index is sent to a card as part of a command message. The command type bits control the command path state machine (CPSM)."]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
@@ -4725,309 +4529,6 @@ are always 0 and read only). This register can be written by firmware when DPSM
                 Cmdr(0)
             }
         }
-        #[doc = "The SDMMC_RESP1/2/3/4R registers contain the status of a card, which is part of the received response."]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Resp4r(pub u32);
-        impl Resp4r {
-            #[doc = "see Table404."]
-            pub const fn cardstatus4(&self) -> u32 {
-                let val = (self.0 >> 0usize) & 0xffff_ffff;
-                val as u32
-            }
-            #[doc = "see Table404."]
-            pub fn set_cardstatus4(&mut self, val: u32) {
-                self.0 =
-                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
-            }
-        }
-        impl Default for Resp4r {
-            fn default() -> Resp4r {
-                Resp4r(0)
-            }
-        }
-        #[doc = "The SDMMC_ICR register is a write-only register. Writing a bit with 1 clears the corresponding bit in the SDMMC_STAR status register."]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Icr(pub u32);
-        impl Icr {
-            #[doc = "CCRCFAIL flag clear bit Set by software to clear the CCRCFAIL flag."]
-            pub const fn ccrcfailc(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
-                val != 0
-            }
-            #[doc = "CCRCFAIL flag clear bit Set by software to clear the CCRCFAIL flag."]
-            pub fn set_ccrcfailc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
-            }
-            #[doc = "DCRCFAIL flag clear bit Set by software to clear the DCRCFAIL flag."]
-            pub const fn dcrcfailc(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
-                val != 0
-            }
-            #[doc = "DCRCFAIL flag clear bit Set by software to clear the DCRCFAIL flag."]
-            pub fn set_dcrcfailc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
-            }
-            #[doc = "CTIMEOUT flag clear bit Set by software to clear the CTIMEOUT flag."]
-            pub const fn ctimeoutc(&self) -> bool {
-                let val = (self.0 >> 2usize) & 0x01;
-                val != 0
-            }
-            #[doc = "CTIMEOUT flag clear bit Set by software to clear the CTIMEOUT flag."]
-            pub fn set_ctimeoutc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
-            }
-            #[doc = "DTIMEOUT flag clear bit Set by software to clear the DTIMEOUT flag."]
-            pub const fn dtimeoutc(&self) -> bool {
-                let val = (self.0 >> 3usize) & 0x01;
-                val != 0
-            }
-            #[doc = "DTIMEOUT flag clear bit Set by software to clear the DTIMEOUT flag."]
-            pub fn set_dtimeoutc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
-            }
-            #[doc = "TXUNDERR flag clear bit Set by software to clear TXUNDERR flag."]
-            pub const fn txunderrc(&self) -> bool {
-                let val = (self.0 >> 4usize) & 0x01;
-                val != 0
-            }
-            #[doc = "TXUNDERR flag clear bit Set by software to clear TXUNDERR flag."]
-            pub fn set_txunderrc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
-            }
-            #[doc = "RXOVERR flag clear bit Set by software to clear the RXOVERR flag."]
-            pub const fn rxoverrc(&self) -> bool {
-                let val = (self.0 >> 5usize) & 0x01;
-                val != 0
-            }
-            #[doc = "RXOVERR flag clear bit Set by software to clear the RXOVERR flag."]
-            pub fn set_rxoverrc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
-            }
-            #[doc = "CMDREND flag clear bit Set by software to clear the CMDREND flag."]
-            pub const fn cmdrendc(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
-                val != 0
-            }
-            #[doc = "CMDREND flag clear bit Set by software to clear the CMDREND flag."]
-            pub fn set_cmdrendc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
-            }
-            #[doc = "CMDSENT flag clear bit Set by software to clear the CMDSENT flag."]
-            pub const fn cmdsentc(&self) -> bool {
-                let val = (self.0 >> 7usize) & 0x01;
-                val != 0
-            }
-            #[doc = "CMDSENT flag clear bit Set by software to clear the CMDSENT flag."]
-            pub fn set_cmdsentc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
-            }
-            #[doc = "DATAEND flag clear bit Set by software to clear the DATAEND flag."]
-            pub const fn dataendc(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
-                val != 0
-            }
-            #[doc = "DATAEND flag clear bit Set by software to clear the DATAEND flag."]
-            pub fn set_dataendc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
-            }
-            #[doc = "DHOLD flag clear bit Set by software to clear the DHOLD flag."]
-            pub const fn dholdc(&self) -> bool {
-                let val = (self.0 >> 9usize) & 0x01;
-                val != 0
-            }
-            #[doc = "DHOLD flag clear bit Set by software to clear the DHOLD flag."]
-            pub fn set_dholdc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
-            }
-            #[doc = "DBCKEND flag clear bit Set by software to clear the DBCKEND flag."]
-            pub const fn dbckendc(&self) -> bool {
-                let val = (self.0 >> 10usize) & 0x01;
-                val != 0
-            }
-            #[doc = "DBCKEND flag clear bit Set by software to clear the DBCKEND flag."]
-            pub fn set_dbckendc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 10usize)) | (((val as u32) & 0x01) << 10usize);
-            }
-            #[doc = "DABORT flag clear bit Set by software to clear the DABORT flag."]
-            pub const fn dabortc(&self) -> bool {
-                let val = (self.0 >> 11usize) & 0x01;
-                val != 0
-            }
-            #[doc = "DABORT flag clear bit Set by software to clear the DABORT flag."]
-            pub fn set_dabortc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 11usize)) | (((val as u32) & 0x01) << 11usize);
-            }
-            #[doc = "BUSYD0END flag clear bit Set by software to clear the BUSYD0END flag."]
-            pub const fn busyd0endc(&self) -> bool {
-                let val = (self.0 >> 21usize) & 0x01;
-                val != 0
-            }
-            #[doc = "BUSYD0END flag clear bit Set by software to clear the BUSYD0END flag."]
-            pub fn set_busyd0endc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 21usize)) | (((val as u32) & 0x01) << 21usize);
-            }
-            #[doc = "SDIOIT flag clear bit Set by software to clear the SDIOIT flag."]
-            pub const fn sdioitc(&self) -> bool {
-                let val = (self.0 >> 22usize) & 0x01;
-                val != 0
-            }
-            #[doc = "SDIOIT flag clear bit Set by software to clear the SDIOIT flag."]
-            pub fn set_sdioitc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 22usize)) | (((val as u32) & 0x01) << 22usize);
-            }
-            #[doc = "ACKFAIL flag clear bit Set by software to clear the ACKFAIL flag."]
-            pub const fn ackfailc(&self) -> bool {
-                let val = (self.0 >> 23usize) & 0x01;
-                val != 0
-            }
-            #[doc = "ACKFAIL flag clear bit Set by software to clear the ACKFAIL flag."]
-            pub fn set_ackfailc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 23usize)) | (((val as u32) & 0x01) << 23usize);
-            }
-            #[doc = "ACKTIMEOUT flag clear bit Set by software to clear the ACKTIMEOUT flag."]
-            pub const fn acktimeoutc(&self) -> bool {
-                let val = (self.0 >> 24usize) & 0x01;
-                val != 0
-            }
-            #[doc = "ACKTIMEOUT flag clear bit Set by software to clear the ACKTIMEOUT flag."]
-            pub fn set_acktimeoutc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 24usize)) | (((val as u32) & 0x01) << 24usize);
-            }
-            #[doc = "VSWEND flag clear bit Set by software to clear the VSWEND flag."]
-            pub const fn vswendc(&self) -> bool {
-                let val = (self.0 >> 25usize) & 0x01;
-                val != 0
-            }
-            #[doc = "VSWEND flag clear bit Set by software to clear the VSWEND flag."]
-            pub fn set_vswendc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 25usize)) | (((val as u32) & 0x01) << 25usize);
-            }
-            #[doc = "CKSTOP flag clear bit Set by software to clear the CKSTOP flag."]
-            pub const fn ckstopc(&self) -> bool {
-                let val = (self.0 >> 26usize) & 0x01;
-                val != 0
-            }
-            #[doc = "CKSTOP flag clear bit Set by software to clear the CKSTOP flag."]
-            pub fn set_ckstopc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 26usize)) | (((val as u32) & 0x01) << 26usize);
-            }
-            #[doc = "IDMA transfer error clear bit Set by software to clear the IDMATE flag."]
-            pub const fn idmatec(&self) -> bool {
-                let val = (self.0 >> 27usize) & 0x01;
-                val != 0
-            }
-            #[doc = "IDMA transfer error clear bit Set by software to clear the IDMATE flag."]
-            pub fn set_idmatec(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 27usize)) | (((val as u32) & 0x01) << 27usize);
-            }
-            #[doc = "IDMA buffer transfer complete clear bit Set by software to clear the IDMABTC flag."]
-            pub const fn idmabtcc(&self) -> bool {
-                let val = (self.0 >> 28usize) & 0x01;
-                val != 0
-            }
-            #[doc = "IDMA buffer transfer complete clear bit Set by software to clear the IDMABTC flag."]
-            pub fn set_idmabtcc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 28usize)) | (((val as u32) & 0x01) << 28usize);
-            }
-        }
-        impl Default for Icr {
-            fn default() -> Icr {
-                Icr(0)
-            }
-        }
-        #[doc = "The SDMMC_DTIMER register contains the data timeout period, in card bus clock periods. A counter loads the value from the SDMMC_DTIMER register, and starts decrementing when the data path state machine (DPSM) enters the Wait_R or Busy state. If the timer reaches 0 while the DPSM is in either of these states, the timeout status flag is set."]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Dtimer(pub u32);
-        impl Dtimer {
-            #[doc = "Data and R1b busy timeout period This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0). Data and R1b busy timeout period expressed in card bus clock periods."]
-            pub const fn datatime(&self) -> u32 {
-                let val = (self.0 >> 0usize) & 0xffff_ffff;
-                val as u32
-            }
-            #[doc = "Data and R1b busy timeout period This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0). Data and R1b busy timeout period expressed in card bus clock periods."]
-            pub fn set_datatime(&mut self, val: u32) {
-                self.0 =
-                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
-            }
-        }
-        impl Default for Dtimer {
-            fn default() -> Dtimer {
-                Dtimer(0)
-            }
-        }
-        #[doc = "SDMMC IP version register"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ver(pub u32);
-        impl Ver {
-            #[doc = "IP minor revision number."]
-            pub const fn minrev(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x0f;
-                val as u8
-            }
-            #[doc = "IP minor revision number."]
-            pub fn set_minrev(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
-            }
-            #[doc = "IP major revision number."]
-            pub const fn majrev(&self) -> u8 {
-                let val = (self.0 >> 4usize) & 0x0f;
-                val as u8
-            }
-            #[doc = "IP major revision number."]
-            pub fn set_majrev(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x0f << 4usize)) | (((val as u32) & 0x0f) << 4usize);
-            }
-        }
-        impl Default for Ver {
-            fn default() -> Ver {
-                Ver(0)
-            }
-        }
-        #[doc = "SDMMC command response register"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Respcmdr(pub u32);
-        impl Respcmdr {
-            #[doc = "Response command index"]
-            pub const fn respcmd(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x3f;
-                val as u8
-            }
-            #[doc = "Response command index"]
-            pub fn set_respcmd(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x3f << 0usize)) | (((val as u32) & 0x3f) << 0usize);
-            }
-        }
-        impl Default for Respcmdr {
-            fn default() -> Respcmdr {
-                Respcmdr(0)
-            }
-        }
-        #[doc = "The SDMMC_RESP1/2/3/4R registers contain the status of a card, which is part of the received response."]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Resp1r(pub u32);
-        impl Resp1r {
-            #[doc = "see Table 432"]
-            pub const fn cardstatus1(&self) -> u32 {
-                let val = (self.0 >> 0usize) & 0xffff_ffff;
-                val as u32
-            }
-            #[doc = "see Table 432"]
-            pub fn set_cardstatus1(&mut self, val: u32) {
-                self.0 =
-                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
-            }
-        }
-        impl Default for Resp1r {
-            fn default() -> Resp1r {
-                Resp1r(0)
-            }
-        }
         #[doc = "The SDMMC_ACKTIMER register contains the acknowledgment timeout period, in SDMMC_CK bus clock periods. A counter loads the value from the SDMMC_ACKTIMER register, and starts decrementing when the data path state machine (DPSM) enters the Wait_Ack state. If the timer reaches 0 while the DPSM is in this states, the acknowledgment timeout status flag is set."]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
@@ -5321,50 +4822,6 @@ are always 0 and read only). This register can be written by firmware when DPSM
                 Star(0)
             }
         }
-        #[doc = "The receive and transmit FIFOs can be only read or written as word (32-bit) wide registers. The FIFOs contain 16 entries on sequential addresses. This allows the CPU to use its load and store multiple operands to read from/write to the FIFO.When accessing SDMMC_FIFOR with half word or byte access an AHB bus fault is generated."]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Fifor(pub u32);
-        impl Fifor {
-            #[doc = "Receive and transmit FIFO data This register can only be read or written by firmware when the DPSM is active (DPSMACT=1). The FIFO data occupies 16 entries of 32-bit words."]
-            pub const fn fifodata(&self) -> u32 {
-                let val = (self.0 >> 0usize) & 0xffff_ffff;
-                val as u32
-            }
-            #[doc = "Receive and transmit FIFO data This register can only be read or written by firmware when the DPSM is active (DPSMACT=1). The FIFO data occupies 16 entries of 32-bit words."]
-            pub fn set_fifodata(&mut self, val: u32) {
-                self.0 =
-                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
-            }
-        }
-        impl Default for Fifor {
-            fn default() -> Fifor {
-                Fifor(0)
-            }
-        }
-        #[doc = "The SDMMC_IDMABASE1R register contains the double buffer configuration second buffer memory base address."]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Idmabase1r(pub u32);
-        impl Idmabase1r {
-            #[doc = "Buffer 1 memory base address, shall be word aligned (bit [1:0]
-are always 0 and read only). This register can be written by firmware when DPSM is inactive (DPSMACT = 0), and can dynamically be written by firmware when DPSM active (DPSMACT = 1) and memory buffer 1 is inactive (IDMABACT = 0)."]
-            pub const fn idmabase1(&self) -> u32 {
-                let val = (self.0 >> 0usize) & 0xffff_ffff;
-                val as u32
-            }
-            #[doc = "Buffer 1 memory base address, shall be word aligned (bit [1:0]
-are always 0 and read only). This register can be written by firmware when DPSM is inactive (DPSMACT = 0), and can dynamically be written by firmware when DPSM active (DPSMACT = 1) and memory buffer 1 is inactive (IDMABACT = 0)."]
-            pub fn set_idmabase1(&mut self, val: u32) {
-                self.0 =
-                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
-            }
-        }
-        impl Default for Idmabase1r {
-            fn default() -> Idmabase1r {
-                Idmabase1r(0)
-            }
-        }
         #[doc = "The interrupt mask register determines which status flags generate an interrupt request by setting the corresponding bit to 1."]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
@@ -5630,67 +5087,442 @@ are always 0 and read only). This register can be written by firmware when DPSM
                 Power(0)
             }
         }
-        #[doc = "The SDMMC_DCNTR register loads the value from the data length register (see SDMMC_DLENR) when the DPSM moves from the Idle state to the Wait_R or Wait_S state. As data is transferred, the counter decrements the value until it reaches 0. The DPSM then moves to the Idle state and when there has been no error, the data status end flag (DATAEND) is set."]
+        #[doc = "The SDMMC_DLENR register contains the number of data bytes to be transferred. The value is loaded into the data counter when data transfer starts."]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Dcntr(pub u32);
-        impl Dcntr {
-            #[doc = "Data count value When read, the number of remaining data bytes to be transferred is returned. Write has no effect."]
-            pub const fn datacount(&self) -> u32 {
+        pub struct Dlenr(pub u32);
+        impl Dlenr {
+            #[doc = "Data length value This register can only be written by firmware when DPSM is inactive (DPSMACT = 0). Number of data bytes to be transferred. When DDR = 1 DATALENGTH is truncated to a multiple of 2. (The last odd byte is not transfered) When DATALENGTH = 0 no data will be transfered, when requested by a CPSMEN and CMDTRANS = 1 also no command will be transfered. DTEN and CPSMEN are cleared to 0."]
+            pub const fn datalength(&self) -> u32 {
                 let val = (self.0 >> 0usize) & 0x01ff_ffff;
                 val as u32
             }
-            #[doc = "Data count value When read, the number of remaining data bytes to be transferred is returned. Write has no effect."]
-            pub fn set_datacount(&mut self, val: u32) {
+            #[doc = "Data length value This register can only be written by firmware when DPSM is inactive (DPSMACT = 0). Number of data bytes to be transferred. When DDR = 1 DATALENGTH is truncated to a multiple of 2. (The last odd byte is not transfered) When DATALENGTH = 0 no data will be transfered, when requested by a CPSMEN and CMDTRANS = 1 also no command will be transfered. DTEN and CPSMEN are cleared to 0."]
+            pub fn set_datalength(&mut self, val: u32) {
                 self.0 =
                     (self.0 & !(0x01ff_ffff << 0usize)) | (((val as u32) & 0x01ff_ffff) << 0usize);
             }
         }
-        impl Default for Dcntr {
-            fn default() -> Dcntr {
-                Dcntr(0)
+        impl Default for Dlenr {
+            fn default() -> Dlenr {
+                Dlenr(0)
+            }
+        }
+        #[doc = "The SDMMC_ICR register is a write-only register. Writing a bit with 1 clears the corresponding bit in the SDMMC_STAR status register."]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Icr(pub u32);
+        impl Icr {
+            #[doc = "CCRCFAIL flag clear bit Set by software to clear the CCRCFAIL flag."]
+            pub const fn ccrcfailc(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
+                val != 0
+            }
+            #[doc = "CCRCFAIL flag clear bit Set by software to clear the CCRCFAIL flag."]
+            pub fn set_ccrcfailc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            }
+            #[doc = "DCRCFAIL flag clear bit Set by software to clear the DCRCFAIL flag."]
+            pub const fn dcrcfailc(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
+                val != 0
+            }
+            #[doc = "DCRCFAIL flag clear bit Set by software to clear the DCRCFAIL flag."]
+            pub fn set_dcrcfailc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
+            }
+            #[doc = "CTIMEOUT flag clear bit Set by software to clear the CTIMEOUT flag."]
+            pub const fn ctimeoutc(&self) -> bool {
+                let val = (self.0 >> 2usize) & 0x01;
+                val != 0
+            }
+            #[doc = "CTIMEOUT flag clear bit Set by software to clear the CTIMEOUT flag."]
+            pub fn set_ctimeoutc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
+            }
+            #[doc = "DTIMEOUT flag clear bit Set by software to clear the DTIMEOUT flag."]
+            pub const fn dtimeoutc(&self) -> bool {
+                let val = (self.0 >> 3usize) & 0x01;
+                val != 0
+            }
+            #[doc = "DTIMEOUT flag clear bit Set by software to clear the DTIMEOUT flag."]
+            pub fn set_dtimeoutc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
+            }
+            #[doc = "TXUNDERR flag clear bit Set by software to clear TXUNDERR flag."]
+            pub const fn txunderrc(&self) -> bool {
+                let val = (self.0 >> 4usize) & 0x01;
+                val != 0
+            }
+            #[doc = "TXUNDERR flag clear bit Set by software to clear TXUNDERR flag."]
+            pub fn set_txunderrc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
+            }
+            #[doc = "RXOVERR flag clear bit Set by software to clear the RXOVERR flag."]
+            pub const fn rxoverrc(&self) -> bool {
+                let val = (self.0 >> 5usize) & 0x01;
+                val != 0
+            }
+            #[doc = "RXOVERR flag clear bit Set by software to clear the RXOVERR flag."]
+            pub fn set_rxoverrc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+            }
+            #[doc = "CMDREND flag clear bit Set by software to clear the CMDREND flag."]
+            pub const fn cmdrendc(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
+                val != 0
+            }
+            #[doc = "CMDREND flag clear bit Set by software to clear the CMDREND flag."]
+            pub fn set_cmdrendc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            }
+            #[doc = "CMDSENT flag clear bit Set by software to clear the CMDSENT flag."]
+            pub const fn cmdsentc(&self) -> bool {
+                let val = (self.0 >> 7usize) & 0x01;
+                val != 0
+            }
+            #[doc = "CMDSENT flag clear bit Set by software to clear the CMDSENT flag."]
+            pub fn set_cmdsentc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            }
+            #[doc = "DATAEND flag clear bit Set by software to clear the DATAEND flag."]
+            pub const fn dataendc(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
+                val != 0
+            }
+            #[doc = "DATAEND flag clear bit Set by software to clear the DATAEND flag."]
+            pub fn set_dataendc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            }
+            #[doc = "DHOLD flag clear bit Set by software to clear the DHOLD flag."]
+            pub const fn dholdc(&self) -> bool {
+                let val = (self.0 >> 9usize) & 0x01;
+                val != 0
+            }
+            #[doc = "DHOLD flag clear bit Set by software to clear the DHOLD flag."]
+            pub fn set_dholdc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
+            }
+            #[doc = "DBCKEND flag clear bit Set by software to clear the DBCKEND flag."]
+            pub const fn dbckendc(&self) -> bool {
+                let val = (self.0 >> 10usize) & 0x01;
+                val != 0
+            }
+            #[doc = "DBCKEND flag clear bit Set by software to clear the DBCKEND flag."]
+            pub fn set_dbckendc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 10usize)) | (((val as u32) & 0x01) << 10usize);
+            }
+            #[doc = "DABORT flag clear bit Set by software to clear the DABORT flag."]
+            pub const fn dabortc(&self) -> bool {
+                let val = (self.0 >> 11usize) & 0x01;
+                val != 0
+            }
+            #[doc = "DABORT flag clear bit Set by software to clear the DABORT flag."]
+            pub fn set_dabortc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 11usize)) | (((val as u32) & 0x01) << 11usize);
+            }
+            #[doc = "BUSYD0END flag clear bit Set by software to clear the BUSYD0END flag."]
+            pub const fn busyd0endc(&self) -> bool {
+                let val = (self.0 >> 21usize) & 0x01;
+                val != 0
+            }
+            #[doc = "BUSYD0END flag clear bit Set by software to clear the BUSYD0END flag."]
+            pub fn set_busyd0endc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 21usize)) | (((val as u32) & 0x01) << 21usize);
+            }
+            #[doc = "SDIOIT flag clear bit Set by software to clear the SDIOIT flag."]
+            pub const fn sdioitc(&self) -> bool {
+                let val = (self.0 >> 22usize) & 0x01;
+                val != 0
+            }
+            #[doc = "SDIOIT flag clear bit Set by software to clear the SDIOIT flag."]
+            pub fn set_sdioitc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 22usize)) | (((val as u32) & 0x01) << 22usize);
+            }
+            #[doc = "ACKFAIL flag clear bit Set by software to clear the ACKFAIL flag."]
+            pub const fn ackfailc(&self) -> bool {
+                let val = (self.0 >> 23usize) & 0x01;
+                val != 0
+            }
+            #[doc = "ACKFAIL flag clear bit Set by software to clear the ACKFAIL flag."]
+            pub fn set_ackfailc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 23usize)) | (((val as u32) & 0x01) << 23usize);
+            }
+            #[doc = "ACKTIMEOUT flag clear bit Set by software to clear the ACKTIMEOUT flag."]
+            pub const fn acktimeoutc(&self) -> bool {
+                let val = (self.0 >> 24usize) & 0x01;
+                val != 0
+            }
+            #[doc = "ACKTIMEOUT flag clear bit Set by software to clear the ACKTIMEOUT flag."]
+            pub fn set_acktimeoutc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 24usize)) | (((val as u32) & 0x01) << 24usize);
+            }
+            #[doc = "VSWEND flag clear bit Set by software to clear the VSWEND flag."]
+            pub const fn vswendc(&self) -> bool {
+                let val = (self.0 >> 25usize) & 0x01;
+                val != 0
+            }
+            #[doc = "VSWEND flag clear bit Set by software to clear the VSWEND flag."]
+            pub fn set_vswendc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 25usize)) | (((val as u32) & 0x01) << 25usize);
+            }
+            #[doc = "CKSTOP flag clear bit Set by software to clear the CKSTOP flag."]
+            pub const fn ckstopc(&self) -> bool {
+                let val = (self.0 >> 26usize) & 0x01;
+                val != 0
+            }
+            #[doc = "CKSTOP flag clear bit Set by software to clear the CKSTOP flag."]
+            pub fn set_ckstopc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 26usize)) | (((val as u32) & 0x01) << 26usize);
+            }
+            #[doc = "IDMA transfer error clear bit Set by software to clear the IDMATE flag."]
+            pub const fn idmatec(&self) -> bool {
+                let val = (self.0 >> 27usize) & 0x01;
+                val != 0
+            }
+            #[doc = "IDMA transfer error clear bit Set by software to clear the IDMATE flag."]
+            pub fn set_idmatec(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 27usize)) | (((val as u32) & 0x01) << 27usize);
+            }
+            #[doc = "IDMA buffer transfer complete clear bit Set by software to clear the IDMABTC flag."]
+            pub const fn idmabtcc(&self) -> bool {
+                let val = (self.0 >> 28usize) & 0x01;
+                val != 0
+            }
+            #[doc = "IDMA buffer transfer complete clear bit Set by software to clear the IDMABTC flag."]
+            pub fn set_idmabtcc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 28usize)) | (((val as u32) & 0x01) << 28usize);
+            }
+        }
+        impl Default for Icr {
+            fn default() -> Icr {
+                Icr(0)
             }
         }
         #[doc = "The SDMMC_RESP1/2/3/4R registers contain the status of a card, which is part of the received response."]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Resp3r(pub u32);
-        impl Resp3r {
-            #[doc = "see Table404."]
-            pub const fn cardstatus3(&self) -> u32 {
+        pub struct Resp1r(pub u32);
+        impl Resp1r {
+            #[doc = "see Table 432"]
+            pub const fn cardstatus1(&self) -> u32 {
                 let val = (self.0 >> 0usize) & 0xffff_ffff;
                 val as u32
             }
-            #[doc = "see Table404."]
-            pub fn set_cardstatus3(&mut self, val: u32) {
+            #[doc = "see Table 432"]
+            pub fn set_cardstatus1(&mut self, val: u32) {
                 self.0 =
                     (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
             }
         }
-        impl Default for Resp3r {
-            fn default() -> Resp3r {
-                Resp3r(0)
+        impl Default for Resp1r {
+            fn default() -> Resp1r {
+                Resp1r(0)
             }
         }
-        #[doc = "SDMMC IP identification register"]
+        #[doc = "The SDMMC_DCTRL register control the data path state machine (DPSM)."]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Id(pub u32);
-        impl Id {
-            #[doc = "SDMMC IP identification."]
-            pub const fn ip_id(&self) -> u32 {
-                let val = (self.0 >> 0usize) & 0xffff_ffff;
+        pub struct Dctrl(pub u32);
+        impl Dctrl {
+            #[doc = "Data transfer enable bit This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). This bit is cleared by Hardware when data transfer completes. This bit shall only be used to transfer data when no associated data transfer command is used, i.e. shall not be used with SD or eMMC cards."]
+            pub const fn dten(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Data transfer enable bit This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). This bit is cleared by Hardware when data transfer completes. This bit shall only be used to transfer data when no associated data transfer command is used, i.e. shall not be used with SD or eMMC cards."]
+            pub fn set_dten(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            }
+            #[doc = "Data transfer direction selection This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub const fn dtdir(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Data transfer direction selection This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub fn set_dtdir(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
+            }
+            #[doc = "Data transfer mode selection. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub const fn dtmode(&self) -> u8 {
+                let val = (self.0 >> 2usize) & 0x03;
+                val as u8
+            }
+            #[doc = "Data transfer mode selection. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub fn set_dtmode(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x03 << 2usize)) | (((val as u32) & 0x03) << 2usize);
+            }
+            #[doc = "Data block size This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). Define the data block length when the block data transfer mode is selected: When DATALENGTH is not a multiple of DBLOCKSIZE, the transfered data is truncated at a multiple of DBLOCKSIZE. (Any remain data will not be transfered.) When DDR = 1, DBLOCKSIZE = 0000 shall not be used. (No data will be transfered)"]
+            pub const fn dblocksize(&self) -> u8 {
+                let val = (self.0 >> 4usize) & 0x0f;
+                val as u8
+            }
+            #[doc = "Data block size This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). Define the data block length when the block data transfer mode is selected: When DATALENGTH is not a multiple of DBLOCKSIZE, the transfered data is truncated at a multiple of DBLOCKSIZE. (Any remain data will not be transfered.) When DDR = 1, DBLOCKSIZE = 0000 shall not be used. (No data will be transfered)"]
+            pub fn set_dblocksize(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x0f << 4usize)) | (((val as u32) & 0x0f) << 4usize);
+            }
+            #[doc = "Read wait start. If this bit is set, read wait operation starts."]
+            pub const fn rwstart(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Read wait start. If this bit is set, read wait operation starts."]
+            pub fn set_rwstart(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            }
+            #[doc = "Read wait stop This bit is written by firmware and auto cleared by hardware when the DPSM moves from the READ_WAIT state to the WAIT_R or IDLE state."]
+            pub const fn rwstop(&self) -> bool {
+                let val = (self.0 >> 9usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Read wait stop This bit is written by firmware and auto cleared by hardware when the DPSM moves from the READ_WAIT state to the WAIT_R or IDLE state."]
+            pub fn set_rwstop(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
+            }
+            #[doc = "Read wait mode. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub const fn rwmod(&self) -> bool {
+                let val = (self.0 >> 10usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Read wait mode. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub fn set_rwmod(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 10usize)) | (((val as u32) & 0x01) << 10usize);
+            }
+            #[doc = "SD I/O interrupt enable functions This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). If this bit is set, the DPSM enables the SD I/O card specific interrupt operation."]
+            pub const fn sdioen(&self) -> bool {
+                let val = (self.0 >> 11usize) & 0x01;
+                val != 0
+            }
+            #[doc = "SD I/O interrupt enable functions This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). If this bit is set, the DPSM enables the SD I/O card specific interrupt operation."]
+            pub fn set_sdioen(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 11usize)) | (((val as u32) & 0x01) << 11usize);
+            }
+            #[doc = "Enable the reception of the boot acknowledgment. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub const fn bootacken(&self) -> bool {
+                let val = (self.0 >> 12usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Enable the reception of the boot acknowledgment. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub fn set_bootacken(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 12usize)) | (((val as u32) & 0x01) << 12usize);
+            }
+            #[doc = "FIFO reset, will flush any remaining data. This bit can only be written by firmware when IDMAEN= 0 and DPSM is active (DPSMACT = 1). This bit will only take effect when a transfer error or transfer hold occurs."]
+            pub const fn fiforst(&self) -> bool {
+                let val = (self.0 >> 13usize) & 0x01;
+                val != 0
+            }
+            #[doc = "FIFO reset, will flush any remaining data. This bit can only be written by firmware when IDMAEN= 0 and DPSM is active (DPSMACT = 1). This bit will only take effect when a transfer error or transfer hold occurs."]
+            pub fn set_fiforst(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 13usize)) | (((val as u32) & 0x01) << 13usize);
+            }
+        }
+        impl Default for Dctrl {
+            fn default() -> Dctrl {
+                Dctrl(0)
+            }
+        }
+        #[doc = "The SDMMC_DCNTR register loads the value from the data length register (see SDMMC_DLENR) when the DPSM moves from the Idle state to the Wait_R or Wait_S state. As data is transferred, the counter decrements the value until it reaches 0. The DPSM then moves to the Idle state and when there has been no error, the data status end flag (DATAEND) is set."]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Dcntr(pub u32);
+        impl Dcntr {
+            #[doc = "Data count value When read, the number of remaining data bytes to be transferred is returned. Write has no effect."]
+            pub const fn datacount(&self) -> u32 {
+                let val = (self.0 >> 0usize) & 0x01ff_ffff;
                 val as u32
             }
-            #[doc = "SDMMC IP identification."]
-            pub fn set_ip_id(&mut self, val: u32) {
+            #[doc = "Data count value When read, the number of remaining data bytes to be transferred is returned. Write has no effect."]
+            pub fn set_datacount(&mut self, val: u32) {
                 self.0 =
-                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
+                    (self.0 & !(0x01ff_ffff << 0usize)) | (((val as u32) & 0x01ff_ffff) << 0usize);
             }
         }
-        impl Default for Id {
-            fn default() -> Id {
-                Id(0)
+        impl Default for Dcntr {
+            fn default() -> Dcntr {
+                Dcntr(0)
+            }
+        }
+        #[doc = "The SDMMC_CLKCR register controls the SDMMC_CK output clock, the SDMMC_RX_CLK receive clock, and the bus width."]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Clkcr(pub u32);
+        impl Clkcr {
+            #[doc = "Clock divide factor This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0). This field defines the divide factor between the input clock (SDMMCCLK) and the output clock (SDMMC_CK): SDMMC_CK frequency = SDMMCCLK / [2 * CLKDIV]. 0xx: etc.. xxx: etc.."]
+            pub const fn clkdiv(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0x03ff;
+                val as u16
+            }
+            #[doc = "Clock divide factor This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0). This field defines the divide factor between the input clock (SDMMCCLK) and the output clock (SDMMC_CK): SDMMC_CK frequency = SDMMCCLK / [2 * CLKDIV]. 0xx: etc.. xxx: etc.."]
+            pub fn set_clkdiv(&mut self, val: u16) {
+                self.0 = (self.0 & !(0x03ff << 0usize)) | (((val as u32) & 0x03ff) << 0usize);
+            }
+            #[doc = "Power saving configuration bit This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0) For power saving, the SDMMC_CK clock output can be disabled when the bus is idle by setting PWRSAV:"]
+            pub const fn pwrsav(&self) -> bool {
+                let val = (self.0 >> 12usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Power saving configuration bit This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0) For power saving, the SDMMC_CK clock output can be disabled when the bus is idle by setting PWRSAV:"]
+            pub fn set_pwrsav(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 12usize)) | (((val as u32) & 0x01) << 12usize);
+            }
+            #[doc = "Wide bus mode enable bit This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0)"]
+            pub const fn widbus(&self) -> u8 {
+                let val = (self.0 >> 14usize) & 0x03;
+                val as u8
+            }
+            #[doc = "Wide bus mode enable bit This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0)"]
+            pub fn set_widbus(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x03 << 14usize)) | (((val as u32) & 0x03) << 14usize);
+            }
+            #[doc = "SDMMC_CK dephasing selection bit for data and Command. This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0). When clock division = 1 (CLKDIV = 0), this bit has no effect. Data and Command change on SDMMC_CK falling edge. When clock division &gt;1 (CLKDIV &gt; 0) &amp; DDR = 0: - SDMMC_CK edge occurs on SDMMCCLK rising edge. When clock division >1 (CLKDIV > 0) & DDR = 1: - Data changed on the SDMMCCLK falling edge succeeding a SDMMC_CK edge. - SDMMC_CK edge occurs on SDMMCCLK rising edge. - Data changed on the SDMMC_CK falling edge succeeding a SDMMC_CK edge. - SDMMC_CK edge occurs on SDMMCCLK rising edge."]
+            pub const fn negedge(&self) -> bool {
+                let val = (self.0 >> 16usize) & 0x01;
+                val != 0
+            }
+            #[doc = "SDMMC_CK dephasing selection bit for data and Command. This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0). When clock division = 1 (CLKDIV = 0), this bit has no effect. Data and Command change on SDMMC_CK falling edge. When clock division &gt;1 (CLKDIV &gt; 0) &amp; DDR = 0: - SDMMC_CK edge occurs on SDMMCCLK rising edge. When clock division >1 (CLKDIV > 0) & DDR = 1: - Data changed on the SDMMCCLK falling edge succeeding a SDMMC_CK edge. - SDMMC_CK edge occurs on SDMMCCLK rising edge. - Data changed on the SDMMC_CK falling edge succeeding a SDMMC_CK edge. - SDMMC_CK edge occurs on SDMMCCLK rising edge."]
+            pub fn set_negedge(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
+            }
+            #[doc = "Hardware flow control enable This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0) When Hardware flow control is enabled, the meaning of the TXFIFOE and RXFIFOF flags change, please see SDMMC status register definition in Section56.8.11."]
+            pub const fn hwfc_en(&self) -> bool {
+                let val = (self.0 >> 17usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Hardware flow control enable This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0) When Hardware flow control is enabled, the meaning of the TXFIFOE and RXFIFOF flags change, please see SDMMC status register definition in Section56.8.11."]
+            pub fn set_hwfc_en(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 17usize)) | (((val as u32) & 0x01) << 17usize);
+            }
+            #[doc = "Data rate signaling selection This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0) DDR rate shall only be selected with 4-bit or 8-bit wide bus mode. (WIDBUS &gt; 00). DDR = 1 has no effect when WIDBUS = 00 (1-bit wide bus). DDR rate shall only be selected with clock division &gt;1. (CLKDIV &gt; 0)"]
+            pub const fn ddr(&self) -> bool {
+                let val = (self.0 >> 18usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Data rate signaling selection This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0) DDR rate shall only be selected with 4-bit or 8-bit wide bus mode. (WIDBUS &gt; 00). DDR = 1 has no effect when WIDBUS = 00 (1-bit wide bus). DDR rate shall only be selected with clock division &gt;1. (CLKDIV &gt; 0)"]
+            pub fn set_ddr(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 18usize)) | (((val as u32) & 0x01) << 18usize);
+            }
+            #[doc = "Bus speed mode selection between DS, HS, SDR12, SDR25 and SDR50, DDR50, SDR104. This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0)"]
+            pub const fn busspeed(&self) -> bool {
+                let val = (self.0 >> 19usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Bus speed mode selection between DS, HS, SDR12, SDR25 and SDR50, DDR50, SDR104. This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0)"]
+            pub fn set_busspeed(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 19usize)) | (((val as u32) & 0x01) << 19usize);
+            }
+            #[doc = "Receive clock selection. These bits can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0)"]
+            pub const fn selclkrx(&self) -> u8 {
+                let val = (self.0 >> 20usize) & 0x03;
+                val as u8
+            }
+            #[doc = "Receive clock selection. These bits can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0)"]
+            pub fn set_selclkrx(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x03 << 20usize)) | (((val as u32) & 0x03) << 20usize);
+            }
+        }
+        impl Default for Clkcr {
+            fn default() -> Clkcr {
+                Clkcr(0)
             }
         }
         #[doc = "The SDMMC_ARGR register contains a 32-bit command argument, which is sent to a card as part of a command message."]
@@ -5714,275 +5546,533 @@ are always 0 and read only). This register can be written by firmware when DPSM
                 Argr(0)
             }
         }
-    }
-}
-pub mod spi_v1 {
-    use crate::generic::*;
-    #[doc = "Serial peripheral interface"]
-    #[derive(Copy, Clone)]
-    pub struct Spi(pub *mut u8);
-    unsafe impl Send for Spi {}
-    unsafe impl Sync for Spi {}
-    impl Spi {
-        #[doc = "control register 1"]
-        pub fn cr1(self) -> Reg<regs::Cr1, RW> {
-            unsafe { Reg::from_ptr(self.0.add(0usize)) }
-        }
-        #[doc = "control register 2"]
-        pub fn cr2(self) -> Reg<regs::Cr2, RW> {
-            unsafe { Reg::from_ptr(self.0.add(4usize)) }
-        }
-        #[doc = "status register"]
-        pub fn sr(self) -> Reg<regs::Sr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(8usize)) }
-        }
-        #[doc = "data register"]
-        pub fn dr(self) -> Reg<regs::Dr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(12usize)) }
-        }
-        #[doc = "CRC polynomial register"]
-        pub fn crcpr(self) -> Reg<regs::Crcpr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(16usize)) }
-        }
-        #[doc = "RX CRC register"]
-        pub fn rxcrcr(self) -> Reg<regs::Rxcrcr, R> {
-            unsafe { Reg::from_ptr(self.0.add(20usize)) }
-        }
-        #[doc = "TX CRC register"]
-        pub fn txcrcr(self) -> Reg<regs::Txcrcr, R> {
-            unsafe { Reg::from_ptr(self.0.add(24usize)) }
-        }
-    }
-    pub mod regs {
-        use crate::generic::*;
-        #[doc = "RX CRC register"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Rxcrcr(pub u32);
-        impl Rxcrcr {
-            #[doc = "Rx CRC register"]
-            pub const fn rx_crc(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0xffff;
-                val as u16
-            }
-            #[doc = "Rx CRC register"]
-            pub fn set_rx_crc(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
-            }
-        }
-        impl Default for Rxcrcr {
-            fn default() -> Rxcrcr {
-                Rxcrcr(0)
-            }
-        }
-        #[doc = "control register 2"]
+        #[doc = "The receive and transmit FIFOs can be read or written as 32-bit wide registers. The FIFOs contain 32 entries on 32 sequential addresses. This allows the CPU to use its load and store multiple operands to read from/write to the FIFO."]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr2(pub u32);
-        impl Cr2 {
-            #[doc = "Rx buffer DMA enable"]
-            pub const fn rxdmaen(&self) -> bool {
+        pub struct Idmactrlr(pub u32);
+        impl Idmactrlr {
+            #[doc = "IDMA enable This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub const fn idmaen(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Rx buffer DMA enable"]
-            pub fn set_rxdmaen(&mut self, val: bool) {
+            #[doc = "IDMA enable This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub fn set_idmaen(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Tx buffer DMA enable"]
-            pub const fn txdmaen(&self) -> bool {
+            #[doc = "Buffer mode selection. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub const fn idmabmode(&self) -> bool {
                 let val = (self.0 >> 1usize) & 0x01;
                 val != 0
             }
-            #[doc = "Tx buffer DMA enable"]
-            pub fn set_txdmaen(&mut self, val: bool) {
+            #[doc = "Buffer mode selection. This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub fn set_idmabmode(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "SS output enable"]
-            pub const fn ssoe(&self) -> bool {
+            #[doc = "Double buffer mode active buffer indication This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). When IDMA is enabled this bit is toggled by hardware."]
+            pub const fn idmabact(&self) -> bool {
                 let val = (self.0 >> 2usize) & 0x01;
                 val != 0
             }
-            #[doc = "SS output enable"]
-            pub fn set_ssoe(&mut self, val: bool) {
+            #[doc = "Double buffer mode active buffer indication This bit can only be written by firmware when DPSM is inactive (DPSMACT = 0). When IDMA is enabled this bit is toggled by hardware."]
+            pub fn set_idmabact(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
             }
-            #[doc = "Frame format"]
-            pub const fn frf(&self) -> super::vals::Frf {
-                let val = (self.0 >> 4usize) & 0x01;
-                super::vals::Frf(val as u8)
+        }
+        impl Default for Idmactrlr {
+            fn default() -> Idmactrlr {
+                Idmactrlr(0)
             }
-            #[doc = "Frame format"]
-            pub fn set_frf(&mut self, val: super::vals::Frf) {
-                self.0 = (self.0 & !(0x01 << 4usize)) | (((val.0 as u32) & 0x01) << 4usize);
+        }
+        #[doc = "The receive and transmit FIFOs can be only read or written as word (32-bit) wide registers. The FIFOs contain 16 entries on sequential addresses. This allows the CPU to use its load and store multiple operands to read from/write to the FIFO.When accessing SDMMC_FIFOR with half word or byte access an AHB bus fault is generated."]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Fifor(pub u32);
+        impl Fifor {
+            #[doc = "Receive and transmit FIFO data This register can only be read or written by firmware when the DPSM is active (DPSMACT=1). The FIFO data occupies 16 entries of 32-bit words."]
+            pub const fn fifodata(&self) -> u32 {
+                let val = (self.0 >> 0usize) & 0xffff_ffff;
+                val as u32
             }
-            #[doc = "Error interrupt enable"]
-            pub const fn errie(&self) -> bool {
-                let val = (self.0 >> 5usize) & 0x01;
-                val != 0
+            #[doc = "Receive and transmit FIFO data This register can only be read or written by firmware when the DPSM is active (DPSMACT=1). The FIFO data occupies 16 entries of 32-bit words."]
+            pub fn set_fifodata(&mut self, val: u32) {
+                self.0 =
+                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
             }
-            #[doc = "Error interrupt enable"]
-            pub fn set_errie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+        }
+        impl Default for Fifor {
+            fn default() -> Fifor {
+                Fifor(0)
             }
-            #[doc = "RX buffer not empty interrupt enable"]
-            pub const fn rxneie(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
-                val != 0
+        }
+        #[doc = "The SDMMC_DTIMER register contains the data timeout period, in card bus clock periods. A counter loads the value from the SDMMC_DTIMER register, and starts decrementing when the data path state machine (DPSM) enters the Wait_R or Busy state. If the timer reaches 0 while the DPSM is in either of these states, the timeout status flag is set."]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Dtimer(pub u32);
+        impl Dtimer {
+            #[doc = "Data and R1b busy timeout period This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0). Data and R1b busy timeout period expressed in card bus clock periods."]
+            pub const fn datatime(&self) -> u32 {
+                let val = (self.0 >> 0usize) & 0xffff_ffff;
+                val as u32
             }
-            #[doc = "RX buffer not empty interrupt enable"]
-            pub fn set_rxneie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            #[doc = "Data and R1b busy timeout period This bit can only be written when the CPSM and DPSM are not active (CPSMACT = 0 and DPSMACT = 0). Data and R1b busy timeout period expressed in card bus clock periods."]
+            pub fn set_datatime(&mut self, val: u32) {
+                self.0 =
+                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
             }
-            #[doc = "Tx buffer empty interrupt enable"]
-            pub const fn txeie(&self) -> bool {
-                let val = (self.0 >> 7usize) & 0x01;
-                val != 0
+        }
+        impl Default for Dtimer {
+            fn default() -> Dtimer {
+                Dtimer(0)
             }
-            #[doc = "Tx buffer empty interrupt enable"]
-            pub fn set_txeie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+        }
+        #[doc = "The SDMMC_RESP1/2/3/4R registers contain the status of a card, which is part of the received response."]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Resp2r(pub u32);
+        impl Resp2r {
+            #[doc = "see Table404."]
+            pub const fn cardstatus2(&self) -> u32 {
+                let val = (self.0 >> 0usize) & 0xffff_ffff;
+                val as u32
+            }
+            #[doc = "see Table404."]
+            pub fn set_cardstatus2(&mut self, val: u32) {
+                self.0 =
+                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
             }
         }
-        impl Default for Cr2 {
-            fn default() -> Cr2 {
-                Cr2(0)
+        impl Default for Resp2r {
+            fn default() -> Resp2r {
+                Resp2r(0)
             }
         }
-        #[doc = "CRC polynomial register"]
+        #[doc = "SDMMC IP version register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Crcpr(pub u32);
-        impl Crcpr {
-            #[doc = "CRC polynomial register"]
-            pub const fn crcpoly(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0xffff;
-                val as u16
+        pub struct Ver(pub u32);
+        impl Ver {
+            #[doc = "IP minor revision number."]
+            pub const fn minrev(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x0f;
+                val as u8
             }
-            #[doc = "CRC polynomial register"]
-            pub fn set_crcpoly(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
+            #[doc = "IP minor revision number."]
+            pub fn set_minrev(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
+            }
+            #[doc = "IP major revision number."]
+            pub const fn majrev(&self) -> u8 {
+                let val = (self.0 >> 4usize) & 0x0f;
+                val as u8
+            }
+            #[doc = "IP major revision number."]
+            pub fn set_majrev(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x0f << 4usize)) | (((val as u32) & 0x0f) << 4usize);
             }
         }
-        impl Default for Crcpr {
-            fn default() -> Crcpr {
-                Crcpr(0)
+        impl Default for Ver {
+            fn default() -> Ver {
+                Ver(0)
             }
         }
-        #[doc = "TX CRC register"]
+        #[doc = "The SDMMC_RESP1/2/3/4R registers contain the status of a card, which is part of the received response."]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Txcrcr(pub u32);
-        impl Txcrcr {
-            #[doc = "Tx CRC register"]
-            pub const fn tx_crc(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0xffff;
-                val as u16
+        pub struct Resp3r(pub u32);
+        impl Resp3r {
+            #[doc = "see Table404."]
+            pub const fn cardstatus3(&self) -> u32 {
+                let val = (self.0 >> 0usize) & 0xffff_ffff;
+                val as u32
             }
-            #[doc = "Tx CRC register"]
-            pub fn set_tx_crc(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
+            #[doc = "see Table404."]
+            pub fn set_cardstatus3(&mut self, val: u32) {
+                self.0 =
+                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
             }
         }
-        impl Default for Txcrcr {
-            fn default() -> Txcrcr {
-                Txcrcr(0)
+        impl Default for Resp3r {
+            fn default() -> Resp3r {
+                Resp3r(0)
             }
         }
-        #[doc = "status register"]
+        #[doc = "The SDMMC_IDMABASE1R register contains the double buffer configuration second buffer memory base address."]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Sr(pub u32);
-        impl Sr {
-            #[doc = "Receive buffer not empty"]
-            pub const fn rxne(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
-                val != 0
+        pub struct Idmabase1r(pub u32);
+        impl Idmabase1r {
+            #[doc = "Buffer 1 memory base address, shall be word aligned (bit [1:0]
+are always 0 and read only). This register can be written by firmware when DPSM is inactive (DPSMACT = 0), and can dynamically be written by firmware when DPSM active (DPSMACT = 1) and memory buffer 1 is inactive (IDMABACT = 0)."]
+            pub const fn idmabase1(&self) -> u32 {
+                let val = (self.0 >> 0usize) & 0xffff_ffff;
+                val as u32
             }
-            #[doc = "Receive buffer not empty"]
-            pub fn set_rxne(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            #[doc = "Buffer 1 memory base address, shall be word aligned (bit [1:0]
+are always 0 and read only). This register can be written by firmware when DPSM is inactive (DPSMACT = 0), and can dynamically be written by firmware when DPSM active (DPSMACT = 1) and memory buffer 1 is inactive (IDMABACT = 0)."]
+            pub fn set_idmabase1(&mut self, val: u32) {
+                self.0 =
+                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
             }
-            #[doc = "Transmit buffer empty"]
-            pub const fn txe(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
-                val != 0
+        }
+        impl Default for Idmabase1r {
+            fn default() -> Idmabase1r {
+                Idmabase1r(0)
             }
-            #[doc = "Transmit buffer empty"]
-            pub fn set_txe(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
+        }
+        #[doc = "SDMMC command response register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Respcmdr(pub u32);
+        impl Respcmdr {
+            #[doc = "Response command index"]
+            pub const fn respcmd(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x3f;
+                val as u8
             }
-            #[doc = "CRC error flag"]
-            pub const fn crcerr(&self) -> bool {
-                let val = (self.0 >> 4usize) & 0x01;
-                val != 0
+            #[doc = "Response command index"]
+            pub fn set_respcmd(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x3f << 0usize)) | (((val as u32) & 0x3f) << 0usize);
             }
-            #[doc = "CRC error flag"]
-            pub fn set_crcerr(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
+        }
+        impl Default for Respcmdr {
+            fn default() -> Respcmdr {
+                Respcmdr(0)
             }
-            #[doc = "Mode fault"]
-            pub const fn modf(&self) -> bool {
-                let val = (self.0 >> 5usize) & 0x01;
-                val != 0
+        }
+        #[doc = "The SDMMC_RESP1/2/3/4R registers contain the status of a card, which is part of the received response."]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Resp4r(pub u32);
+        impl Resp4r {
+            #[doc = "see Table404."]
+            pub const fn cardstatus4(&self) -> u32 {
+                let val = (self.0 >> 0usize) & 0xffff_ffff;
+                val as u32
             }
-            #[doc = "Mode fault"]
-            pub fn set_modf(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+            #[doc = "see Table404."]
+            pub fn set_cardstatus4(&mut self, val: u32) {
+                self.0 =
+                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
             }
-            #[doc = "Overrun flag"]
-            pub const fn ovr(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
-                val != 0
+        }
+        impl Default for Resp4r {
+            fn default() -> Resp4r {
+                Resp4r(0)
             }
-            #[doc = "Overrun flag"]
-            pub fn set_ovr(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+        }
+        #[doc = "The SDMMC_IDMABASE0R register contains the memory buffer base address in single buffer configuration and the buffer 0 base address in double buffer configuration."]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Idmabase0r(pub u32);
+        impl Idmabase0r {
+            #[doc = "Buffer 0 memory base address bits [31:2], shall be word aligned (bit [1:0]
+are always 0 and read only). This register can be written by firmware when DPSM is inactive (DPSMACT = 0), and can dynamically be written by firmware when DPSM active (DPSMACT = 1) and memory buffer 0 is inactive (IDMABACT = 1)."]
+            pub const fn idmabase0(&self) -> u32 {
+                let val = (self.0 >> 0usize) & 0xffff_ffff;
+                val as u32
             }
-            #[doc = "Busy flag"]
-            pub const fn bsy(&self) -> bool {
-                let val = (self.0 >> 7usize) & 0x01;
-                val != 0
+            #[doc = "Buffer 0 memory base address bits [31:2], shall be word aligned (bit [1:0]
+are always 0 and read only). This register can be written by firmware when DPSM is inactive (DPSMACT = 0), and can dynamically be written by firmware when DPSM active (DPSMACT = 1) and memory buffer 0 is inactive (IDMABACT = 1)."]
+            pub fn set_idmabase0(&mut self, val: u32) {
+                self.0 =
+                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
             }
-            #[doc = "Busy flag"]
-            pub fn set_bsy(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+        }
+        impl Default for Idmabase0r {
+            fn default() -> Idmabase0r {
+                Idmabase0r(0)
             }
-            #[doc = "TI frame format error"]
-            pub const fn fre(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
-                val != 0
+        }
+        #[doc = "The SDMMC_IDMABSIZER register contains the buffers size when in double buffer configuration."]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Idmabsizer(pub u32);
+        impl Idmabsizer {
+            #[doc = "Number of transfers per buffer. This 8-bit value shall be multiplied by 8 to get the size of the buffer in 32-bit words and by 32 to get the size of the buffer in bytes. Example: IDMABNDT = 0x01: buffer size = 8 words = 32 bytes. These bits can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub const fn idmabndt(&self) -> u8 {
+                let val = (self.0 >> 5usize) & 0xff;
+                val as u8
             }
-            #[doc = "TI frame format error"]
-            pub fn set_fre(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            #[doc = "Number of transfers per buffer. This 8-bit value shall be multiplied by 8 to get the size of the buffer in 32-bit words and by 32 to get the size of the buffer in bytes. Example: IDMABNDT = 0x01: buffer size = 8 words = 32 bytes. These bits can only be written by firmware when DPSM is inactive (DPSMACT = 0)."]
+            pub fn set_idmabndt(&mut self, val: u8) {
+                self.0 = (self.0 & !(0xff << 5usize)) | (((val as u32) & 0xff) << 5usize);
             }
         }
-        impl Default for Sr {
-            fn default() -> Sr {
-                Sr(0)
+        impl Default for Idmabsizer {
+            fn default() -> Idmabsizer {
+                Idmabsizer(0)
             }
         }
-        #[doc = "data register"]
+        #[doc = "SDMMC IP identification register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Dr(pub u32);
-        impl Dr {
-            #[doc = "Data register"]
-            pub const fn dr(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0xffff;
-                val as u16
+        pub struct Id(pub u32);
+        impl Id {
+            #[doc = "SDMMC IP identification."]
+            pub const fn ip_id(&self) -> u32 {
+                let val = (self.0 >> 0usize) & 0xffff_ffff;
+                val as u32
             }
-            #[doc = "Data register"]
-            pub fn set_dr(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
+            #[doc = "SDMMC IP identification."]
+            pub fn set_ip_id(&mut self, val: u32) {
+                self.0 =
+                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
             }
         }
-        impl Default for Dr {
-            fn default() -> Dr {
-                Dr(0)
+        impl Default for Id {
+            fn default() -> Id {
+                Id(0)
             }
         }
+    }
+}
+pub mod spi_v2 {
+    use crate::generic::*;
+    #[doc = "Serial peripheral interface"]
+    #[derive(Copy, Clone)]
+    pub struct Spi(pub *mut u8);
+    unsafe impl Send for Spi {}
+    unsafe impl Sync for Spi {}
+    impl Spi {
+        #[doc = "control register 1"]
+        pub fn cr1(self) -> Reg<regs::Cr1, RW> {
+            unsafe { Reg::from_ptr(self.0.add(0usize)) }
+        }
+        #[doc = "control register 2"]
+        pub fn cr2(self) -> Reg<regs::Cr2, RW> {
+            unsafe { Reg::from_ptr(self.0.add(4usize)) }
+        }
+        #[doc = "status register"]
+        pub fn sr(self) -> Reg<regs::Sr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(8usize)) }
+        }
+        #[doc = "data register"]
+        pub fn dr(self) -> Reg<regs::Dr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(12usize)) }
+        }
+        #[doc = "CRC polynomial register"]
+        pub fn crcpr(self) -> Reg<regs::Crcpr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(16usize)) }
+        }
+        #[doc = "RX CRC register"]
+        pub fn rxcrcr(self) -> Reg<regs::Rxcrcr, R> {
+            unsafe { Reg::from_ptr(self.0.add(20usize)) }
+        }
+        #[doc = "TX CRC register"]
+        pub fn txcrcr(self) -> Reg<regs::Txcrcr, R> {
+            unsafe { Reg::from_ptr(self.0.add(24usize)) }
+        }
+    }
+    pub mod vals {
+        use crate::generic::*;
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Br(pub u8);
+        impl Br {
+            #[doc = "f_PCLK / 2"]
+            pub const DIV2: Self = Self(0);
+            #[doc = "f_PCLK / 4"]
+            pub const DIV4: Self = Self(0x01);
+            #[doc = "f_PCLK / 8"]
+            pub const DIV8: Self = Self(0x02);
+            #[doc = "f_PCLK / 16"]
+            pub const DIV16: Self = Self(0x03);
+            #[doc = "f_PCLK / 32"]
+            pub const DIV32: Self = Self(0x04);
+            #[doc = "f_PCLK / 64"]
+            pub const DIV64: Self = Self(0x05);
+            #[doc = "f_PCLK / 128"]
+            pub const DIV128: Self = Self(0x06);
+            #[doc = "f_PCLK / 256"]
+            pub const DIV256: Self = Self(0x07);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Lsbfirst(pub u8);
+        impl Lsbfirst {
+            #[doc = "Data is transmitted/received with the MSB first"]
+            pub const MSBFIRST: Self = Self(0);
+            #[doc = "Data is transmitted/received with the LSB first"]
+            pub const LSBFIRST: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct LdmaTx(pub u8);
+        impl LdmaTx {
+            #[doc = "Number of data to transfer for transmit is even"]
+            pub const EVEN: Self = Self(0);
+            #[doc = "Number of data to transfer for transmit is odd"]
+            pub const ODD: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Frf(pub u8);
+        impl Frf {
+            #[doc = "SPI Motorola mode"]
+            pub const MOTOROLA: Self = Self(0);
+            #[doc = "SPI TI mode"]
+            pub const TI: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Bidioe(pub u8);
+        impl Bidioe {
+            #[doc = "Output disabled (receive-only mode)"]
+            pub const OUTPUTDISABLED: Self = Self(0);
+            #[doc = "Output enabled (transmit-only mode)"]
+            pub const OUTPUTENABLED: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Frer(pub u8);
+        impl Frer {
+            #[doc = "No frame format error"]
+            pub const NOERROR: Self = Self(0);
+            #[doc = "A frame format error occurred"]
+            pub const ERROR: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Crcnext(pub u8);
+        impl Crcnext {
+            #[doc = "Next transmit value is from Tx buffer"]
+            pub const TXBUFFER: Self = Self(0);
+            #[doc = "Next transmit value is from Tx CRC register"]
+            pub const CRC: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Ds(pub u8);
+        impl Ds {
+            #[doc = "4-bit"]
+            pub const FOURBIT: Self = Self(0x03);
+            #[doc = "5-bit"]
+            pub const FIVEBIT: Self = Self(0x04);
+            #[doc = "6-bit"]
+            pub const SIXBIT: Self = Self(0x05);
+            #[doc = "7-bit"]
+            pub const SEVENBIT: Self = Self(0x06);
+            #[doc = "8-bit"]
+            pub const EIGHTBIT: Self = Self(0x07);
+            #[doc = "9-bit"]
+            pub const NINEBIT: Self = Self(0x08);
+            #[doc = "10-bit"]
+            pub const TENBIT: Self = Self(0x09);
+            #[doc = "11-bit"]
+            pub const ELEVENBIT: Self = Self(0x0a);
+            #[doc = "12-bit"]
+            pub const TWELVEBIT: Self = Self(0x0b);
+            #[doc = "13-bit"]
+            pub const THIRTEENBIT: Self = Self(0x0c);
+            #[doc = "14-bit"]
+            pub const FOURTEENBIT: Self = Self(0x0d);
+            #[doc = "15-bit"]
+            pub const FIFTEENBIT: Self = Self(0x0e);
+            #[doc = "16-bit"]
+            pub const SIXTEENBIT: Self = Self(0x0f);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Cpha(pub u8);
+        impl Cpha {
+            #[doc = "The first clock transition is the first data capture edge"]
+            pub const FIRSTEDGE: Self = Self(0);
+            #[doc = "The second clock transition is the first data capture edge"]
+            pub const SECONDEDGE: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Frlvlr(pub u8);
+        impl Frlvlr {
+            #[doc = "Rx FIFO Empty"]
+            pub const EMPTY: Self = Self(0);
+            #[doc = "Rx 1/4 FIFO"]
+            pub const QUARTER: Self = Self(0x01);
+            #[doc = "Rx 1/2 FIFO"]
+            pub const HALF: Self = Self(0x02);
+            #[doc = "Rx FIFO full"]
+            pub const FULL: Self = Self(0x03);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Bidimode(pub u8);
+        impl Bidimode {
+            #[doc = "2-line unidirectional data mode selected"]
+            pub const UNIDIRECTIONAL: Self = Self(0);
+            #[doc = "1-line bidirectional data mode selected"]
+            pub const BIDIRECTIONAL: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Mstr(pub u8);
+        impl Mstr {
+            #[doc = "Slave configuration"]
+            pub const SLAVE: Self = Self(0);
+            #[doc = "Master configuration"]
+            pub const MASTER: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Crcl(pub u8);
+        impl Crcl {
+            #[doc = "8-bit CRC length"]
+            pub const EIGHTBIT: Self = Self(0);
+            #[doc = "16-bit CRC length"]
+            pub const SIXTEENBIT: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Rxonly(pub u8);
+        impl Rxonly {
+            #[doc = "Full duplex (Transmit and receive)"]
+            pub const FULLDUPLEX: Self = Self(0);
+            #[doc = "Output disabled (Receive-only mode)"]
+            pub const OUTPUTDISABLED: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Ftlvlr(pub u8);
+        impl Ftlvlr {
+            #[doc = "Tx FIFO Empty"]
+            pub const EMPTY: Self = Self(0);
+            #[doc = "Tx 1/4 FIFO"]
+            pub const QUARTER: Self = Self(0x01);
+            #[doc = "Tx 1/2 FIFO"]
+            pub const HALF: Self = Self(0x02);
+            #[doc = "Tx FIFO full"]
+            pub const FULL: Self = Self(0x03);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Frxth(pub u8);
+        impl Frxth {
+            #[doc = "RXNE event is generated if the FIFO level is greater than or equal to 1/2 (16-bit)"]
+            pub const HALF: Self = Self(0);
+            #[doc = "RXNE event is generated if the FIFO level is greater than or equal to 1/4 (8-bit)"]
+            pub const QUARTER: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct LdmaRx(pub u8);
+        impl LdmaRx {
+            #[doc = "Number of data to transfer for receive is even"]
+            pub const EVEN: Self = Self(0);
+            #[doc = "Number of data to transfer for receive is odd"]
+            pub const ODD: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Cpol(pub u8);
+        impl Cpol {
+            #[doc = "CK to 0 when idle"]
+            pub const IDLELOW: Self = Self(0);
+            #[doc = "CK to 1 when idle"]
+            pub const IDLEHIGH: Self = Self(0x01);
+        }
+    }
+    pub mod regs {
+        use crate::generic::*;
         #[doc = "control register 1"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
@@ -6069,13 +6159,13 @@ pub mod spi_v1 {
             pub fn set_rxonly(&mut self, val: super::vals::Rxonly) {
                 self.0 = (self.0 & !(0x01 << 10usize)) | (((val.0 as u32) & 0x01) << 10usize);
             }
-            #[doc = "Data frame format"]
-            pub const fn dff(&self) -> super::vals::Dff {
+            #[doc = "CRC length"]
+            pub const fn crcl(&self) -> super::vals::Crcl {
                 let val = (self.0 >> 11usize) & 0x01;
-                super::vals::Dff(val as u8)
+                super::vals::Crcl(val as u8)
             }
-            #[doc = "Data frame format"]
-            pub fn set_dff(&mut self, val: super::vals::Dff) {
+            #[doc = "CRC length"]
+            pub fn set_crcl(&mut self, val: super::vals::Crcl) {
                 self.0 = (self.0 & !(0x01 << 11usize)) | (((val.0 as u32) & 0x01) << 11usize);
             }
             #[doc = "CRC transfer next"]
@@ -6120,613 +6210,300 @@ pub mod spi_v1 {
                 Cr1(0)
             }
         }
-    }
-    pub mod vals {
-        use crate::generic::*;
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Iscfg(pub u8);
-        impl Iscfg {
-            #[doc = "Slave - transmit"]
-            pub const SLAVETX: Self = Self(0);
-            #[doc = "Slave - receive"]
-            pub const SLAVERX: Self = Self(0x01);
-            #[doc = "Master - transmit"]
-            pub const MASTERTX: Self = Self(0x02);
-            #[doc = "Master - receive"]
-            pub const MASTERRX: Self = Self(0x03);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Frer(pub u8);
-        impl Frer {
-            #[doc = "No frame format error"]
-            pub const NOERROR: Self = Self(0);
-            #[doc = "A frame format error occurred"]
-            pub const ERROR: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Cpol(pub u8);
-        impl Cpol {
-            #[doc = "CK to 0 when idle"]
-            pub const IDLELOW: Self = Self(0);
-            #[doc = "CK to 1 when idle"]
-            pub const IDLEHIGH: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Mstr(pub u8);
-        impl Mstr {
-            #[doc = "Slave configuration"]
-            pub const SLAVE: Self = Self(0);
-            #[doc = "Master configuration"]
-            pub const MASTER: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Bidimode(pub u8);
-        impl Bidimode {
-            #[doc = "2-line unidirectional data mode selected"]
-            pub const UNIDIRECTIONAL: Self = Self(0);
-            #[doc = "1-line bidirectional data mode selected"]
-            pub const BIDIRECTIONAL: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Crcnext(pub u8);
-        impl Crcnext {
-            #[doc = "Next transmit value is from Tx buffer"]
-            pub const TXBUFFER: Self = Self(0);
-            #[doc = "Next transmit value is from Tx CRC register"]
-            pub const CRC: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Rxonly(pub u8);
-        impl Rxonly {
-            #[doc = "Full duplex (Transmit and receive)"]
-            pub const FULLDUPLEX: Self = Self(0);
-            #[doc = "Output disabled (Receive-only mode)"]
-            pub const OUTPUTDISABLED: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Cpha(pub u8);
-        impl Cpha {
-            #[doc = "The first clock transition is the first data capture edge"]
-            pub const FIRSTEDGE: Self = Self(0);
-            #[doc = "The second clock transition is the first data capture edge"]
-            pub const SECONDEDGE: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Dff(pub u8);
-        impl Dff {
-            #[doc = "8-bit data frame format is selected for transmission/reception"]
-            pub const EIGHTBIT: Self = Self(0);
-            #[doc = "16-bit data frame format is selected for transmission/reception"]
-            pub const SIXTEENBIT: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Lsbfirst(pub u8);
-        impl Lsbfirst {
-            #[doc = "Data is transmitted/received with the MSB first"]
-            pub const MSBFIRST: Self = Self(0);
-            #[doc = "Data is transmitted/received with the LSB first"]
-            pub const LSBFIRST: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Br(pub u8);
-        impl Br {
-            #[doc = "f_PCLK / 2"]
-            pub const DIV2: Self = Self(0);
-            #[doc = "f_PCLK / 4"]
-            pub const DIV4: Self = Self(0x01);
-            #[doc = "f_PCLK / 8"]
-            pub const DIV8: Self = Self(0x02);
-            #[doc = "f_PCLK / 16"]
-            pub const DIV16: Self = Self(0x03);
-            #[doc = "f_PCLK / 32"]
-            pub const DIV32: Self = Self(0x04);
-            #[doc = "f_PCLK / 64"]
-            pub const DIV64: Self = Self(0x05);
-            #[doc = "f_PCLK / 128"]
-            pub const DIV128: Self = Self(0x06);
-            #[doc = "f_PCLK / 256"]
-            pub const DIV256: Self = Self(0x07);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Bidioe(pub u8);
-        impl Bidioe {
-            #[doc = "Output disabled (receive-only mode)"]
-            pub const OUTPUTDISABLED: Self = Self(0);
-            #[doc = "Output enabled (transmit-only mode)"]
-            pub const OUTPUTENABLED: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Frf(pub u8);
-        impl Frf {
-            #[doc = "SPI Motorola mode"]
-            pub const MOTOROLA: Self = Self(0);
-            #[doc = "SPI TI mode"]
-            pub const TI: Self = Self(0x01);
-        }
-    }
-}
-pub mod syscfg_f4 {
-    use crate::generic::*;
-    #[doc = "System configuration controller"]
-    #[derive(Copy, Clone)]
-    pub struct Syscfg(pub *mut u8);
-    unsafe impl Send for Syscfg {}
-    unsafe impl Sync for Syscfg {}
-    impl Syscfg {
-        #[doc = "memory remap register"]
-        pub fn memrm(self) -> Reg<regs::Memrm, RW> {
-            unsafe { Reg::from_ptr(self.0.add(0usize)) }
-        }
-        #[doc = "peripheral mode configuration register"]
-        pub fn pmc(self) -> Reg<regs::Pmc, RW> {
-            unsafe { Reg::from_ptr(self.0.add(4usize)) }
-        }
-        #[doc = "external interrupt configuration register"]
-        pub fn exticr(self, n: usize) -> Reg<regs::Exticr, RW> {
-            assert!(n < 4usize);
-            unsafe { Reg::from_ptr(self.0.add(8usize + n * 4usize)) }
-        }
-        #[doc = "Compensation cell control register"]
-        pub fn cmpcr(self) -> Reg<regs::Cmpcr, R> {
-            unsafe { Reg::from_ptr(self.0.add(32usize)) }
-        }
-    }
-    pub mod regs {
-        use crate::generic::*;
-        #[doc = "external interrupt configuration register"]
+        #[doc = "status register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Exticr(pub u32);
-        impl Exticr {
-            #[doc = "EXTI x configuration"]
-            pub fn exti(&self, n: usize) -> u8 {
-                assert!(n < 4usize);
-                let offs = 0usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x0f;
-                val as u8
+        pub struct Sr(pub u32);
+        impl Sr {
+            #[doc = "Receive buffer not empty"]
+            pub const fn rxne(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
+                val != 0
             }
-            #[doc = "EXTI x configuration"]
-            pub fn set_exti(&mut self, n: usize, val: u8) {
-                assert!(n < 4usize);
-                let offs = 0usize + n * 4usize;
-                self.0 = (self.0 & !(0x0f << offs)) | (((val as u32) & 0x0f) << offs);
+            #[doc = "Receive buffer not empty"]
+            pub fn set_rxne(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-        }
-        impl Default for Exticr {
-            fn default() -> Exticr {
-                Exticr(0)
+            #[doc = "Transmit buffer empty"]
+            pub const fn txe(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
+                val != 0
             }
-        }
-        #[doc = "memory remap register"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Memrm(pub u32);
-        impl Memrm {
-            #[doc = "Memory mapping selection"]
-            pub const fn mem_mode(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x07;
-                val as u8
+            #[doc = "Transmit buffer empty"]
+            pub fn set_txe(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "Memory mapping selection"]
-            pub fn set_mem_mode(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x07 << 0usize)) | (((val as u32) & 0x07) << 0usize);
+            #[doc = "CRC error flag"]
+            pub const fn crcerr(&self) -> bool {
+                let val = (self.0 >> 4usize) & 0x01;
+                val != 0
             }
-            #[doc = "Flash bank mode selection"]
-            pub const fn fb_mode(&self) -> bool {
+            #[doc = "CRC error flag"]
+            pub fn set_crcerr(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
+            }
+            #[doc = "Mode fault"]
+            pub const fn modf(&self) -> bool {
+                let val = (self.0 >> 5usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Mode fault"]
+            pub fn set_modf(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+            }
+            #[doc = "Overrun flag"]
+            pub const fn ovr(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Overrun flag"]
+            pub fn set_ovr(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            }
+            #[doc = "Busy flag"]
+            pub const fn bsy(&self) -> bool {
+                let val = (self.0 >> 7usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Busy flag"]
+            pub fn set_bsy(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            }
+            #[doc = "Frame format error"]
+            pub const fn fre(&self) -> bool {
                 let val = (self.0 >> 8usize) & 0x01;
                 val != 0
             }
-            #[doc = "Flash bank mode selection"]
-            pub fn set_fb_mode(&mut self, val: bool) {
+            #[doc = "Frame format error"]
+            pub fn set_fre(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
-            #[doc = "FMC memory mapping swap"]
-            pub const fn swp_fmc(&self) -> u8 {
-                let val = (self.0 >> 10usize) & 0x03;
+            #[doc = "FIFO reception level"]
+            pub const fn frlvl(&self) -> u8 {
+                let val = (self.0 >> 9usize) & 0x03;
                 val as u8
             }
-            #[doc = "FMC memory mapping swap"]
-            pub fn set_swp_fmc(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x03 << 10usize)) | (((val as u32) & 0x03) << 10usize);
+            #[doc = "FIFO reception level"]
+            pub fn set_frlvl(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x03 << 9usize)) | (((val as u32) & 0x03) << 9usize);
+            }
+            #[doc = "FIFO Transmission Level"]
+            pub const fn ftlvl(&self) -> u8 {
+                let val = (self.0 >> 11usize) & 0x03;
+                val as u8
+            }
+            #[doc = "FIFO Transmission Level"]
+            pub fn set_ftlvl(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x03 << 11usize)) | (((val as u32) & 0x03) << 11usize);
             }
         }
-        impl Default for Memrm {
-            fn default() -> Memrm {
-                Memrm(0)
+        impl Default for Sr {
+            fn default() -> Sr {
+                Sr(0)
             }
         }
-        #[doc = "peripheral mode configuration register"]
+        #[doc = "control register 2"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Pmc(pub u32);
-        impl Pmc {
-            #[doc = "ADC1DC2"]
-            pub const fn adc1dc2(&self) -> bool {
-                let val = (self.0 >> 16usize) & 0x01;
+        pub struct Cr2(pub u32);
+        impl Cr2 {
+            #[doc = "Rx buffer DMA enable"]
+            pub const fn rxdmaen(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "ADC1DC2"]
-            pub fn set_adc1dc2(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
+            #[doc = "Rx buffer DMA enable"]
+            pub fn set_rxdmaen(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "ADC2DC2"]
-            pub const fn adc2dc2(&self) -> bool {
-                let val = (self.0 >> 17usize) & 0x01;
+            #[doc = "Tx buffer DMA enable"]
+            pub const fn txdmaen(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
                 val != 0
             }
-            #[doc = "ADC2DC2"]
-            pub fn set_adc2dc2(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 17usize)) | (((val as u32) & 0x01) << 17usize);
+            #[doc = "Tx buffer DMA enable"]
+            pub fn set_txdmaen(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "ADC3DC2"]
-            pub const fn adc3dc2(&self) -> bool {
-                let val = (self.0 >> 18usize) & 0x01;
+            #[doc = "SS output enable"]
+            pub const fn ssoe(&self) -> bool {
+                let val = (self.0 >> 2usize) & 0x01;
                 val != 0
             }
-            #[doc = "ADC3DC2"]
-            pub fn set_adc3dc2(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 18usize)) | (((val as u32) & 0x01) << 18usize);
+            #[doc = "SS output enable"]
+            pub fn set_ssoe(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
             }
-            #[doc = "Ethernet PHY interface selection"]
-            pub const fn mii_rmii_sel(&self) -> bool {
-                let val = (self.0 >> 23usize) & 0x01;
+            #[doc = "NSS pulse management"]
+            pub const fn nssp(&self) -> bool {
+                let val = (self.0 >> 3usize) & 0x01;
                 val != 0
             }
-            #[doc = "Ethernet PHY interface selection"]
-            pub fn set_mii_rmii_sel(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 23usize)) | (((val as u32) & 0x01) << 23usize);
+            #[doc = "NSS pulse management"]
+            pub fn set_nssp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
             }
-        }
-        impl Default for Pmc {
-            fn default() -> Pmc {
-                Pmc(0)
+            #[doc = "Frame format"]
+            pub const fn frf(&self) -> super::vals::Frf {
+                let val = (self.0 >> 4usize) & 0x01;
+                super::vals::Frf(val as u8)
             }
-        }
-        #[doc = "Compensation cell control register"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cmpcr(pub u32);
-        impl Cmpcr {
-            #[doc = "Compensation cell power-down"]
-            pub const fn cmp_pd(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
+            #[doc = "Frame format"]
+            pub fn set_frf(&mut self, val: super::vals::Frf) {
+                self.0 = (self.0 & !(0x01 << 4usize)) | (((val.0 as u32) & 0x01) << 4usize);
+            }
+            #[doc = "Error interrupt enable"]
+            pub const fn errie(&self) -> bool {
+                let val = (self.0 >> 5usize) & 0x01;
                 val != 0
             }
-            #[doc = "Compensation cell power-down"]
-            pub fn set_cmp_pd(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            #[doc = "Error interrupt enable"]
+            pub fn set_errie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
             }
-            #[doc = "READY"]
-            pub const fn ready(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
+            #[doc = "RX buffer not empty interrupt enable"]
+            pub const fn rxneie(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
                 val != 0
             }
-            #[doc = "READY"]
-            pub fn set_ready(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            #[doc = "RX buffer not empty interrupt enable"]
+            pub fn set_rxneie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
-        }
-        impl Default for Cmpcr {
-            fn default() -> Cmpcr {
-                Cmpcr(0)
+            #[doc = "Tx buffer empty interrupt enable"]
+            pub const fn txeie(&self) -> bool {
+                let val = (self.0 >> 7usize) & 0x01;
+                val != 0
             }
-        }
-    }
-}
-pub mod gpio_v1 {
-    use crate::generic::*;
-    #[doc = "General purpose I/O"]
-    #[derive(Copy, Clone)]
-    pub struct Gpio(pub *mut u8);
-    unsafe impl Send for Gpio {}
-    unsafe impl Sync for Gpio {}
-    impl Gpio {
-        #[doc = "Port configuration register low (GPIOn_CRL)"]
-        pub fn cr(self, n: usize) -> Reg<regs::Cr, RW> {
-            assert!(n < 2usize);
-            unsafe { Reg::from_ptr(self.0.add(0usize + n * 4usize)) }
-        }
-        #[doc = "Port input data register (GPIOn_IDR)"]
-        pub fn idr(self) -> Reg<regs::Idr, R> {
-            unsafe { Reg::from_ptr(self.0.add(8usize)) }
-        }
-        #[doc = "Port output data register (GPIOn_ODR)"]
-        pub fn odr(self) -> Reg<regs::Odr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(12usize)) }
-        }
-        #[doc = "Port bit set/reset register (GPIOn_BSRR)"]
-        pub fn bsrr(self) -> Reg<regs::Bsrr, W> {
-            unsafe { Reg::from_ptr(self.0.add(16usize)) }
-        }
-        #[doc = "Port bit reset register (GPIOn_BRR)"]
-        pub fn brr(self) -> Reg<regs::Brr, W> {
-            unsafe { Reg::from_ptr(self.0.add(20usize)) }
-        }
-        #[doc = "Port configuration lock register"]
-        pub fn lckr(self) -> Reg<regs::Lckr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(24usize)) }
-        }
-    }
-    pub mod regs {
-        use crate::generic::*;
-        #[doc = "Port configuration lock register"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Lckr(pub u32);
-        impl Lckr {
-            #[doc = "Port A Lock bit"]
-            pub fn lck(&self, n: usize) -> super::vals::Lck {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                super::vals::Lck(val as u8)
+            #[doc = "Tx buffer empty interrupt enable"]
+            pub fn set_txeie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
             }
-            #[doc = "Port A Lock bit"]
-            pub fn set_lck(&mut self, n: usize, val: super::vals::Lck) {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
+            #[doc = "Data size"]
+            pub const fn ds(&self) -> super::vals::Ds {
+                let val = (self.0 >> 8usize) & 0x0f;
+                super::vals::Ds(val as u8)
             }
-            #[doc = "Lock key"]
-            pub const fn lckk(&self) -> super::vals::Lckk {
-                let val = (self.0 >> 16usize) & 0x01;
-                super::vals::Lckk(val as u8)
+            #[doc = "Data size"]
+            pub fn set_ds(&mut self, val: super::vals::Ds) {
+                self.0 = (self.0 & !(0x0f << 8usize)) | (((val.0 as u32) & 0x0f) << 8usize);
             }
-            #[doc = "Lock key"]
-            pub fn set_lckk(&mut self, val: super::vals::Lckk) {
-                self.0 = (self.0 & !(0x01 << 16usize)) | (((val.0 as u32) & 0x01) << 16usize);
+            #[doc = "FIFO reception threshold"]
+            pub const fn frxth(&self) -> super::vals::Frxth {
+                let val = (self.0 >> 12usize) & 0x01;
+                super::vals::Frxth(val as u8)
             }
-        }
-        impl Default for Lckr {
-            fn default() -> Lckr {
-                Lckr(0)
+            #[doc = "FIFO reception threshold"]
+            pub fn set_frxth(&mut self, val: super::vals::Frxth) {
+                self.0 = (self.0 & !(0x01 << 12usize)) | (((val.0 as u32) & 0x01) << 12usize);
             }
-        }
-        #[doc = "Port configuration register (GPIOn_CRx)"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr(pub u32);
-        impl Cr {
-            #[doc = "Port n mode bits"]
-            pub fn mode(&self, n: usize) -> super::vals::Mode {
-                assert!(n < 8usize);
-                let offs = 0usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x03;
-                super::vals::Mode(val as u8)
+            #[doc = "Last DMA transfer for reception"]
+            pub const fn ldma_rx(&self) -> super::vals::LdmaRx {
+                let val = (self.0 >> 13usize) & 0x01;
+                super::vals::LdmaRx(val as u8)
             }
-            #[doc = "Port n mode bits"]
-            pub fn set_mode(&mut self, n: usize, val: super::vals::Mode) {
-                assert!(n < 8usize);
-                let offs = 0usize + n * 4usize;
-                self.0 = (self.0 & !(0x03 << offs)) | (((val.0 as u32) & 0x03) << offs);
+            #[doc = "Last DMA transfer for reception"]
+            pub fn set_ldma_rx(&mut self, val: super::vals::LdmaRx) {
+                self.0 = (self.0 & !(0x01 << 13usize)) | (((val.0 as u32) & 0x01) << 13usize);
             }
-            #[doc = "Port n configuration bits"]
-            pub fn cnf(&self, n: usize) -> super::vals::Cnf {
-                assert!(n < 8usize);
-                let offs = 2usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x03;
-                super::vals::Cnf(val as u8)
+            #[doc = "Last DMA transfer for transmission"]
+            pub const fn ldma_tx(&self) -> super::vals::LdmaTx {
+                let val = (self.0 >> 14usize) & 0x01;
+                super::vals::LdmaTx(val as u8)
             }
-            #[doc = "Port n configuration bits"]
-            pub fn set_cnf(&mut self, n: usize, val: super::vals::Cnf) {
-                assert!(n < 8usize);
-                let offs = 2usize + n * 4usize;
-                self.0 = (self.0 & !(0x03 << offs)) | (((val.0 as u32) & 0x03) << offs);
+            #[doc = "Last DMA transfer for transmission"]
+            pub fn set_ldma_tx(&mut self, val: super::vals::LdmaTx) {
+                self.0 = (self.0 & !(0x01 << 14usize)) | (((val.0 as u32) & 0x01) << 14usize);
             }
         }
-        impl Default for Cr {
-            fn default() -> Cr {
-                Cr(0)
+        impl Default for Cr2 {
+            fn default() -> Cr2 {
+                Cr2(0)
             }
         }
-        #[doc = "Port bit set/reset register (GPIOn_BSRR)"]
+        #[doc = "data register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Bsrr(pub u32);
-        impl Bsrr {
-            #[doc = "Set bit"]
-            pub fn bs(&self, n: usize) -> bool {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
-            }
-            #[doc = "Set bit"]
-            pub fn set_bs(&mut self, n: usize, val: bool) {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
-            }
-            #[doc = "Reset bit"]
-            pub fn br(&self, n: usize) -> bool {
-                assert!(n < 16usize);
-                let offs = 16usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
+        pub struct Dr(pub u32);
+        impl Dr {
+            #[doc = "Data register"]
+            pub const fn dr(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0xffff;
+                val as u16
             }
-            #[doc = "Reset bit"]
-            pub fn set_br(&mut self, n: usize, val: bool) {
-                assert!(n < 16usize);
-                let offs = 16usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Data register"]
+            pub fn set_dr(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
         }
-        impl Default for Bsrr {
-            fn default() -> Bsrr {
-                Bsrr(0)
+        impl Default for Dr {
+            fn default() -> Dr {
+                Dr(0)
             }
         }
-        #[doc = "Port output data register (GPIOn_ODR)"]
+        #[doc = "CRC polynomial register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Odr(pub u32);
-        impl Odr {
-            #[doc = "Port output data"]
-            pub fn odr(&self, n: usize) -> super::vals::Odr {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                super::vals::Odr(val as u8)
+        pub struct Crcpr(pub u32);
+        impl Crcpr {
+            #[doc = "CRC polynomial register"]
+            pub const fn crcpoly(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0xffff;
+                val as u16
             }
-            #[doc = "Port output data"]
-            pub fn set_odr(&mut self, n: usize, val: super::vals::Odr) {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
+            #[doc = "CRC polynomial register"]
+            pub fn set_crcpoly(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
         }
-        impl Default for Odr {
-            fn default() -> Odr {
-                Odr(0)
+        impl Default for Crcpr {
+            fn default() -> Crcpr {
+                Crcpr(0)
             }
         }
-        #[doc = "Port bit reset register (GPIOn_BRR)"]
+        #[doc = "RX CRC register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Brr(pub u32);
-        impl Brr {
-            #[doc = "Reset bit"]
-            pub fn br(&self, n: usize) -> bool {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
+        pub struct Rxcrcr(pub u32);
+        impl Rxcrcr {
+            #[doc = "Rx CRC register"]
+            pub const fn rx_crc(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0xffff;
+                val as u16
             }
-            #[doc = "Reset bit"]
-            pub fn set_br(&mut self, n: usize, val: bool) {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Rx CRC register"]
+            pub fn set_rx_crc(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
         }
-        impl Default for Brr {
-            fn default() -> Brr {
-                Brr(0)
+        impl Default for Rxcrcr {
+            fn default() -> Rxcrcr {
+                Rxcrcr(0)
             }
         }
-        #[doc = "Port input data register (GPIOn_IDR)"]
+        #[doc = "TX CRC register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Idr(pub u32);
-        impl Idr {
-            #[doc = "Port input data"]
-            pub fn idr(&self, n: usize) -> super::vals::Idr {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                super::vals::Idr(val as u8)
+        pub struct Txcrcr(pub u32);
+        impl Txcrcr {
+            #[doc = "Tx CRC register"]
+            pub const fn tx_crc(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0xffff;
+                val as u16
             }
-            #[doc = "Port input data"]
-            pub fn set_idr(&mut self, n: usize, val: super::vals::Idr) {
-                assert!(n < 16usize);
-                let offs = 0usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
+            #[doc = "Tx CRC register"]
+            pub fn set_tx_crc(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
         }
-        impl Default for Idr {
-            fn default() -> Idr {
-                Idr(0)
+        impl Default for Txcrcr {
+            fn default() -> Txcrcr {
+                Txcrcr(0)
             }
         }
     }
-    pub mod vals {
-        use crate::generic::*;
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Cnf(pub u8);
-        impl Cnf {
-            #[doc = "Analog mode / Push-Pull mode"]
-            pub const PUSHPULL: Self = Self(0);
-            #[doc = "Floating input (reset state) / Open Drain-Mode"]
-            pub const OPENDRAIN: Self = Self(0x01);
-            #[doc = "Input with pull-up/pull-down / Alternate Function Push-Pull Mode"]
-            pub const ALTPUSHPULL: Self = Self(0x02);
-            #[doc = "Alternate Function Open-Drain Mode"]
-            pub const ALTOPENDRAIN: Self = Self(0x03);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Lck(pub u8);
-        impl Lck {
-            #[doc = "Port configuration not locked"]
-            pub const UNLOCKED: Self = Self(0);
-            #[doc = "Port configuration locked"]
-            pub const LOCKED: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Mode(pub u8);
-        impl Mode {
-            #[doc = "Input mode (reset state)"]
-            pub const INPUT: Self = Self(0);
-            #[doc = "Output mode 10 MHz"]
-            pub const OUTPUT: Self = Self(0x01);
-            #[doc = "Output mode 2 MHz"]
-            pub const OUTPUT2: Self = Self(0x02);
-            #[doc = "Output mode 50 MHz"]
-            pub const OUTPUT50: Self = Self(0x03);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Lckk(pub u8);
-        impl Lckk {
-            #[doc = "Port configuration lock key not active"]
-            pub const NOTACTIVE: Self = Self(0);
-            #[doc = "Port configuration lock key active"]
-            pub const ACTIVE: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Idr(pub u8);
-        impl Idr {
-            #[doc = "Input is logic low"]
-            pub const LOW: Self = Self(0);
-            #[doc = "Input is logic high"]
-            pub const HIGH: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Bsw(pub u8);
-        impl Bsw {
-            #[doc = "No action on the corresponding ODx bit"]
-            pub const NOACTION: Self = Self(0);
-            #[doc = "Sets the corresponding ODRx bit"]
-            pub const SET: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Odr(pub u8);
-        impl Odr {
-            #[doc = "Set output to logic low"]
-            pub const LOW: Self = Self(0);
-            #[doc = "Set output to logic high"]
-            pub const HIGH: Self = Self(0x01);
-        }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Brw(pub u8);
-        impl Brw {
-            #[doc = "No action on the corresponding ODx bit"]
-            pub const NOACTION: Self = Self(0);
-            #[doc = "Reset the ODx bit"]
-            pub const RESET: Self = Self(0x01);
-        }
-    }
 }
-pub mod dma_v1 {
+pub mod dma_v2 {
     use crate::generic::*;
     #[doc = "DMA controller"]
     #[derive(Copy, Clone)]
@@ -6734,119 +6511,333 @@ pub mod dma_v1 {
     unsafe impl Send for Dma {}
     unsafe impl Sync for Dma {}
     impl Dma {
-        #[doc = "DMA interrupt status register (DMA_ISR)"]
-        pub fn isr(self) -> Reg<regs::Isr, R> {
-            unsafe { Reg::from_ptr(self.0.add(0usize)) }
+        #[doc = "low interrupt status register"]
+        pub fn isr(self, n: usize) -> Reg<regs::Isr, R> {
+            assert!(n < 2usize);
+            unsafe { Reg::from_ptr(self.0.add(0usize + n * 4usize)) }
         }
-        #[doc = "DMA interrupt flag clear register (DMA_IFCR)"]
-        pub fn ifcr(self) -> Reg<regs::Ifcr, W> {
-            unsafe { Reg::from_ptr(self.0.add(4usize)) }
+        #[doc = "low interrupt flag clear register"]
+        pub fn ifcr(self, n: usize) -> Reg<regs::Ifcr, W> {
+            assert!(n < 2usize);
+            unsafe { Reg::from_ptr(self.0.add(8usize + n * 4usize)) }
         }
-        #[doc = "Channel cluster: CCR?, CNDTR?, CPAR?, and CMAR? registers"]
-        pub fn ch(self, n: usize) -> Ch {
-            assert!(n < 7usize);
-            unsafe { Ch(self.0.add(8usize + n * 20usize)) }
+        #[doc = "Stream cluster: S?CR, S?NDTR, S?M0AR, S?M1AR and S?FCR registers"]
+        pub fn st(self, n: usize) -> St {
+            assert!(n < 8usize);
+            unsafe { St(self.0.add(16usize + n * 24usize)) }
         }
     }
-    #[doc = "Channel cluster: CCR?, CNDTR?, CPAR?, and CMAR? registers"]
+    #[doc = "Stream cluster: S?CR, S?NDTR, S?M0AR, S?M1AR and S?FCR registers"]
     #[derive(Copy, Clone)]
-    pub struct Ch(pub *mut u8);
-    unsafe impl Send for Ch {}
-    unsafe impl Sync for Ch {}
-    impl Ch {
-        #[doc = "DMA channel configuration register (DMA_CCR)"]
+    pub struct St(pub *mut u8);
+    unsafe impl Send for St {}
+    unsafe impl Sync for St {}
+    impl St {
+        #[doc = "stream x configuration register"]
         pub fn cr(self) -> Reg<regs::Cr, RW> {
             unsafe { Reg::from_ptr(self.0.add(0usize)) }
         }
-        #[doc = "DMA channel 1 number of data register"]
+        #[doc = "stream x number of data register"]
         pub fn ndtr(self) -> Reg<regs::Ndtr, RW> {
             unsafe { Reg::from_ptr(self.0.add(4usize)) }
         }
-        #[doc = "DMA channel 1 peripheral address register"]
+        #[doc = "stream x peripheral address register"]
         pub fn par(self) -> Reg<u32, RW> {
             unsafe { Reg::from_ptr(self.0.add(8usize)) }
         }
-        #[doc = "DMA channel 1 memory address register"]
-        pub fn mar(self) -> Reg<u32, RW> {
+        #[doc = "stream x memory 0 address register"]
+        pub fn m0ar(self) -> Reg<u32, RW> {
             unsafe { Reg::from_ptr(self.0.add(12usize)) }
         }
+        #[doc = "stream x memory 1 address register"]
+        pub fn m1ar(self) -> Reg<u32, RW> {
+            unsafe { Reg::from_ptr(self.0.add(16usize)) }
+        }
+        #[doc = "stream x FIFO control register"]
+        pub fn fcr(self) -> Reg<regs::Fcr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(20usize)) }
+        }
     }
     pub mod vals {
         use crate::generic::*;
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Inc(pub u8);
-        impl Inc {
-            #[doc = "Increment mode disabled"]
-            pub const DISABLED: Self = Self(0);
-            #[doc = "Increment mode enabled"]
-            pub const ENABLED: Self = Self(0x01);
+        pub struct Pincos(pub u8);
+        impl Pincos {
+            #[doc = "The offset size for the peripheral address calculation is linked to the PSIZE"]
+            pub const PSIZE: Self = Self(0);
+            #[doc = "The offset size for the peripheral address calculation is fixed to 4 (32-bit alignment)"]
+            pub const FIXED4: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Dir(pub u8);
-        impl Dir {
-            #[doc = "Read from peripheral"]
-            pub const FROMPERIPHERAL: Self = Self(0);
-            #[doc = "Read from memory"]
-            pub const FROMMEMORY: Self = Self(0x01);
+        pub struct Fs(pub u8);
+        impl Fs {
+            #[doc = "0 < fifo_level < 1/4"]
+            pub const QUARTER1: Self = Self(0);
+            #[doc = "1/4 <= fifo_level < 1/2"]
+            pub const QUARTER2: Self = Self(0x01);
+            #[doc = "1/2 <= fifo_level < 3/4"]
+            pub const QUARTER3: Self = Self(0x02);
+            #[doc = "3/4 <= fifo_level < full"]
+            pub const QUARTER4: Self = Self(0x03);
+            #[doc = "FIFO is empty"]
+            pub const EMPTY: Self = Self(0x04);
+            #[doc = "FIFO is full"]
+            pub const FULL: Self = Self(0x05);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Circ(pub u8);
-        impl Circ {
-            #[doc = "Circular buffer disabled"]
+        pub struct Burst(pub u8);
+        impl Burst {
+            #[doc = "Single transfer"]
+            pub const SINGLE: Self = Self(0);
+            #[doc = "Incremental burst of 4 beats"]
+            pub const INCR4: Self = Self(0x01);
+            #[doc = "Incremental burst of 8 beats"]
+            pub const INCR8: Self = Self(0x02);
+            #[doc = "Incremental burst of 16 beats"]
+            pub const INCR16: Self = Self(0x03);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Dbm(pub u8);
+        impl Dbm {
+            #[doc = "No buffer switching at the end of transfer"]
             pub const DISABLED: Self = Self(0);
-            #[doc = "Circular buffer enabled"]
+            #[doc = "Memory target switched at the end of the DMA transfer"]
             pub const ENABLED: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Size(pub u8);
-        impl Size {
-            #[doc = "8-bit size"]
-            pub const BITS8: Self = Self(0);
-            #[doc = "16-bit size"]
-            pub const BITS16: Self = Self(0x01);
-            #[doc = "32-bit size"]
-            pub const BITS32: Self = Self(0x02);
+        pub struct Inc(pub u8);
+        impl Inc {
+            #[doc = "Address pointer is fixed"]
+            pub const FIXED: Self = Self(0);
+            #[doc = "Address pointer is incremented after each data transfer"]
+            pub const INCREMENTED: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Dir(pub u8);
+        impl Dir {
+            #[doc = "Peripheral-to-memory"]
+            pub const PERIPHERALTOMEMORY: Self = Self(0);
+            #[doc = "Memory-to-peripheral"]
+            pub const MEMORYTOPERIPHERAL: Self = Self(0x01);
+            #[doc = "Memory-to-memory"]
+            pub const MEMORYTOMEMORY: Self = Self(0x02);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Pfctrl(pub u8);
+        impl Pfctrl {
+            #[doc = "The DMA is the flow controller"]
+            pub const DMA: Self = Self(0);
+            #[doc = "The peripheral is the flow controller"]
+            pub const PERIPHERAL: Self = Self(0x01);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
         pub struct Pl(pub u8);
         impl Pl {
-            #[doc = "Low priority"]
+            #[doc = "Low"]
             pub const LOW: Self = Self(0);
-            #[doc = "Medium priority"]
+            #[doc = "Medium"]
             pub const MEDIUM: Self = Self(0x01);
-            #[doc = "High priority"]
+            #[doc = "High"]
             pub const HIGH: Self = Self(0x02);
-            #[doc = "Very high priority"]
+            #[doc = "Very high"]
             pub const VERYHIGH: Self = Self(0x03);
         }
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Memmem(pub u8);
-        impl Memmem {
-            #[doc = "Memory to memory mode disabled"]
+        pub struct Circ(pub u8);
+        impl Circ {
+            #[doc = "Circular mode disabled"]
             pub const DISABLED: Self = Self(0);
-            #[doc = "Memory to memory mode enabled"]
+            #[doc = "Circular mode enabled"]
             pub const ENABLED: Self = Self(0x01);
         }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Fth(pub u8);
+        impl Fth {
+            #[doc = "1/4 full FIFO"]
+            pub const QUARTER: Self = Self(0);
+            #[doc = "1/2 full FIFO"]
+            pub const HALF: Self = Self(0x01);
+            #[doc = "3/4 full FIFO"]
+            pub const THREEQUARTERS: Self = Self(0x02);
+            #[doc = "Full FIFO"]
+            pub const FULL: Self = Self(0x03);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Ct(pub u8);
+        impl Ct {
+            #[doc = "The current target memory is Memory 0"]
+            pub const MEMORY0: Self = Self(0);
+            #[doc = "The current target memory is Memory 1"]
+            pub const MEMORY1: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Dmdis(pub u8);
+        impl Dmdis {
+            #[doc = "Direct mode is enabled"]
+            pub const ENABLED: Self = Self(0);
+            #[doc = "Direct mode is disabled"]
+            pub const DISABLED: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Size(pub u8);
+        impl Size {
+            #[doc = "Byte (8-bit)"]
+            pub const BITS8: Self = Self(0);
+            #[doc = "Half-word (16-bit)"]
+            pub const BITS16: Self = Self(0x01);
+            #[doc = "Word (32-bit)"]
+            pub const BITS32: Self = Self(0x02);
+        }
     }
     pub mod regs {
         use crate::generic::*;
-        #[doc = "DMA channel 1 number of data register"]
+        #[doc = "low interrupt flag clear register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Ifcr(pub u32);
+        impl Ifcr {
+            #[doc = "Stream x clear FIFO error interrupt flag (x = 3..0)"]
+            pub fn cfeif(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 0usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
+            }
+            #[doc = "Stream x clear FIFO error interrupt flag (x = 3..0)"]
+            pub fn set_cfeif(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 0usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            }
+            #[doc = "Stream x clear direct mode error interrupt flag (x = 3..0)"]
+            pub fn cdmeif(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 2usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
+            }
+            #[doc = "Stream x clear direct mode error interrupt flag (x = 3..0)"]
+            pub fn set_cdmeif(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 2usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            }
+            #[doc = "Stream x clear transfer error interrupt flag (x = 3..0)"]
+            pub fn cteif(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 3usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
+            }
+            #[doc = "Stream x clear transfer error interrupt flag (x = 3..0)"]
+            pub fn set_cteif(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 3usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            }
+            #[doc = "Stream x clear half transfer interrupt flag (x = 3..0)"]
+            pub fn chtif(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 4usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
+            }
+            #[doc = "Stream x clear half transfer interrupt flag (x = 3..0)"]
+            pub fn set_chtif(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 4usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            }
+            #[doc = "Stream x clear transfer complete interrupt flag (x = 3..0)"]
+            pub fn ctcif(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 5usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
+            }
+            #[doc = "Stream x clear transfer complete interrupt flag (x = 3..0)"]
+            pub fn set_ctcif(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 5usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            }
+        }
+        impl Default for Ifcr {
+            fn default() -> Ifcr {
+                Ifcr(0)
+            }
+        }
+        #[doc = "stream x FIFO control register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Fcr(pub u32);
+        impl Fcr {
+            #[doc = "FIFO threshold selection"]
+            pub const fn fth(&self) -> super::vals::Fth {
+                let val = (self.0 >> 0usize) & 0x03;
+                super::vals::Fth(val as u8)
+            }
+            #[doc = "FIFO threshold selection"]
+            pub fn set_fth(&mut self, val: super::vals::Fth) {
+                self.0 = (self.0 & !(0x03 << 0usize)) | (((val.0 as u32) & 0x03) << 0usize);
+            }
+            #[doc = "Direct mode disable"]
+            pub const fn dmdis(&self) -> super::vals::Dmdis {
+                let val = (self.0 >> 2usize) & 0x01;
+                super::vals::Dmdis(val as u8)
+            }
+            #[doc = "Direct mode disable"]
+            pub fn set_dmdis(&mut self, val: super::vals::Dmdis) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val.0 as u32) & 0x01) << 2usize);
+            }
+            #[doc = "FIFO status"]
+            pub const fn fs(&self) -> super::vals::Fs {
+                let val = (self.0 >> 3usize) & 0x07;
+                super::vals::Fs(val as u8)
+            }
+            #[doc = "FIFO status"]
+            pub fn set_fs(&mut self, val: super::vals::Fs) {
+                self.0 = (self.0 & !(0x07 << 3usize)) | (((val.0 as u32) & 0x07) << 3usize);
+            }
+            #[doc = "FIFO error interrupt enable"]
+            pub const fn feie(&self) -> bool {
+                let val = (self.0 >> 7usize) & 0x01;
+                val != 0
+            }
+            #[doc = "FIFO error interrupt enable"]
+            pub fn set_feie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            }
+        }
+        impl Default for Fcr {
+            fn default() -> Fcr {
+                Fcr(0)
+            }
+        }
+        #[doc = "stream x number of data register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
         pub struct Ndtr(pub u32);
         impl Ndtr {
-            #[doc = "Number of data to transfer"]
+            #[doc = "Number of data items to transfer"]
             pub const fn ndt(&self) -> u16 {
                 let val = (self.0 >> 0usize) & 0xffff;
                 val as u16
             }
-            #[doc = "Number of data to transfer"]
+            #[doc = "Number of data items to transfer"]
             pub fn set_ndt(&mut self, val: u16) {
                 self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
@@ -6856,61 +6847,74 @@ pub mod dma_v1 {
                 Ndtr(0)
             }
         }
-        #[doc = "DMA interrupt status register (DMA_ISR)"]
+        #[doc = "low interrupt status register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
         pub struct Isr(pub u32);
         impl Isr {
-            #[doc = "Channel 1 Global interrupt flag"]
-            pub fn gif(&self, n: usize) -> bool {
-                assert!(n < 7usize);
-                let offs = 0usize + n * 4usize;
+            #[doc = "Stream x FIFO error interrupt flag (x=3..0)"]
+            pub fn feif(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 0usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
                 let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Channel 1 Global interrupt flag"]
-            pub fn set_gif(&mut self, n: usize, val: bool) {
-                assert!(n < 7usize);
-                let offs = 0usize + n * 4usize;
+            #[doc = "Stream x FIFO error interrupt flag (x=3..0)"]
+            pub fn set_feif(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 0usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
                 self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Channel 1 Transfer Complete flag"]
-            pub fn tcif(&self, n: usize) -> bool {
-                assert!(n < 7usize);
-                let offs = 1usize + n * 4usize;
+            #[doc = "Stream x direct mode error interrupt flag (x=3..0)"]
+            pub fn dmeif(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 2usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
                 let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Channel 1 Transfer Complete flag"]
-            pub fn set_tcif(&mut self, n: usize, val: bool) {
-                assert!(n < 7usize);
-                let offs = 1usize + n * 4usize;
+            #[doc = "Stream x direct mode error interrupt flag (x=3..0)"]
+            pub fn set_dmeif(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 2usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
                 self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Channel 1 Half Transfer Complete flag"]
+            #[doc = "Stream x transfer error interrupt flag (x=3..0)"]
+            pub fn teif(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 3usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
+            }
+            #[doc = "Stream x transfer error interrupt flag (x=3..0)"]
+            pub fn set_teif(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 3usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            }
+            #[doc = "Stream x half transfer interrupt flag (x=3..0)"]
             pub fn htif(&self, n: usize) -> bool {
-                assert!(n < 7usize);
-                let offs = 2usize + n * 4usize;
+                assert!(n < 4usize);
+                let offs = 4usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
                 let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Channel 1 Half Transfer Complete flag"]
+            #[doc = "Stream x half transfer interrupt flag (x=3..0)"]
             pub fn set_htif(&mut self, n: usize, val: bool) {
-                assert!(n < 7usize);
-                let offs = 2usize + n * 4usize;
+                assert!(n < 4usize);
+                let offs = 4usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
                 self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Channel 1 Transfer Error flag"]
-            pub fn teif(&self, n: usize) -> bool {
-                assert!(n < 7usize);
-                let offs = 3usize + n * 4usize;
+            #[doc = "Stream x transfer complete interrupt flag (x = 3..0)"]
+            pub fn tcif(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 5usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
                 let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Channel 1 Transfer Error flag"]
-            pub fn set_teif(&mut self, n: usize, val: bool) {
-                assert!(n < 7usize);
-                let offs = 3usize + n * 4usize;
+            #[doc = "Stream x transfer complete interrupt flag (x = 3..0)"]
+            pub fn set_tcif(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 5usize + ([0usize, 6usize, 16usize, 22usize][n] as usize);
                 self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
         }
@@ -6919,2185 +6923,2181 @@ pub mod dma_v1 {
                 Isr(0)
             }
         }
-        #[doc = "DMA channel configuration register (DMA_CCR)"]
+        #[doc = "stream x configuration register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
         pub struct Cr(pub u32);
         impl Cr {
-            #[doc = "Channel enable"]
+            #[doc = "Stream enable / flag stream ready when read low"]
             pub const fn en(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Channel enable"]
+            #[doc = "Stream enable / flag stream ready when read low"]
             pub fn set_en(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Transfer complete interrupt enable"]
-            pub const fn tcie(&self) -> bool {
+            #[doc = "Direct mode error interrupt enable"]
+            pub const fn dmeie(&self) -> bool {
                 let val = (self.0 >> 1usize) & 0x01;
                 val != 0
             }
-            #[doc = "Transfer complete interrupt enable"]
-            pub fn set_tcie(&mut self, val: bool) {
+            #[doc = "Direct mode error interrupt enable"]
+            pub fn set_dmeie(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "Half Transfer interrupt enable"]
-            pub const fn htie(&self) -> bool {
+            #[doc = "Transfer error interrupt enable"]
+            pub const fn teie(&self) -> bool {
                 let val = (self.0 >> 2usize) & 0x01;
                 val != 0
             }
-            #[doc = "Half Transfer interrupt enable"]
-            pub fn set_htie(&mut self, val: bool) {
+            #[doc = "Transfer error interrupt enable"]
+            pub fn set_teie(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
             }
-            #[doc = "Transfer error interrupt enable"]
-            pub const fn teie(&self) -> bool {
+            #[doc = "Half transfer interrupt enable"]
+            pub const fn htie(&self) -> bool {
                 let val = (self.0 >> 3usize) & 0x01;
                 val != 0
             }
-            #[doc = "Transfer error interrupt enable"]
-            pub fn set_teie(&mut self, val: bool) {
+            #[doc = "Half transfer interrupt enable"]
+            pub fn set_htie(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
             }
+            #[doc = "Transfer complete interrupt enable"]
+            pub const fn tcie(&self) -> bool {
+                let val = (self.0 >> 4usize) & 0x01;
+                val != 0
+            }
+            #[doc = "Transfer complete interrupt enable"]
+            pub fn set_tcie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
+            }
+            #[doc = "Peripheral flow controller"]
+            pub const fn pfctrl(&self) -> super::vals::Pfctrl {
+                let val = (self.0 >> 5usize) & 0x01;
+                super::vals::Pfctrl(val as u8)
+            }
+            #[doc = "Peripheral flow controller"]
+            pub fn set_pfctrl(&mut self, val: super::vals::Pfctrl) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val.0 as u32) & 0x01) << 5usize);
+            }
             #[doc = "Data transfer direction"]
             pub const fn dir(&self) -> super::vals::Dir {
-                let val = (self.0 >> 4usize) & 0x01;
+                let val = (self.0 >> 6usize) & 0x03;
                 super::vals::Dir(val as u8)
             }
             #[doc = "Data transfer direction"]
             pub fn set_dir(&mut self, val: super::vals::Dir) {
-                self.0 = (self.0 & !(0x01 << 4usize)) | (((val.0 as u32) & 0x01) << 4usize);
+                self.0 = (self.0 & !(0x03 << 6usize)) | (((val.0 as u32) & 0x03) << 6usize);
             }
             #[doc = "Circular mode"]
             pub const fn circ(&self) -> super::vals::Circ {
-                let val = (self.0 >> 5usize) & 0x01;
+                let val = (self.0 >> 8usize) & 0x01;
                 super::vals::Circ(val as u8)
             }
             #[doc = "Circular mode"]
             pub fn set_circ(&mut self, val: super::vals::Circ) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val.0 as u32) & 0x01) << 5usize);
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val.0 as u32) & 0x01) << 8usize);
             }
             #[doc = "Peripheral increment mode"]
             pub const fn pinc(&self) -> super::vals::Inc {
-                let val = (self.0 >> 6usize) & 0x01;
+                let val = (self.0 >> 9usize) & 0x01;
                 super::vals::Inc(val as u8)
             }
             #[doc = "Peripheral increment mode"]
             pub fn set_pinc(&mut self, val: super::vals::Inc) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val.0 as u32) & 0x01) << 6usize);
+                self.0 = (self.0 & !(0x01 << 9usize)) | (((val.0 as u32) & 0x01) << 9usize);
             }
             #[doc = "Memory increment mode"]
             pub const fn minc(&self) -> super::vals::Inc {
-                let val = (self.0 >> 7usize) & 0x01;
+                let val = (self.0 >> 10usize) & 0x01;
                 super::vals::Inc(val as u8)
             }
             #[doc = "Memory increment mode"]
             pub fn set_minc(&mut self, val: super::vals::Inc) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
+                self.0 = (self.0 & !(0x01 << 10usize)) | (((val.0 as u32) & 0x01) << 10usize);
             }
-            #[doc = "Peripheral size"]
+            #[doc = "Peripheral data size"]
             pub const fn psize(&self) -> super::vals::Size {
-                let val = (self.0 >> 8usize) & 0x03;
+                let val = (self.0 >> 11usize) & 0x03;
                 super::vals::Size(val as u8)
             }
-            #[doc = "Peripheral size"]
+            #[doc = "Peripheral data size"]
             pub fn set_psize(&mut self, val: super::vals::Size) {
-                self.0 = (self.0 & !(0x03 << 8usize)) | (((val.0 as u32) & 0x03) << 8usize);
+                self.0 = (self.0 & !(0x03 << 11usize)) | (((val.0 as u32) & 0x03) << 11usize);
             }
-            #[doc = "Memory size"]
+            #[doc = "Memory data size"]
             pub const fn msize(&self) -> super::vals::Size {
-                let val = (self.0 >> 10usize) & 0x03;
+                let val = (self.0 >> 13usize) & 0x03;
                 super::vals::Size(val as u8)
             }
-            #[doc = "Memory size"]
+            #[doc = "Memory data size"]
             pub fn set_msize(&mut self, val: super::vals::Size) {
-                self.0 = (self.0 & !(0x03 << 10usize)) | (((val.0 as u32) & 0x03) << 10usize);
+                self.0 = (self.0 & !(0x03 << 13usize)) | (((val.0 as u32) & 0x03) << 13usize);
             }
-            #[doc = "Channel Priority level"]
+            #[doc = "Peripheral increment offset size"]
+            pub const fn pincos(&self) -> super::vals::Pincos {
+                let val = (self.0 >> 15usize) & 0x01;
+                super::vals::Pincos(val as u8)
+            }
+            #[doc = "Peripheral increment offset size"]
+            pub fn set_pincos(&mut self, val: super::vals::Pincos) {
+                self.0 = (self.0 & !(0x01 << 15usize)) | (((val.0 as u32) & 0x01) << 15usize);
+            }
+            #[doc = "Priority level"]
             pub const fn pl(&self) -> super::vals::Pl {
-                let val = (self.0 >> 12usize) & 0x03;
+                let val = (self.0 >> 16usize) & 0x03;
                 super::vals::Pl(val as u8)
             }
-            #[doc = "Channel Priority level"]
+            #[doc = "Priority level"]
             pub fn set_pl(&mut self, val: super::vals::Pl) {
-                self.0 = (self.0 & !(0x03 << 12usize)) | (((val.0 as u32) & 0x03) << 12usize);
-            }
-            #[doc = "Memory to memory mode"]
-            pub const fn mem2mem(&self) -> super::vals::Memmem {
-                let val = (self.0 >> 14usize) & 0x01;
-                super::vals::Memmem(val as u8)
+                self.0 = (self.0 & !(0x03 << 16usize)) | (((val.0 as u32) & 0x03) << 16usize);
             }
-            #[doc = "Memory to memory mode"]
-            pub fn set_mem2mem(&mut self, val: super::vals::Memmem) {
-                self.0 = (self.0 & !(0x01 << 14usize)) | (((val.0 as u32) & 0x01) << 14usize);
+            #[doc = "Double buffer mode"]
+            pub const fn dbm(&self) -> super::vals::Dbm {
+                let val = (self.0 >> 18usize) & 0x01;
+                super::vals::Dbm(val as u8)
             }
-        }
-        impl Default for Cr {
-            fn default() -> Cr {
-                Cr(0)
+            #[doc = "Double buffer mode"]
+            pub fn set_dbm(&mut self, val: super::vals::Dbm) {
+                self.0 = (self.0 & !(0x01 << 18usize)) | (((val.0 as u32) & 0x01) << 18usize);
             }
-        }
-        #[doc = "DMA interrupt flag clear register (DMA_IFCR)"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ifcr(pub u32);
-        impl Ifcr {
-            #[doc = "Channel 1 Global interrupt clear"]
-            pub fn cgif(&self, n: usize) -> bool {
-                assert!(n < 7usize);
-                let offs = 0usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
+            #[doc = "Current target (only in double buffer mode)"]
+            pub const fn ct(&self) -> super::vals::Ct {
+                let val = (self.0 >> 19usize) & 0x01;
+                super::vals::Ct(val as u8)
             }
-            #[doc = "Channel 1 Global interrupt clear"]
-            pub fn set_cgif(&mut self, n: usize, val: bool) {
-                assert!(n < 7usize);
-                let offs = 0usize + n * 4usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Current target (only in double buffer mode)"]
+            pub fn set_ct(&mut self, val: super::vals::Ct) {
+                self.0 = (self.0 & !(0x01 << 19usize)) | (((val.0 as u32) & 0x01) << 19usize);
             }
-            #[doc = "Channel 1 Transfer Complete clear"]
-            pub fn ctcif(&self, n: usize) -> bool {
-                assert!(n < 7usize);
-                let offs = 1usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
+            #[doc = "Peripheral burst transfer configuration"]
+            pub const fn pburst(&self) -> super::vals::Burst {
+                let val = (self.0 >> 21usize) & 0x03;
+                super::vals::Burst(val as u8)
             }
-            #[doc = "Channel 1 Transfer Complete clear"]
-            pub fn set_ctcif(&mut self, n: usize, val: bool) {
-                assert!(n < 7usize);
-                let offs = 1usize + n * 4usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Peripheral burst transfer configuration"]
+            pub fn set_pburst(&mut self, val: super::vals::Burst) {
+                self.0 = (self.0 & !(0x03 << 21usize)) | (((val.0 as u32) & 0x03) << 21usize);
             }
-            #[doc = "Channel 1 Half Transfer clear"]
-            pub fn chtif(&self, n: usize) -> bool {
-                assert!(n < 7usize);
-                let offs = 2usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
+            #[doc = "Memory burst transfer configuration"]
+            pub const fn mburst(&self) -> super::vals::Burst {
+                let val = (self.0 >> 23usize) & 0x03;
+                super::vals::Burst(val as u8)
             }
-            #[doc = "Channel 1 Half Transfer clear"]
-            pub fn set_chtif(&mut self, n: usize, val: bool) {
-                assert!(n < 7usize);
-                let offs = 2usize + n * 4usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Memory burst transfer configuration"]
+            pub fn set_mburst(&mut self, val: super::vals::Burst) {
+                self.0 = (self.0 & !(0x03 << 23usize)) | (((val.0 as u32) & 0x03) << 23usize);
             }
-            #[doc = "Channel 1 Transfer Error clear"]
-            pub fn cteif(&self, n: usize) -> bool {
-                assert!(n < 7usize);
-                let offs = 3usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
+            #[doc = "Channel selection"]
+            pub const fn chsel(&self) -> u8 {
+                let val = (self.0 >> 25usize) & 0x0f;
+                val as u8
             }
-            #[doc = "Channel 1 Transfer Error clear"]
-            pub fn set_cteif(&mut self, n: usize, val: bool) {
-                assert!(n < 7usize);
-                let offs = 3usize + n * 4usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            #[doc = "Channel selection"]
+            pub fn set_chsel(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x0f << 25usize)) | (((val as u32) & 0x0f) << 25usize);
             }
         }
-        impl Default for Ifcr {
-            fn default() -> Ifcr {
-                Ifcr(0)
+        impl Default for Cr {
+            fn default() -> Cr {
+                Cr(0)
             }
         }
     }
 }
-pub mod exti_v1 {
+pub mod timer_v1 {
     use crate::generic::*;
-    #[doc = "External interrupt/event controller"]
+    #[doc = "General purpose 32-bit timer"]
     #[derive(Copy, Clone)]
-    pub struct Exti(pub *mut u8);
-    unsafe impl Send for Exti {}
-    unsafe impl Sync for Exti {}
-    impl Exti {
-        #[doc = "Interrupt mask register (EXTI_IMR)"]
-        pub fn imr(self) -> Reg<regs::Imr, RW> {
+    pub struct TimGp32(pub *mut u8);
+    unsafe impl Send for TimGp32 {}
+    unsafe impl Sync for TimGp32 {}
+    impl TimGp32 {
+        #[doc = "control register 1"]
+        pub fn cr1(self) -> Reg<regs::Cr1Gp, RW> {
             unsafe { Reg::from_ptr(self.0.add(0usize)) }
         }
-        #[doc = "Event mask register (EXTI_EMR)"]
-        pub fn emr(self) -> Reg<regs::Emr, RW> {
+        #[doc = "control register 2"]
+        pub fn cr2(self) -> Reg<regs::Cr2Gp, RW> {
             unsafe { Reg::from_ptr(self.0.add(4usize)) }
         }
-        #[doc = "Rising Trigger selection register (EXTI_RTSR)"]
-        pub fn rtsr(self) -> Reg<regs::Rtsr, RW> {
+        #[doc = "slave mode control register"]
+        pub fn smcr(self) -> Reg<regs::Smcr, RW> {
             unsafe { Reg::from_ptr(self.0.add(8usize)) }
         }
-        #[doc = "Falling Trigger selection register (EXTI_FTSR)"]
-        pub fn ftsr(self) -> Reg<regs::Ftsr, RW> {
+        #[doc = "DMA/Interrupt enable register"]
+        pub fn dier(self) -> Reg<regs::DierGp, RW> {
             unsafe { Reg::from_ptr(self.0.add(12usize)) }
         }
-        #[doc = "Software interrupt event register (EXTI_SWIER)"]
-        pub fn swier(self) -> Reg<regs::Swier, RW> {
+        #[doc = "status register"]
+        pub fn sr(self) -> Reg<regs::SrGp, RW> {
             unsafe { Reg::from_ptr(self.0.add(16usize)) }
         }
-        #[doc = "Pending register (EXTI_PR)"]
-        pub fn pr(self) -> Reg<regs::Pr, RW> {
+        #[doc = "event generation register"]
+        pub fn egr(self) -> Reg<regs::EgrGp, W> {
             unsafe { Reg::from_ptr(self.0.add(20usize)) }
         }
-    }
-    pub mod regs {
-        use crate::generic::*;
-        #[doc = "Rising Trigger selection register (EXTI_RTSR)"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Rtsr(pub u32);
-        impl Rtsr {
-            #[doc = "Rising trigger event configuration of line 0"]
-            pub fn tr(&self, n: usize) -> super::vals::Tr {
-                assert!(n < 23usize);
-                let offs = 0usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                super::vals::Tr(val as u8)
-            }
-            #[doc = "Rising trigger event configuration of line 0"]
-            pub fn set_tr(&mut self, n: usize, val: super::vals::Tr) {
-                assert!(n < 23usize);
-                let offs = 0usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
-            }
-        }
-        impl Default for Rtsr {
-            fn default() -> Rtsr {
-                Rtsr(0)
-            }
-        }
-        #[doc = "Pending register (EXTI_PR)"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Pr(pub u32);
-        impl Pr {
-            #[doc = "Pending bit 0"]
-            pub fn pr(&self, n: usize) -> bool {
-                assert!(n < 23usize);
-                let offs = 0usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
-            }
-            #[doc = "Pending bit 0"]
-            pub fn set_pr(&mut self, n: usize, val: bool) {
-                assert!(n < 23usize);
-                let offs = 0usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
-            }
-        }
-        impl Default for Pr {
-            fn default() -> Pr {
-                Pr(0)
-            }
-        }
-        #[doc = "Software interrupt event register (EXTI_SWIER)"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Swier(pub u32);
-        impl Swier {
-            #[doc = "Software Interrupt on line 0"]
-            pub fn swier(&self, n: usize) -> bool {
-                assert!(n < 23usize);
-                let offs = 0usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                val != 0
-            }
-            #[doc = "Software Interrupt on line 0"]
-            pub fn set_swier(&mut self, n: usize, val: bool) {
-                assert!(n < 23usize);
-                let offs = 0usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
-            }
-        }
-        impl Default for Swier {
-            fn default() -> Swier {
-                Swier(0)
-            }
-        }
-        #[doc = "Falling Trigger selection register (EXTI_FTSR)"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ftsr(pub u32);
-        impl Ftsr {
-            #[doc = "Falling trigger event configuration of line 0"]
-            pub fn tr(&self, n: usize) -> super::vals::Tr {
-                assert!(n < 23usize);
-                let offs = 0usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                super::vals::Tr(val as u8)
-            }
-            #[doc = "Falling trigger event configuration of line 0"]
-            pub fn set_tr(&mut self, n: usize, val: super::vals::Tr) {
-                assert!(n < 23usize);
-                let offs = 0usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
-            }
-        }
-        impl Default for Ftsr {
-            fn default() -> Ftsr {
-                Ftsr(0)
-            }
-        }
-        #[doc = "Interrupt mask register (EXTI_IMR)"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Imr(pub u32);
-        impl Imr {
-            #[doc = "Interrupt Mask on line 0"]
-            pub fn mr(&self, n: usize) -> super::vals::Mr {
-                assert!(n < 23usize);
-                let offs = 0usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                super::vals::Mr(val as u8)
-            }
-            #[doc = "Interrupt Mask on line 0"]
-            pub fn set_mr(&mut self, n: usize, val: super::vals::Mr) {
-                assert!(n < 23usize);
-                let offs = 0usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
-            }
+        #[doc = "capture/compare mode register 1 (input mode)"]
+        pub fn ccmr_input(self, n: usize) -> Reg<regs::CcmrInput, RW> {
+            assert!(n < 2usize);
+            unsafe { Reg::from_ptr(self.0.add(24usize + n * 4usize)) }
         }
-        impl Default for Imr {
-            fn default() -> Imr {
-                Imr(0)
-            }
+        #[doc = "capture/compare mode register 1 (output mode)"]
+        pub fn ccmr_output(self, n: usize) -> Reg<regs::CcmrOutput, RW> {
+            assert!(n < 2usize);
+            unsafe { Reg::from_ptr(self.0.add(24usize + n * 4usize)) }
         }
-        #[doc = "Event mask register (EXTI_EMR)"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Emr(pub u32);
-        impl Emr {
-            #[doc = "Event Mask on line 0"]
-            pub fn mr(&self, n: usize) -> super::vals::Mr {
-                assert!(n < 23usize);
-                let offs = 0usize + n * 1usize;
-                let val = (self.0 >> offs) & 0x01;
-                super::vals::Mr(val as u8)
-            }
-            #[doc = "Event Mask on line 0"]
-            pub fn set_mr(&mut self, n: usize, val: super::vals::Mr) {
-                assert!(n < 23usize);
-                let offs = 0usize + n * 1usize;
-                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
-            }
+        #[doc = "capture/compare enable register"]
+        pub fn ccer(self) -> Reg<regs::CcerGp, RW> {
+            unsafe { Reg::from_ptr(self.0.add(32usize)) }
         }
-        impl Default for Emr {
-            fn default() -> Emr {
-                Emr(0)
-            }
+        #[doc = "counter"]
+        pub fn cnt(self) -> Reg<regs::Cnt32, RW> {
+            unsafe { Reg::from_ptr(self.0.add(36usize)) }
         }
-    }
-    pub mod vals {
-        use crate::generic::*;
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Prw(pub u8);
-        impl Prw {
-            #[doc = "Clears pending bit"]
-            pub const CLEAR: Self = Self(0x01);
+        #[doc = "prescaler"]
+        pub fn psc(self) -> Reg<regs::Psc, RW> {
+            unsafe { Reg::from_ptr(self.0.add(40usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Prr(pub u8);
-        impl Prr {
-            #[doc = "No trigger request occurred"]
-            pub const NOTPENDING: Self = Self(0);
-            #[doc = "Selected trigger request occurred"]
-            pub const PENDING: Self = Self(0x01);
+        #[doc = "auto-reload register"]
+        pub fn arr(self) -> Reg<regs::Arr32, RW> {
+            unsafe { Reg::from_ptr(self.0.add(44usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Tr(pub u8);
-        impl Tr {
-            #[doc = "Falling edge trigger is disabled"]
-            pub const DISABLED: Self = Self(0);
-            #[doc = "Falling edge trigger is enabled"]
-            pub const ENABLED: Self = Self(0x01);
+        #[doc = "capture/compare register"]
+        pub fn ccr(self, n: usize) -> Reg<regs::Ccr32, RW> {
+            assert!(n < 4usize);
+            unsafe { Reg::from_ptr(self.0.add(52usize + n * 4usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Swierw(pub u8);
-        impl Swierw {
-            #[doc = "Generates an interrupt request"]
-            pub const PEND: Self = Self(0x01);
+        #[doc = "DMA control register"]
+        pub fn dcr(self) -> Reg<regs::Dcr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(72usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Mr(pub u8);
-        impl Mr {
-            #[doc = "Interrupt request line is masked"]
-            pub const MASKED: Self = Self(0);
-            #[doc = "Interrupt request line is unmasked"]
-            pub const UNMASKED: Self = Self(0x01);
+        #[doc = "DMA address for full transfer"]
+        pub fn dmar(self) -> Reg<regs::Dmar, RW> {
+            unsafe { Reg::from_ptr(self.0.add(76usize)) }
         }
     }
-}
-pub mod usart_v1 {
-    use crate::generic::*;
-    #[doc = "Universal synchronous asynchronous receiver transmitter"]
+    #[doc = "Advanced-timers"]
     #[derive(Copy, Clone)]
-    pub struct Usart(pub *mut u8);
-    unsafe impl Send for Usart {}
-    unsafe impl Sync for Usart {}
-    impl Usart {
-        #[doc = "Status register"]
-        pub fn sr(self) -> Reg<regs::Sr, RW> {
+    pub struct TimAdv(pub *mut u8);
+    unsafe impl Send for TimAdv {}
+    unsafe impl Sync for TimAdv {}
+    impl TimAdv {
+        #[doc = "control register 1"]
+        pub fn cr1(self) -> Reg<regs::Cr1Gp, RW> {
             unsafe { Reg::from_ptr(self.0.add(0usize)) }
         }
-        #[doc = "Data register"]
-        pub fn dr(self) -> Reg<regs::Dr, RW> {
+        #[doc = "control register 2"]
+        pub fn cr2(self) -> Reg<regs::Cr2Adv, RW> {
             unsafe { Reg::from_ptr(self.0.add(4usize)) }
         }
-        #[doc = "Baud rate register"]
-        pub fn brr(self) -> Reg<regs::Brr, RW> {
+        #[doc = "slave mode control register"]
+        pub fn smcr(self) -> Reg<regs::Smcr, RW> {
             unsafe { Reg::from_ptr(self.0.add(8usize)) }
         }
-        #[doc = "Control register 1"]
-        pub fn cr1(self) -> Reg<regs::Cr1, RW> {
+        #[doc = "DMA/Interrupt enable register"]
+        pub fn dier(self) -> Reg<regs::DierAdv, RW> {
             unsafe { Reg::from_ptr(self.0.add(12usize)) }
         }
-        #[doc = "Control register 2"]
-        pub fn cr2(self) -> Reg<regs::Cr2Usart, RW> {
+        #[doc = "status register"]
+        pub fn sr(self) -> Reg<regs::SrAdv, RW> {
             unsafe { Reg::from_ptr(self.0.add(16usize)) }
         }
-        #[doc = "Control register 3"]
-        pub fn cr3(self) -> Reg<regs::Cr3Usart, RW> {
+        #[doc = "event generation register"]
+        pub fn egr(self) -> Reg<regs::EgrAdv, W> {
             unsafe { Reg::from_ptr(self.0.add(20usize)) }
         }
-        #[doc = "Guard time and prescaler register"]
-        pub fn gtpr(self) -> Reg<regs::Gtpr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(24usize)) }
+        #[doc = "capture/compare mode register 1 (input mode)"]
+        pub fn ccmr_input(self, n: usize) -> Reg<regs::CcmrInput, RW> {
+            assert!(n < 2usize);
+            unsafe { Reg::from_ptr(self.0.add(24usize + n * 4usize)) }
+        }
+        #[doc = "capture/compare mode register 1 (output mode)"]
+        pub fn ccmr_output(self, n: usize) -> Reg<regs::CcmrOutput, RW> {
+            assert!(n < 2usize);
+            unsafe { Reg::from_ptr(self.0.add(24usize + n * 4usize)) }
+        }
+        #[doc = "capture/compare enable register"]
+        pub fn ccer(self) -> Reg<regs::CcerAdv, RW> {
+            unsafe { Reg::from_ptr(self.0.add(32usize)) }
+        }
+        #[doc = "counter"]
+        pub fn cnt(self) -> Reg<regs::Cnt16, RW> {
+            unsafe { Reg::from_ptr(self.0.add(36usize)) }
+        }
+        #[doc = "prescaler"]
+        pub fn psc(self) -> Reg<regs::Psc, RW> {
+            unsafe { Reg::from_ptr(self.0.add(40usize)) }
+        }
+        #[doc = "auto-reload register"]
+        pub fn arr(self) -> Reg<regs::Arr16, RW> {
+            unsafe { Reg::from_ptr(self.0.add(44usize)) }
+        }
+        #[doc = "repetition counter register"]
+        pub fn rcr(self) -> Reg<regs::Rcr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(48usize)) }
+        }
+        #[doc = "capture/compare register"]
+        pub fn ccr(self, n: usize) -> Reg<regs::Ccr16, RW> {
+            assert!(n < 4usize);
+            unsafe { Reg::from_ptr(self.0.add(52usize + n * 4usize)) }
+        }
+        #[doc = "break and dead-time register"]
+        pub fn bdtr(self) -> Reg<regs::Bdtr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(68usize)) }
+        }
+        #[doc = "DMA control register"]
+        pub fn dcr(self) -> Reg<regs::Dcr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(72usize)) }
+        }
+        #[doc = "DMA address for full transfer"]
+        pub fn dmar(self) -> Reg<regs::Dmar, RW> {
+            unsafe { Reg::from_ptr(self.0.add(76usize)) }
         }
     }
-    #[doc = "Universal asynchronous receiver transmitter"]
+    #[doc = "General purpose 16-bit timer"]
     #[derive(Copy, Clone)]
-    pub struct Uart(pub *mut u8);
-    unsafe impl Send for Uart {}
-    unsafe impl Sync for Uart {}
-    impl Uart {
-        #[doc = "Status register"]
-        pub fn sr(self) -> Reg<regs::Sr, RW> {
+    pub struct TimGp16(pub *mut u8);
+    unsafe impl Send for TimGp16 {}
+    unsafe impl Sync for TimGp16 {}
+    impl TimGp16 {
+        #[doc = "control register 1"]
+        pub fn cr1(self) -> Reg<regs::Cr1Gp, RW> {
             unsafe { Reg::from_ptr(self.0.add(0usize)) }
         }
-        #[doc = "Data register"]
-        pub fn dr(self) -> Reg<regs::Dr, RW> {
+        #[doc = "control register 2"]
+        pub fn cr2(self) -> Reg<regs::Cr2Gp, RW> {
             unsafe { Reg::from_ptr(self.0.add(4usize)) }
         }
-        #[doc = "Baud rate register"]
-        pub fn brr(self) -> Reg<regs::Brr, RW> {
+        #[doc = "slave mode control register"]
+        pub fn smcr(self) -> Reg<regs::Smcr, RW> {
             unsafe { Reg::from_ptr(self.0.add(8usize)) }
         }
-        #[doc = "Control register 1"]
-        pub fn cr1(self) -> Reg<regs::Cr1, RW> {
+        #[doc = "DMA/Interrupt enable register"]
+        pub fn dier(self) -> Reg<regs::DierGp, RW> {
             unsafe { Reg::from_ptr(self.0.add(12usize)) }
         }
-        #[doc = "Control register 2"]
-        pub fn cr2(self) -> Reg<regs::Cr2, RW> {
+        #[doc = "status register"]
+        pub fn sr(self) -> Reg<regs::SrGp, RW> {
             unsafe { Reg::from_ptr(self.0.add(16usize)) }
         }
-        #[doc = "Control register 3"]
-        pub fn cr3(self) -> Reg<regs::Cr3, RW> {
+        #[doc = "event generation register"]
+        pub fn egr(self) -> Reg<regs::EgrGp, W> {
             unsafe { Reg::from_ptr(self.0.add(20usize)) }
         }
-    }
-    pub mod vals {
-        use crate::generic::*;
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Cpha(pub u8);
-        impl Cpha {
-            #[doc = "The first clock transition is the first data capture edge"]
-            pub const FIRST: Self = Self(0);
-            #[doc = "The second clock transition is the first data capture edge"]
-            pub const SECOND: Self = Self(0x01);
+        #[doc = "capture/compare mode register 1 (input mode)"]
+        pub fn ccmr_input(self, n: usize) -> Reg<regs::CcmrInput, RW> {
+            assert!(n < 2usize);
+            unsafe { Reg::from_ptr(self.0.add(24usize + n * 4usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Wake(pub u8);
-        impl Wake {
-            #[doc = "USART wakeup on idle line"]
-            pub const IDLELINE: Self = Self(0);
-            #[doc = "USART wakeup on address mark"]
-            pub const ADDRESSMARK: Self = Self(0x01);
+        #[doc = "capture/compare mode register 1 (output mode)"]
+        pub fn ccmr_output(self, n: usize) -> Reg<regs::CcmrOutput, RW> {
+            assert!(n < 2usize);
+            unsafe { Reg::from_ptr(self.0.add(24usize + n * 4usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Sbk(pub u8);
-        impl Sbk {
-            #[doc = "No break character is transmitted"]
-            pub const NOBREAK: Self = Self(0);
-            #[doc = "Break character transmitted"]
-            pub const BREAK: Self = Self(0x01);
+        #[doc = "capture/compare enable register"]
+        pub fn ccer(self) -> Reg<regs::CcerGp, RW> {
+            unsafe { Reg::from_ptr(self.0.add(32usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Irlp(pub u8);
-        impl Irlp {
-            #[doc = "Normal mode"]
-            pub const NORMAL: Self = Self(0);
-            #[doc = "Low-power mode"]
-            pub const LOWPOWER: Self = Self(0x01);
+        #[doc = "counter"]
+        pub fn cnt(self) -> Reg<regs::Cnt16, RW> {
+            unsafe { Reg::from_ptr(self.0.add(36usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct M(pub u8);
-        impl M {
-            #[doc = "8 data bits"]
-            pub const M8: Self = Self(0);
-            #[doc = "9 data bits"]
-            pub const M9: Self = Self(0x01);
+        #[doc = "prescaler"]
+        pub fn psc(self) -> Reg<regs::Psc, RW> {
+            unsafe { Reg::from_ptr(self.0.add(40usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Hdsel(pub u8);
-        impl Hdsel {
-            #[doc = "Half duplex mode is not selected"]
-            pub const FULLDUPLEX: Self = Self(0);
-            #[doc = "Half duplex mode is selected"]
-            pub const HALFDUPLEX: Self = Self(0x01);
+        #[doc = "auto-reload register"]
+        pub fn arr(self) -> Reg<regs::Arr16, RW> {
+            unsafe { Reg::from_ptr(self.0.add(44usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Lbdl(pub u8);
-        impl Lbdl {
-            #[doc = "10-bit break detection"]
-            pub const LBDL10: Self = Self(0);
-            #[doc = "11-bit break detection"]
-            pub const LBDL11: Self = Self(0x01);
+        #[doc = "capture/compare register"]
+        pub fn ccr(self, n: usize) -> Reg<regs::Ccr16, RW> {
+            assert!(n < 4usize);
+            unsafe { Reg::from_ptr(self.0.add(52usize + n * 4usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Rwu(pub u8);
-        impl Rwu {
-            #[doc = "Receiver in active mode"]
-            pub const ACTIVE: Self = Self(0);
-            #[doc = "Receiver in mute mode"]
-            pub const MUTE: Self = Self(0x01);
+        #[doc = "DMA control register"]
+        pub fn dcr(self) -> Reg<regs::Dcr, RW> {
+            unsafe { Reg::from_ptr(self.0.add(72usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Cpol(pub u8);
-        impl Cpol {
-            #[doc = "Steady low value on CK pin outside transmission window"]
-            pub const LOW: Self = Self(0);
-            #[doc = "Steady high value on CK pin outside transmission window"]
-            pub const HIGH: Self = Self(0x01);
+        #[doc = "DMA address for full transfer"]
+        pub fn dmar(self) -> Reg<regs::Dmar, RW> {
+            unsafe { Reg::from_ptr(self.0.add(76usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Ps(pub u8);
-        impl Ps {
-            #[doc = "Even parity"]
-            pub const EVEN: Self = Self(0);
-            #[doc = "Odd parity"]
-            pub const ODD: Self = Self(0x01);
+    }
+    #[doc = "Basic timer"]
+    #[derive(Copy, Clone)]
+    pub struct TimBasic(pub *mut u8);
+    unsafe impl Send for TimBasic {}
+    unsafe impl Sync for TimBasic {}
+    impl TimBasic {
+        #[doc = "control register 1"]
+        pub fn cr1(self) -> Reg<regs::Cr1Basic, RW> {
+            unsafe { Reg::from_ptr(self.0.add(0usize)) }
         }
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
-        pub struct Stop(pub u8);
-        impl Stop {
-            #[doc = "1 stop bit"]
-            pub const STOP1: Self = Self(0);
-            #[doc = "0.5 stop bits"]
-            pub const STOP0P5: Self = Self(0x01);
-            #[doc = "2 stop bits"]
-            pub const STOP2: Self = Self(0x02);
-            #[doc = "1.5 stop bits"]
-            pub const STOP1P5: Self = Self(0x03);
+        #[doc = "control register 2"]
+        pub fn cr2(self) -> Reg<regs::Cr2Basic, RW> {
+            unsafe { Reg::from_ptr(self.0.add(4usize)) }
+        }
+        #[doc = "DMA/Interrupt enable register"]
+        pub fn dier(self) -> Reg<regs::DierBasic, RW> {
+            unsafe { Reg::from_ptr(self.0.add(12usize)) }
+        }
+        #[doc = "status register"]
+        pub fn sr(self) -> Reg<regs::SrBasic, RW> {
+            unsafe { Reg::from_ptr(self.0.add(16usize)) }
+        }
+        #[doc = "event generation register"]
+        pub fn egr(self) -> Reg<regs::EgrBasic, W> {
+            unsafe { Reg::from_ptr(self.0.add(20usize)) }
+        }
+        #[doc = "counter"]
+        pub fn cnt(self) -> Reg<regs::Cnt16, RW> {
+            unsafe { Reg::from_ptr(self.0.add(36usize)) }
+        }
+        #[doc = "prescaler"]
+        pub fn psc(self) -> Reg<regs::Psc, RW> {
+            unsafe { Reg::from_ptr(self.0.add(40usize)) }
+        }
+        #[doc = "auto-reload register"]
+        pub fn arr(self) -> Reg<regs::Arr16, RW> {
+            unsafe { Reg::from_ptr(self.0.add(44usize)) }
         }
     }
     pub mod regs {
         use crate::generic::*;
-        #[doc = "Guard time and prescaler register"]
+        #[doc = "capture/compare mode register 1 (input mode)"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Gtpr(pub u32);
-        impl Gtpr {
-            #[doc = "Prescaler value"]
-            pub const fn psc(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0xff;
-                val as u8
+        pub struct CcmrInput(pub u32);
+        impl CcmrInput {
+            #[doc = "Capture/Compare 1 selection"]
+            pub fn ccs(&self, n: usize) -> super::vals::CcmrInputCcs {
+                assert!(n < 2usize);
+                let offs = 0usize + n * 8usize;
+                let val = (self.0 >> offs) & 0x03;
+                super::vals::CcmrInputCcs(val as u8)
             }
-            #[doc = "Prescaler value"]
-            pub fn set_psc(&mut self, val: u8) {
-                self.0 = (self.0 & !(0xff << 0usize)) | (((val as u32) & 0xff) << 0usize);
+            #[doc = "Capture/Compare 1 selection"]
+            pub fn set_ccs(&mut self, n: usize, val: super::vals::CcmrInputCcs) {
+                assert!(n < 2usize);
+                let offs = 0usize + n * 8usize;
+                self.0 = (self.0 & !(0x03 << offs)) | (((val.0 as u32) & 0x03) << offs);
             }
-            #[doc = "Guard time value"]
-            pub const fn gt(&self) -> u8 {
-                let val = (self.0 >> 8usize) & 0xff;
+            #[doc = "Input capture 1 prescaler"]
+            pub fn icpsc(&self, n: usize) -> u8 {
+                assert!(n < 2usize);
+                let offs = 2usize + n * 8usize;
+                let val = (self.0 >> offs) & 0x03;
                 val as u8
             }
-            #[doc = "Guard time value"]
-            pub fn set_gt(&mut self, val: u8) {
-                self.0 = (self.0 & !(0xff << 8usize)) | (((val as u32) & 0xff) << 8usize);
+            #[doc = "Input capture 1 prescaler"]
+            pub fn set_icpsc(&mut self, n: usize, val: u8) {
+                assert!(n < 2usize);
+                let offs = 2usize + n * 8usize;
+                self.0 = (self.0 & !(0x03 << offs)) | (((val as u32) & 0x03) << offs);
+            }
+            #[doc = "Input capture 1 filter"]
+            pub fn icf(&self, n: usize) -> super::vals::Icf {
+                assert!(n < 2usize);
+                let offs = 4usize + n * 8usize;
+                let val = (self.0 >> offs) & 0x0f;
+                super::vals::Icf(val as u8)
+            }
+            #[doc = "Input capture 1 filter"]
+            pub fn set_icf(&mut self, n: usize, val: super::vals::Icf) {
+                assert!(n < 2usize);
+                let offs = 4usize + n * 8usize;
+                self.0 = (self.0 & !(0x0f << offs)) | (((val.0 as u32) & 0x0f) << offs);
             }
         }
-        impl Default for Gtpr {
-            fn default() -> Gtpr {
-                Gtpr(0)
+        impl Default for CcmrInput {
+            fn default() -> CcmrInput {
+                CcmrInput(0)
             }
         }
-        #[doc = "Control register 2"]
+        #[doc = "capture/compare mode register 2 (output mode)"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr2(pub u32);
-        impl Cr2 {
-            #[doc = "Address of the USART node"]
-            pub const fn add(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x0f;
-                val as u8
+        pub struct CcmrOutput(pub u32);
+        impl CcmrOutput {
+            #[doc = "Capture/Compare 3 selection"]
+            pub fn ccs(&self, n: usize) -> super::vals::CcmrOutputCcs {
+                assert!(n < 2usize);
+                let offs = 0usize + n * 8usize;
+                let val = (self.0 >> offs) & 0x03;
+                super::vals::CcmrOutputCcs(val as u8)
             }
-            #[doc = "Address of the USART node"]
-            pub fn set_add(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
+            #[doc = "Capture/Compare 3 selection"]
+            pub fn set_ccs(&mut self, n: usize, val: super::vals::CcmrOutputCcs) {
+                assert!(n < 2usize);
+                let offs = 0usize + n * 8usize;
+                self.0 = (self.0 & !(0x03 << offs)) | (((val.0 as u32) & 0x03) << offs);
             }
-            #[doc = "lin break detection length"]
-            pub const fn lbdl(&self) -> super::vals::Lbdl {
-                let val = (self.0 >> 5usize) & 0x01;
-                super::vals::Lbdl(val as u8)
+            #[doc = "Output compare 3 fast enable"]
+            pub fn ocfe(&self, n: usize) -> bool {
+                assert!(n < 2usize);
+                let offs = 2usize + n * 8usize;
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
             }
-            #[doc = "lin break detection length"]
-            pub fn set_lbdl(&mut self, val: super::vals::Lbdl) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val.0 as u32) & 0x01) << 5usize);
+            #[doc = "Output compare 3 fast enable"]
+            pub fn set_ocfe(&mut self, n: usize, val: bool) {
+                assert!(n < 2usize);
+                let offs = 2usize + n * 8usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "LIN break detection interrupt enable"]
-            pub const fn lbdie(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
-                val != 0
+            #[doc = "Output compare 3 preload enable"]
+            pub fn ocpe(&self, n: usize) -> super::vals::Ocpe {
+                assert!(n < 2usize);
+                let offs = 3usize + n * 8usize;
+                let val = (self.0 >> offs) & 0x01;
+                super::vals::Ocpe(val as u8)
             }
-            #[doc = "LIN break detection interrupt enable"]
-            pub fn set_lbdie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            #[doc = "Output compare 3 preload enable"]
+            pub fn set_ocpe(&mut self, n: usize, val: super::vals::Ocpe) {
+                assert!(n < 2usize);
+                let offs = 3usize + n * 8usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val.0 as u32) & 0x01) << offs);
             }
-            #[doc = "STOP bits"]
-            pub const fn stop(&self) -> super::vals::Stop {
-                let val = (self.0 >> 12usize) & 0x03;
-                super::vals::Stop(val as u8)
+            #[doc = "Output compare 3 mode"]
+            pub fn ocm(&self, n: usize) -> super::vals::Ocm {
+                assert!(n < 2usize);
+                let offs = 4usize + n * 8usize;
+                let val = (self.0 >> offs) & 0x07;
+                super::vals::Ocm(val as u8)
             }
-            #[doc = "STOP bits"]
-            pub fn set_stop(&mut self, val: super::vals::Stop) {
-                self.0 = (self.0 & !(0x03 << 12usize)) | (((val.0 as u32) & 0x03) << 12usize);
+            #[doc = "Output compare 3 mode"]
+            pub fn set_ocm(&mut self, n: usize, val: super::vals::Ocm) {
+                assert!(n < 2usize);
+                let offs = 4usize + n * 8usize;
+                self.0 = (self.0 & !(0x07 << offs)) | (((val.0 as u32) & 0x07) << offs);
             }
-            #[doc = "LIN mode enable"]
-            pub const fn linen(&self) -> bool {
-                let val = (self.0 >> 14usize) & 0x01;
+            #[doc = "Output compare 3 clear enable"]
+            pub fn occe(&self, n: usize) -> bool {
+                assert!(n < 2usize);
+                let offs = 7usize + n * 8usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "LIN mode enable"]
-            pub fn set_linen(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 14usize)) | (((val as u32) & 0x01) << 14usize);
+            #[doc = "Output compare 3 clear enable"]
+            pub fn set_occe(&mut self, n: usize, val: bool) {
+                assert!(n < 2usize);
+                let offs = 7usize + n * 8usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
         }
-        impl Default for Cr2 {
-            fn default() -> Cr2 {
-                Cr2(0)
+        impl Default for CcmrOutput {
+            fn default() -> CcmrOutput {
+                CcmrOutput(0)
             }
         }
-        #[doc = "Control register 2"]
+        #[doc = "event generation register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr2Usart(pub u32);
-        impl Cr2Usart {
-            #[doc = "Address of the USART node"]
-            pub const fn add(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x0f;
-                val as u8
-            }
-            #[doc = "Address of the USART node"]
-            pub fn set_add(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
-            }
-            #[doc = "lin break detection length"]
-            pub const fn lbdl(&self) -> super::vals::Lbdl {
-                let val = (self.0 >> 5usize) & 0x01;
-                super::vals::Lbdl(val as u8)
-            }
-            #[doc = "lin break detection length"]
-            pub fn set_lbdl(&mut self, val: super::vals::Lbdl) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val.0 as u32) & 0x01) << 5usize);
-            }
-            #[doc = "LIN break detection interrupt enable"]
-            pub const fn lbdie(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
+        pub struct EgrGp(pub u32);
+        impl EgrGp {
+            #[doc = "Update generation"]
+            pub const fn ug(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "LIN break detection interrupt enable"]
-            pub fn set_lbdie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            #[doc = "Update generation"]
+            pub fn set_ug(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Last bit clock pulse"]
-            pub const fn lbcl(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
+            #[doc = "Capture/compare 1 generation"]
+            pub fn ccg(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Last bit clock pulse"]
-            pub fn set_lbcl(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            #[doc = "Capture/compare 1 generation"]
+            pub fn set_ccg(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Clock phase"]
-            pub const fn cpha(&self) -> super::vals::Cpha {
-                let val = (self.0 >> 9usize) & 0x01;
-                super::vals::Cpha(val as u8)
+            #[doc = "Capture/Compare control update generation"]
+            pub const fn comg(&self) -> bool {
+                let val = (self.0 >> 5usize) & 0x01;
+                val != 0
             }
-            #[doc = "Clock phase"]
-            pub fn set_cpha(&mut self, val: super::vals::Cpha) {
-                self.0 = (self.0 & !(0x01 << 9usize)) | (((val.0 as u32) & 0x01) << 9usize);
+            #[doc = "Capture/Compare control update generation"]
+            pub fn set_comg(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
             }
-            #[doc = "Clock polarity"]
-            pub const fn cpol(&self) -> super::vals::Cpol {
-                let val = (self.0 >> 10usize) & 0x01;
-                super::vals::Cpol(val as u8)
+            #[doc = "Trigger generation"]
+            pub const fn tg(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
+                val != 0
             }
-            #[doc = "Clock polarity"]
-            pub fn set_cpol(&mut self, val: super::vals::Cpol) {
-                self.0 = (self.0 & !(0x01 << 10usize)) | (((val.0 as u32) & 0x01) << 10usize);
+            #[doc = "Trigger generation"]
+            pub fn set_tg(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
-            #[doc = "Clock enable"]
-            pub const fn clken(&self) -> bool {
-                let val = (self.0 >> 11usize) & 0x01;
+            #[doc = "Break generation"]
+            pub const fn bg(&self) -> bool {
+                let val = (self.0 >> 7usize) & 0x01;
                 val != 0
             }
-            #[doc = "Clock enable"]
-            pub fn set_clken(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 11usize)) | (((val as u32) & 0x01) << 11usize);
-            }
-            #[doc = "STOP bits"]
-            pub const fn stop(&self) -> super::vals::Stop {
-                let val = (self.0 >> 12usize) & 0x03;
-                super::vals::Stop(val as u8)
+            #[doc = "Break generation"]
+            pub fn set_bg(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
             }
-            #[doc = "STOP bits"]
-            pub fn set_stop(&mut self, val: super::vals::Stop) {
-                self.0 = (self.0 & !(0x03 << 12usize)) | (((val.0 as u32) & 0x03) << 12usize);
+        }
+        impl Default for EgrGp {
+            fn default() -> EgrGp {
+                EgrGp(0)
             }
-            #[doc = "LIN mode enable"]
-            pub const fn linen(&self) -> bool {
-                let val = (self.0 >> 14usize) & 0x01;
-                val != 0
+        }
+        #[doc = "counter"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Cnt16(pub u32);
+        impl Cnt16 {
+            #[doc = "counter value"]
+            pub const fn cnt(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0xffff;
+                val as u16
             }
-            #[doc = "LIN mode enable"]
-            pub fn set_linen(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 14usize)) | (((val as u32) & 0x01) << 14usize);
+            #[doc = "counter value"]
+            pub fn set_cnt(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
         }
-        impl Default for Cr2Usart {
-            fn default() -> Cr2Usart {
-                Cr2Usart(0)
+        impl Default for Cnt16 {
+            fn default() -> Cnt16 {
+                Cnt16(0)
             }
         }
-        #[doc = "Control register 1"]
+        #[doc = "control register 2"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr1(pub u32);
-        impl Cr1 {
-            #[doc = "Send break"]
-            pub const fn sbk(&self) -> super::vals::Sbk {
+        pub struct Cr2Adv(pub u32);
+        impl Cr2Adv {
+            #[doc = "Capture/compare preloaded control"]
+            pub const fn ccpc(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
-                super::vals::Sbk(val as u8)
-            }
-            #[doc = "Send break"]
-            pub fn set_sbk(&mut self, val: super::vals::Sbk) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val.0 as u32) & 0x01) << 0usize);
-            }
-            #[doc = "Receiver wakeup"]
-            pub const fn rwu(&self) -> super::vals::Rwu {
-                let val = (self.0 >> 1usize) & 0x01;
-                super::vals::Rwu(val as u8)
+                val != 0
             }
-            #[doc = "Receiver wakeup"]
-            pub fn set_rwu(&mut self, val: super::vals::Rwu) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val.0 as u32) & 0x01) << 1usize);
+            #[doc = "Capture/compare preloaded control"]
+            pub fn set_ccpc(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Receiver enable"]
-            pub const fn re(&self) -> bool {
+            #[doc = "Capture/compare control update selection"]
+            pub const fn ccus(&self) -> bool {
                 let val = (self.0 >> 2usize) & 0x01;
                 val != 0
             }
-            #[doc = "Receiver enable"]
-            pub fn set_re(&mut self, val: bool) {
+            #[doc = "Capture/compare control update selection"]
+            pub fn set_ccus(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
             }
-            #[doc = "Transmitter enable"]
-            pub const fn te(&self) -> bool {
+            #[doc = "Capture/compare DMA selection"]
+            pub const fn ccds(&self) -> super::vals::Ccds {
                 let val = (self.0 >> 3usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Transmitter enable"]
-            pub fn set_te(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
-            }
-            #[doc = "IDLE interrupt enable"]
-            pub const fn idleie(&self) -> bool {
-                let val = (self.0 >> 4usize) & 0x01;
-                val != 0
-            }
-            #[doc = "IDLE interrupt enable"]
-            pub fn set_idleie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
-            }
-            #[doc = "RXNE interrupt enable"]
-            pub const fn rxneie(&self) -> bool {
-                let val = (self.0 >> 5usize) & 0x01;
-                val != 0
+                super::vals::Ccds(val as u8)
             }
-            #[doc = "RXNE interrupt enable"]
-            pub fn set_rxneie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+            #[doc = "Capture/compare DMA selection"]
+            pub fn set_ccds(&mut self, val: super::vals::Ccds) {
+                self.0 = (self.0 & !(0x01 << 3usize)) | (((val.0 as u32) & 0x01) << 3usize);
             }
-            #[doc = "Transmission complete interrupt enable"]
-            pub const fn tcie(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
-                val != 0
+            #[doc = "Master mode selection"]
+            pub const fn mms(&self) -> super::vals::Mms {
+                let val = (self.0 >> 4usize) & 0x07;
+                super::vals::Mms(val as u8)
             }
-            #[doc = "Transmission complete interrupt enable"]
-            pub fn set_tcie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            #[doc = "Master mode selection"]
+            pub fn set_mms(&mut self, val: super::vals::Mms) {
+                self.0 = (self.0 & !(0x07 << 4usize)) | (((val.0 as u32) & 0x07) << 4usize);
             }
-            #[doc = "TXE interrupt enable"]
-            pub const fn txeie(&self) -> bool {
+            #[doc = "TI1 selection"]
+            pub const fn ti1s(&self) -> super::vals::Tis {
                 let val = (self.0 >> 7usize) & 0x01;
-                val != 0
+                super::vals::Tis(val as u8)
             }
-            #[doc = "TXE interrupt enable"]
-            pub fn set_txeie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            #[doc = "TI1 selection"]
+            pub fn set_ti1s(&mut self, val: super::vals::Tis) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
             }
-            #[doc = "PE interrupt enable"]
-            pub const fn peie(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
+            #[doc = "Output Idle state 1"]
+            pub fn ois(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 8usize + n * 2usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "PE interrupt enable"]
-            pub fn set_peie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            #[doc = "Output Idle state 1"]
+            pub fn set_ois(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 8usize + n * 2usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Parity selection"]
-            pub const fn ps(&self) -> super::vals::Ps {
+            #[doc = "Output Idle state 1"]
+            pub const fn ois1n(&self) -> bool {
                 let val = (self.0 >> 9usize) & 0x01;
-                super::vals::Ps(val as u8)
-            }
-            #[doc = "Parity selection"]
-            pub fn set_ps(&mut self, val: super::vals::Ps) {
-                self.0 = (self.0 & !(0x01 << 9usize)) | (((val.0 as u32) & 0x01) << 9usize);
-            }
-            #[doc = "Parity control enable"]
-            pub const fn pce(&self) -> bool {
-                let val = (self.0 >> 10usize) & 0x01;
                 val != 0
             }
-            #[doc = "Parity control enable"]
-            pub fn set_pce(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 10usize)) | (((val as u32) & 0x01) << 10usize);
+            #[doc = "Output Idle state 1"]
+            pub fn set_ois1n(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
             }
-            #[doc = "Wakeup method"]
-            pub const fn wake(&self) -> super::vals::Wake {
+            #[doc = "Output Idle state 2"]
+            pub const fn ois2n(&self) -> bool {
                 let val = (self.0 >> 11usize) & 0x01;
-                super::vals::Wake(val as u8)
-            }
-            #[doc = "Wakeup method"]
-            pub fn set_wake(&mut self, val: super::vals::Wake) {
-                self.0 = (self.0 & !(0x01 << 11usize)) | (((val.0 as u32) & 0x01) << 11usize);
-            }
-            #[doc = "Word length"]
-            pub const fn m(&self) -> super::vals::M {
-                let val = (self.0 >> 12usize) & 0x01;
-                super::vals::M(val as u8)
+                val != 0
             }
-            #[doc = "Word length"]
-            pub fn set_m(&mut self, val: super::vals::M) {
-                self.0 = (self.0 & !(0x01 << 12usize)) | (((val.0 as u32) & 0x01) << 12usize);
+            #[doc = "Output Idle state 2"]
+            pub fn set_ois2n(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 11usize)) | (((val as u32) & 0x01) << 11usize);
             }
-            #[doc = "USART enable"]
-            pub const fn ue(&self) -> bool {
+            #[doc = "Output Idle state 3"]
+            pub const fn ois3n(&self) -> bool {
                 let val = (self.0 >> 13usize) & 0x01;
                 val != 0
             }
-            #[doc = "USART enable"]
-            pub fn set_ue(&mut self, val: bool) {
+            #[doc = "Output Idle state 3"]
+            pub fn set_ois3n(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 13usize)) | (((val as u32) & 0x01) << 13usize);
             }
         }
-        impl Default for Cr1 {
-            fn default() -> Cr1 {
-                Cr1(0)
+        impl Default for Cr2Adv {
+            fn default() -> Cr2Adv {
+                Cr2Adv(0)
             }
         }
-        #[doc = "Data register"]
+        #[doc = "auto-reload register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Dr(pub u32);
-        impl Dr {
-            #[doc = "Data value"]
-            pub const fn dr(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0x01ff;
-                val as u16
+        pub struct Arr32(pub u32);
+        impl Arr32 {
+            #[doc = "Auto-reload value"]
+            pub const fn arr(&self) -> u32 {
+                let val = (self.0 >> 0usize) & 0xffff_ffff;
+                val as u32
             }
-            #[doc = "Data value"]
-            pub fn set_dr(&mut self, val: u16) {
-                self.0 = (self.0 & !(0x01ff << 0usize)) | (((val as u32) & 0x01ff) << 0usize);
+            #[doc = "Auto-reload value"]
+            pub fn set_arr(&mut self, val: u32) {
+                self.0 =
+                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
             }
         }
-        impl Default for Dr {
-            fn default() -> Dr {
-                Dr(0)
+        impl Default for Arr32 {
+            fn default() -> Arr32 {
+                Arr32(0)
             }
         }
-        #[doc = "Control register 3"]
+        #[doc = "DMA/Interrupt enable register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr3(pub u32);
-        impl Cr3 {
-            #[doc = "Error interrupt enable"]
-            pub const fn eie(&self) -> bool {
+        pub struct DierGp(pub u32);
+        impl DierGp {
+            #[doc = "Update interrupt enable"]
+            pub const fn uie(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Error interrupt enable"]
-            pub fn set_eie(&mut self, val: bool) {
+            #[doc = "Update interrupt enable"]
+            pub fn set_uie(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "IrDA mode enable"]
-            pub const fn iren(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
+            #[doc = "Capture/Compare 1 interrupt enable"]
+            pub fn ccie(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "IrDA mode enable"]
-            pub fn set_iren(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
+            #[doc = "Capture/Compare 1 interrupt enable"]
+            pub fn set_ccie(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "IrDA low-power"]
-            pub const fn irlp(&self) -> super::vals::Irlp {
-                let val = (self.0 >> 2usize) & 0x01;
-                super::vals::Irlp(val as u8)
+            #[doc = "Trigger interrupt enable"]
+            pub const fn tie(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
+                val != 0
             }
-            #[doc = "IrDA low-power"]
-            pub fn set_irlp(&mut self, val: super::vals::Irlp) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val.0 as u32) & 0x01) << 2usize);
+            #[doc = "Trigger interrupt enable"]
+            pub fn set_tie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
-            #[doc = "Half-duplex selection"]
-            pub const fn hdsel(&self) -> super::vals::Hdsel {
-                let val = (self.0 >> 3usize) & 0x01;
-                super::vals::Hdsel(val as u8)
+            #[doc = "Update DMA request enable"]
+            pub const fn ude(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
+                val != 0
             }
-            #[doc = "Half-duplex selection"]
-            pub fn set_hdsel(&mut self, val: super::vals::Hdsel) {
-                self.0 = (self.0 & !(0x01 << 3usize)) | (((val.0 as u32) & 0x01) << 3usize);
+            #[doc = "Update DMA request enable"]
+            pub fn set_ude(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
-            #[doc = "DMA enable receiver"]
-            pub const fn dmar(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
+            #[doc = "Capture/Compare 1 DMA request enable"]
+            pub fn ccde(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 9usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "DMA enable receiver"]
-            pub fn set_dmar(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            #[doc = "Capture/Compare 1 DMA request enable"]
+            pub fn set_ccde(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 9usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "DMA enable transmitter"]
-            pub const fn dmat(&self) -> bool {
-                let val = (self.0 >> 7usize) & 0x01;
+            #[doc = "Trigger DMA request enable"]
+            pub const fn tde(&self) -> bool {
+                let val = (self.0 >> 14usize) & 0x01;
                 val != 0
             }
-            #[doc = "DMA enable transmitter"]
-            pub fn set_dmat(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            #[doc = "Trigger DMA request enable"]
+            pub fn set_tde(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 14usize)) | (((val as u32) & 0x01) << 14usize);
             }
         }
-        impl Default for Cr3 {
-            fn default() -> Cr3 {
-                Cr3(0)
+        impl Default for DierGp {
+            fn default() -> DierGp {
+                DierGp(0)
             }
         }
-        #[doc = "Baud rate register"]
+        #[doc = "control register 2"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Brr(pub u32);
-        impl Brr {
-            #[doc = "fraction of USARTDIV"]
-            pub const fn div_fraction(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x0f;
-                val as u8
+        pub struct Cr2Gp(pub u32);
+        impl Cr2Gp {
+            #[doc = "Capture/compare DMA selection"]
+            pub const fn ccds(&self) -> super::vals::Ccds {
+                let val = (self.0 >> 3usize) & 0x01;
+                super::vals::Ccds(val as u8)
             }
-            #[doc = "fraction of USARTDIV"]
-            pub fn set_div_fraction(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
+            #[doc = "Capture/compare DMA selection"]
+            pub fn set_ccds(&mut self, val: super::vals::Ccds) {
+                self.0 = (self.0 & !(0x01 << 3usize)) | (((val.0 as u32) & 0x01) << 3usize);
             }
-            #[doc = "mantissa of USARTDIV"]
-            pub const fn div_mantissa(&self) -> u16 {
-                let val = (self.0 >> 4usize) & 0x0fff;
-                val as u16
+            #[doc = "Master mode selection"]
+            pub const fn mms(&self) -> super::vals::Mms {
+                let val = (self.0 >> 4usize) & 0x07;
+                super::vals::Mms(val as u8)
             }
-            #[doc = "mantissa of USARTDIV"]
-            pub fn set_div_mantissa(&mut self, val: u16) {
-                self.0 = (self.0 & !(0x0fff << 4usize)) | (((val as u32) & 0x0fff) << 4usize);
+            #[doc = "Master mode selection"]
+            pub fn set_mms(&mut self, val: super::vals::Mms) {
+                self.0 = (self.0 & !(0x07 << 4usize)) | (((val.0 as u32) & 0x07) << 4usize);
+            }
+            #[doc = "TI1 selection"]
+            pub const fn ti1s(&self) -> super::vals::Tis {
+                let val = (self.0 >> 7usize) & 0x01;
+                super::vals::Tis(val as u8)
+            }
+            #[doc = "TI1 selection"]
+            pub fn set_ti1s(&mut self, val: super::vals::Tis) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
             }
         }
-        impl Default for Brr {
-            fn default() -> Brr {
-                Brr(0)
+        impl Default for Cr2Gp {
+            fn default() -> Cr2Gp {
+                Cr2Gp(0)
             }
         }
-        #[doc = "Status register"]
+        #[doc = "capture/compare register 1"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Sr(pub u32);
-        impl Sr {
-            #[doc = "Parity error"]
-            pub const fn pe(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Parity error"]
-            pub fn set_pe(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+        pub struct Ccr16(pub u32);
+        impl Ccr16 {
+            #[doc = "Capture/Compare 1 value"]
+            pub const fn ccr(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0xffff;
+                val as u16
             }
-            #[doc = "Framing error"]
-            pub const fn fe(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
-                val != 0
+            #[doc = "Capture/Compare 1 value"]
+            pub fn set_ccr(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
-            #[doc = "Framing error"]
-            pub fn set_fe(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
+        }
+        impl Default for Ccr16 {
+            fn default() -> Ccr16 {
+                Ccr16(0)
             }
-            #[doc = "Noise error flag"]
-            pub const fn ne(&self) -> bool {
-                let val = (self.0 >> 2usize) & 0x01;
+        }
+        #[doc = "capture/compare enable register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct CcerAdv(pub u32);
+        impl CcerAdv {
+            #[doc = "Capture/Compare 1 output enable"]
+            pub fn cce(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 0usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Noise error flag"]
-            pub fn set_ne(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
+            #[doc = "Capture/Compare 1 output enable"]
+            pub fn set_cce(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 0usize + n * 4usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Overrun error"]
-            pub const fn ore(&self) -> bool {
-                let val = (self.0 >> 3usize) & 0x01;
+            #[doc = "Capture/Compare 1 output Polarity"]
+            pub fn ccp(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Overrun error"]
-            pub fn set_ore(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
+            #[doc = "Capture/Compare 1 output Polarity"]
+            pub fn set_ccp(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 4usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "IDLE line detected"]
-            pub const fn idle(&self) -> bool {
-                let val = (self.0 >> 4usize) & 0x01;
+            #[doc = "Capture/Compare 1 complementary output enable"]
+            pub fn ccne(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 2usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "IDLE line detected"]
-            pub fn set_idle(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
+            #[doc = "Capture/Compare 1 complementary output enable"]
+            pub fn set_ccne(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 2usize + n * 4usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Read data register not empty"]
-            pub const fn rxne(&self) -> bool {
-                let val = (self.0 >> 5usize) & 0x01;
+            #[doc = "Capture/Compare 1 output Polarity"]
+            pub fn ccnp(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 3usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Read data register not empty"]
-            pub fn set_rxne(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
-            }
-            #[doc = "Transmission complete"]
-            pub const fn tc(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
-                val != 0
+            #[doc = "Capture/Compare 1 output Polarity"]
+            pub fn set_ccnp(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 3usize + n * 4usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Transmission complete"]
-            pub fn set_tc(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+        }
+        impl Default for CcerAdv {
+            fn default() -> CcerAdv {
+                CcerAdv(0)
             }
-            #[doc = "Transmit data register empty"]
-            pub const fn txe(&self) -> bool {
-                let val = (self.0 >> 7usize) & 0x01;
+        }
+        #[doc = "DMA/Interrupt enable register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct DierBasic(pub u32);
+        impl DierBasic {
+            #[doc = "Update interrupt enable"]
+            pub const fn uie(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Transmit data register empty"]
-            pub fn set_txe(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
+            #[doc = "Update interrupt enable"]
+            pub fn set_uie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "LIN break detection flag"]
-            pub const fn lbd(&self) -> bool {
+            #[doc = "Update DMA request enable"]
+            pub const fn ude(&self) -> bool {
                 let val = (self.0 >> 8usize) & 0x01;
                 val != 0
             }
-            #[doc = "LIN break detection flag"]
-            pub fn set_lbd(&mut self, val: bool) {
+            #[doc = "Update DMA request enable"]
+            pub fn set_ude(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
         }
-        impl Default for Sr {
-            fn default() -> Sr {
-                Sr(0)
+        impl Default for DierBasic {
+            fn default() -> DierBasic {
+                DierBasic(0)
             }
         }
-        #[doc = "Status register"]
+        #[doc = "event generation register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct SrUsart(pub u32);
-        impl SrUsart {
-            #[doc = "Parity error"]
-            pub const fn pe(&self) -> bool {
+        pub struct EgrAdv(pub u32);
+        impl EgrAdv {
+            #[doc = "Update generation"]
+            pub const fn ug(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Parity error"]
-            pub fn set_pe(&mut self, val: bool) {
+            #[doc = "Update generation"]
+            pub fn set_ug(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Framing error"]
-            pub const fn fe(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Framing error"]
-            pub fn set_fe(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
-            }
-            #[doc = "Noise error flag"]
-            pub const fn ne(&self) -> bool {
-                let val = (self.0 >> 2usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Noise error flag"]
-            pub fn set_ne(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
-            }
-            #[doc = "Overrun error"]
-            pub const fn ore(&self) -> bool {
-                let val = (self.0 >> 3usize) & 0x01;
-                val != 0
-            }
-            #[doc = "Overrun error"]
-            pub fn set_ore(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
-            }
-            #[doc = "IDLE line detected"]
-            pub const fn idle(&self) -> bool {
-                let val = (self.0 >> 4usize) & 0x01;
+            #[doc = "Capture/compare 1 generation"]
+            pub fn ccg(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "IDLE line detected"]
-            pub fn set_idle(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
+            #[doc = "Capture/compare 1 generation"]
+            pub fn set_ccg(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Read data register not empty"]
-            pub const fn rxne(&self) -> bool {
+            #[doc = "Capture/Compare control update generation"]
+            pub const fn comg(&self) -> bool {
                 let val = (self.0 >> 5usize) & 0x01;
                 val != 0
             }
-            #[doc = "Read data register not empty"]
-            pub fn set_rxne(&mut self, val: bool) {
+            #[doc = "Capture/Compare control update generation"]
+            pub fn set_comg(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
             }
-            #[doc = "Transmission complete"]
-            pub const fn tc(&self) -> bool {
+            #[doc = "Trigger generation"]
+            pub const fn tg(&self) -> bool {
                 let val = (self.0 >> 6usize) & 0x01;
                 val != 0
             }
-            #[doc = "Transmission complete"]
-            pub fn set_tc(&mut self, val: bool) {
+            #[doc = "Trigger generation"]
+            pub fn set_tg(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
-            #[doc = "Transmit data register empty"]
-            pub const fn txe(&self) -> bool {
+            #[doc = "Break generation"]
+            pub const fn bg(&self) -> bool {
                 let val = (self.0 >> 7usize) & 0x01;
                 val != 0
             }
-            #[doc = "Transmit data register empty"]
-            pub fn set_txe(&mut self, val: bool) {
+            #[doc = "Break generation"]
+            pub fn set_bg(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
             }
-            #[doc = "LIN break detection flag"]
-            pub const fn lbd(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
-                val != 0
-            }
-            #[doc = "LIN break detection flag"]
-            pub fn set_lbd(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+        }
+        impl Default for EgrAdv {
+            fn default() -> EgrAdv {
+                EgrAdv(0)
             }
-            #[doc = "CTS flag"]
-            pub const fn cts(&self) -> bool {
-                let val = (self.0 >> 9usize) & 0x01;
-                val != 0
+        }
+        #[doc = "control register 2"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct Cr2Basic(pub u32);
+        impl Cr2Basic {
+            #[doc = "Master mode selection"]
+            pub const fn mms(&self) -> super::vals::Mms {
+                let val = (self.0 >> 4usize) & 0x07;
+                super::vals::Mms(val as u8)
             }
-            #[doc = "CTS flag"]
-            pub fn set_cts(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
+            #[doc = "Master mode selection"]
+            pub fn set_mms(&mut self, val: super::vals::Mms) {
+                self.0 = (self.0 & !(0x07 << 4usize)) | (((val.0 as u32) & 0x07) << 4usize);
             }
         }
-        impl Default for SrUsart {
-            fn default() -> SrUsart {
-                SrUsart(0)
+        impl Default for Cr2Basic {
+            fn default() -> Cr2Basic {
+                Cr2Basic(0)
             }
         }
-        #[doc = "Control register 3"]
+        #[doc = "status register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cr3Usart(pub u32);
-        impl Cr3Usart {
-            #[doc = "Error interrupt enable"]
-            pub const fn eie(&self) -> bool {
+        pub struct SrGp(pub u32);
+        impl SrGp {
+            #[doc = "Update interrupt flag"]
+            pub const fn uif(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Error interrupt enable"]
-            pub fn set_eie(&mut self, val: bool) {
+            #[doc = "Update interrupt flag"]
+            pub fn set_uif(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "IrDA mode enable"]
-            pub const fn iren(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
-                val != 0
-            }
-            #[doc = "IrDA mode enable"]
-            pub fn set_iren(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
-            }
-            #[doc = "IrDA low-power"]
-            pub const fn irlp(&self) -> super::vals::Irlp {
-                let val = (self.0 >> 2usize) & 0x01;
-                super::vals::Irlp(val as u8)
-            }
-            #[doc = "IrDA low-power"]
-            pub fn set_irlp(&mut self, val: super::vals::Irlp) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val.0 as u32) & 0x01) << 2usize);
-            }
-            #[doc = "Half-duplex selection"]
-            pub const fn hdsel(&self) -> super::vals::Hdsel {
-                let val = (self.0 >> 3usize) & 0x01;
-                super::vals::Hdsel(val as u8)
-            }
-            #[doc = "Half-duplex selection"]
-            pub fn set_hdsel(&mut self, val: super::vals::Hdsel) {
-                self.0 = (self.0 & !(0x01 << 3usize)) | (((val.0 as u32) & 0x01) << 3usize);
-            }
-            #[doc = "Smartcard NACK enable"]
-            pub const fn nack(&self) -> bool {
-                let val = (self.0 >> 4usize) & 0x01;
+            #[doc = "Capture/compare 1 interrupt flag"]
+            pub fn ccif(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "Smartcard NACK enable"]
-            pub fn set_nack(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
+            #[doc = "Capture/compare 1 interrupt flag"]
+            pub fn set_ccif(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "Smartcard mode enable"]
-            pub const fn scen(&self) -> bool {
+            #[doc = "COM interrupt flag"]
+            pub const fn comif(&self) -> bool {
                 let val = (self.0 >> 5usize) & 0x01;
                 val != 0
             }
-            #[doc = "Smartcard mode enable"]
-            pub fn set_scen(&mut self, val: bool) {
+            #[doc = "COM interrupt flag"]
+            pub fn set_comif(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
             }
-            #[doc = "DMA enable receiver"]
-            pub const fn dmar(&self) -> bool {
+            #[doc = "Trigger interrupt flag"]
+            pub const fn tif(&self) -> bool {
                 let val = (self.0 >> 6usize) & 0x01;
                 val != 0
             }
-            #[doc = "DMA enable receiver"]
-            pub fn set_dmar(&mut self, val: bool) {
+            #[doc = "Trigger interrupt flag"]
+            pub fn set_tif(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
-            #[doc = "DMA enable transmitter"]
-            pub const fn dmat(&self) -> bool {
+            #[doc = "Break interrupt flag"]
+            pub const fn bif(&self) -> bool {
                 let val = (self.0 >> 7usize) & 0x01;
                 val != 0
             }
-            #[doc = "DMA enable transmitter"]
-            pub fn set_dmat(&mut self, val: bool) {
+            #[doc = "Break interrupt flag"]
+            pub fn set_bif(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
             }
-            #[doc = "RTS enable"]
-            pub const fn rtse(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
+            #[doc = "Capture/Compare 1 overcapture flag"]
+            pub fn ccof(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 9usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "RTS enable"]
-            pub fn set_rtse(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
-            }
-            #[doc = "CTS enable"]
-            pub const fn ctse(&self) -> bool {
-                let val = (self.0 >> 9usize) & 0x01;
-                val != 0
+            #[doc = "Capture/Compare 1 overcapture flag"]
+            pub fn set_ccof(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 9usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "CTS enable"]
-            pub fn set_ctse(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
+        }
+        impl Default for SrGp {
+            fn default() -> SrGp {
+                SrGp(0)
             }
-            #[doc = "CTS interrupt enable"]
-            pub const fn ctsie(&self) -> bool {
-                let val = (self.0 >> 10usize) & 0x01;
+        }
+        #[doc = "event generation register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct EgrBasic(pub u32);
+        impl EgrBasic {
+            #[doc = "Update generation"]
+            pub const fn ug(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "CTS interrupt enable"]
-            pub fn set_ctsie(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 10usize)) | (((val as u32) & 0x01) << 10usize);
+            #[doc = "Update generation"]
+            pub fn set_ug(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
         }
-        impl Default for Cr3Usart {
-            fn default() -> Cr3Usart {
-                Cr3Usart(0)
+        impl Default for EgrBasic {
+            fn default() -> EgrBasic {
+                EgrBasic(0)
             }
         }
-    }
-}
-pub mod syscfg_h7 {
-    use crate::generic::*;
-    #[doc = "System configuration controller"]
-    #[derive(Copy, Clone)]
-    pub struct Syscfg(pub *mut u8);
-    unsafe impl Send for Syscfg {}
-    unsafe impl Sync for Syscfg {}
-    impl Syscfg {
-        #[doc = "peripheral mode configuration register"]
-        pub fn pmcr(self) -> Reg<regs::Pmcr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(4usize)) }
-        }
-        #[doc = "external interrupt configuration register 1"]
-        pub fn exticr(self, n: usize) -> Reg<regs::Exticr, RW> {
-            assert!(n < 4usize);
-            unsafe { Reg::from_ptr(self.0.add(8usize + n * 4usize)) }
-        }
-        #[doc = "compensation cell control/status register"]
-        pub fn cccsr(self) -> Reg<regs::Cccsr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(32usize)) }
-        }
-        #[doc = "SYSCFG compensation cell value register"]
-        pub fn ccvr(self) -> Reg<regs::Ccvr, R> {
-            unsafe { Reg::from_ptr(self.0.add(36usize)) }
-        }
-        #[doc = "SYSCFG compensation cell code register"]
-        pub fn cccr(self) -> Reg<regs::Cccr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(40usize)) }
-        }
-        #[doc = "SYSCFG power control register"]
-        pub fn pwrcr(self) -> Reg<regs::Pwrcr, RW> {
-            unsafe { Reg::from_ptr(self.0.add(44usize)) }
-        }
-        #[doc = "SYSCFG package register"]
-        pub fn pkgr(self) -> Reg<regs::Pkgr, R> {
-            unsafe { Reg::from_ptr(self.0.add(292usize)) }
-        }
-        #[doc = "SYSCFG user register 0"]
-        pub fn ur0(self) -> Reg<regs::Ur0, R> {
-            unsafe { Reg::from_ptr(self.0.add(768usize)) }
-        }
-        #[doc = "SYSCFG user register 2"]
-        pub fn ur2(self) -> Reg<regs::Ur2, RW> {
-            unsafe { Reg::from_ptr(self.0.add(776usize)) }
-        }
-        #[doc = "SYSCFG user register 3"]
-        pub fn ur3(self) -> Reg<regs::Ur3, RW> {
-            unsafe { Reg::from_ptr(self.0.add(780usize)) }
-        }
-        #[doc = "SYSCFG user register 4"]
-        pub fn ur4(self) -> Reg<regs::Ur4, R> {
-            unsafe { Reg::from_ptr(self.0.add(784usize)) }
-        }
-        #[doc = "SYSCFG user register 5"]
-        pub fn ur5(self) -> Reg<regs::Ur5, R> {
-            unsafe { Reg::from_ptr(self.0.add(788usize)) }
-        }
-        #[doc = "SYSCFG user register 6"]
-        pub fn ur6(self) -> Reg<regs::Ur6, R> {
-            unsafe { Reg::from_ptr(self.0.add(792usize)) }
-        }
-        #[doc = "SYSCFG user register 7"]
-        pub fn ur7(self) -> Reg<regs::Ur7, R> {
-            unsafe { Reg::from_ptr(self.0.add(796usize)) }
-        }
-        #[doc = "SYSCFG user register 8"]
-        pub fn ur8(self) -> Reg<regs::Ur8, R> {
-            unsafe { Reg::from_ptr(self.0.add(800usize)) }
-        }
-        #[doc = "SYSCFG user register 9"]
-        pub fn ur9(self) -> Reg<regs::Ur9, R> {
-            unsafe { Reg::from_ptr(self.0.add(804usize)) }
-        }
-        #[doc = "SYSCFG user register 10"]
-        pub fn ur10(self) -> Reg<regs::Ur10, R> {
-            unsafe { Reg::from_ptr(self.0.add(808usize)) }
-        }
-        #[doc = "SYSCFG user register 11"]
-        pub fn ur11(self) -> Reg<regs::Ur11, R> {
-            unsafe { Reg::from_ptr(self.0.add(812usize)) }
-        }
-        #[doc = "SYSCFG user register 12"]
-        pub fn ur12(self) -> Reg<regs::Ur12, R> {
-            unsafe { Reg::from_ptr(self.0.add(816usize)) }
-        }
-        #[doc = "SYSCFG user register 13"]
-        pub fn ur13(self) -> Reg<regs::Ur13, R> {
-            unsafe { Reg::from_ptr(self.0.add(820usize)) }
-        }
-        #[doc = "SYSCFG user register 14"]
-        pub fn ur14(self) -> Reg<regs::Ur14, RW> {
-            unsafe { Reg::from_ptr(self.0.add(824usize)) }
-        }
-        #[doc = "SYSCFG user register 15"]
-        pub fn ur15(self) -> Reg<regs::Ur15, R> {
-            unsafe { Reg::from_ptr(self.0.add(828usize)) }
-        }
-        #[doc = "SYSCFG user register 16"]
-        pub fn ur16(self) -> Reg<regs::Ur16, R> {
-            unsafe { Reg::from_ptr(self.0.add(832usize)) }
-        }
-        #[doc = "SYSCFG user register 17"]
-        pub fn ur17(self) -> Reg<regs::Ur17, R> {
-            unsafe { Reg::from_ptr(self.0.add(836usize)) }
-        }
-    }
-    pub mod regs {
-        use crate::generic::*;
-        #[doc = "SYSCFG user register 0"]
+        #[doc = "control register 1"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur0(pub u32);
-        impl Ur0 {
-            #[doc = "Bank Swap"]
-            pub const fn bks(&self) -> bool {
+        pub struct Cr1Gp(pub u32);
+        impl Cr1Gp {
+            #[doc = "Counter enable"]
+            pub const fn cen(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Bank Swap"]
-            pub fn set_bks(&mut self, val: bool) {
+            #[doc = "Counter enable"]
+            pub fn set_cen(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Readout protection"]
-            pub const fn rdp(&self) -> u8 {
-                let val = (self.0 >> 16usize) & 0xff;
-                val as u8
+            #[doc = "Update disable"]
+            pub const fn udis(&self) -> bool {
+                let val = (self.0 >> 1usize) & 0x01;
+                val != 0
             }
-            #[doc = "Readout protection"]
-            pub fn set_rdp(&mut self, val: u8) {
-                self.0 = (self.0 & !(0xff << 16usize)) | (((val as u32) & 0xff) << 16usize);
+            #[doc = "Update disable"]
+            pub fn set_udis(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-        }
-        impl Default for Ur0 {
-            fn default() -> Ur0 {
-                Ur0(0)
+            #[doc = "Update request source"]
+            pub const fn urs(&self) -> super::vals::Urs {
+                let val = (self.0 >> 2usize) & 0x01;
+                super::vals::Urs(val as u8)
             }
-        }
-        #[doc = "SYSCFG user register 7"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur7(pub u32);
-        impl Ur7 {
-            #[doc = "Secured area start address for bank 1"]
-            pub const fn sa_beg_1(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0x0fff;
-                val as u16
+            #[doc = "Update request source"]
+            pub fn set_urs(&mut self, val: super::vals::Urs) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val.0 as u32) & 0x01) << 2usize);
             }
-            #[doc = "Secured area start address for bank 1"]
-            pub fn set_sa_beg_1(&mut self, val: u16) {
-                self.0 = (self.0 & !(0x0fff << 0usize)) | (((val as u32) & 0x0fff) << 0usize);
+            #[doc = "One-pulse mode"]
+            pub const fn opm(&self) -> super::vals::Opm {
+                let val = (self.0 >> 3usize) & 0x01;
+                super::vals::Opm(val as u8)
             }
-            #[doc = "Secured area end address for bank 1"]
-            pub const fn sa_end_1(&self) -> u16 {
-                let val = (self.0 >> 16usize) & 0x0fff;
-                val as u16
+            #[doc = "One-pulse mode"]
+            pub fn set_opm(&mut self, val: super::vals::Opm) {
+                self.0 = (self.0 & !(0x01 << 3usize)) | (((val.0 as u32) & 0x01) << 3usize);
             }
-            #[doc = "Secured area end address for bank 1"]
-            pub fn set_sa_end_1(&mut self, val: u16) {
-                self.0 = (self.0 & !(0x0fff << 16usize)) | (((val as u32) & 0x0fff) << 16usize);
+            #[doc = "Direction"]
+            pub const fn dir(&self) -> super::vals::Dir {
+                let val = (self.0 >> 4usize) & 0x01;
+                super::vals::Dir(val as u8)
             }
-        }
-        impl Default for Ur7 {
-            fn default() -> Ur7 {
-                Ur7(0)
+            #[doc = "Direction"]
+            pub fn set_dir(&mut self, val: super::vals::Dir) {
+                self.0 = (self.0 & !(0x01 << 4usize)) | (((val.0 as u32) & 0x01) << 4usize);
             }
-        }
-        #[doc = "SYSCFG user register 5"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur5(pub u32);
-        impl Ur5 {
-            #[doc = "Mass erase secured area disabled for bank 1"]
-            pub const fn mesad_1(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
-                val != 0
+            #[doc = "Center-aligned mode selection"]
+            pub const fn cms(&self) -> super::vals::Cms {
+                let val = (self.0 >> 5usize) & 0x03;
+                super::vals::Cms(val as u8)
             }
-            #[doc = "Mass erase secured area disabled for bank 1"]
-            pub fn set_mesad_1(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            #[doc = "Center-aligned mode selection"]
+            pub fn set_cms(&mut self, val: super::vals::Cms) {
+                self.0 = (self.0 & !(0x03 << 5usize)) | (((val.0 as u32) & 0x03) << 5usize);
             }
-            #[doc = "Write protection for flash bank 1"]
-            pub const fn wrpn_1(&self) -> u8 {
-                let val = (self.0 >> 16usize) & 0xff;
-                val as u8
+            #[doc = "Auto-reload preload enable"]
+            pub const fn arpe(&self) -> super::vals::Arpe {
+                let val = (self.0 >> 7usize) & 0x01;
+                super::vals::Arpe(val as u8)
             }
-            #[doc = "Write protection for flash bank 1"]
-            pub fn set_wrpn_1(&mut self, val: u8) {
-                self.0 = (self.0 & !(0xff << 16usize)) | (((val as u32) & 0xff) << 16usize);
+            #[doc = "Auto-reload preload enable"]
+            pub fn set_arpe(&mut self, val: super::vals::Arpe) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
+            }
+            #[doc = "Clock division"]
+            pub const fn ckd(&self) -> super::vals::Ckd {
+                let val = (self.0 >> 8usize) & 0x03;
+                super::vals::Ckd(val as u8)
+            }
+            #[doc = "Clock division"]
+            pub fn set_ckd(&mut self, val: super::vals::Ckd) {
+                self.0 = (self.0 & !(0x03 << 8usize)) | (((val.0 as u32) & 0x03) << 8usize);
             }
         }
-        impl Default for Ur5 {
-            fn default() -> Ur5 {
-                Ur5(0)
+        impl Default for Cr1Gp {
+            fn default() -> Cr1Gp {
+                Cr1Gp(0)
             }
         }
-        #[doc = "SYSCFG user register 15"]
+        #[doc = "prescaler"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur15(pub u32);
-        impl Ur15 {
-            #[doc = "Freeze independent watchdog in Standby mode"]
-            pub const fn fziwdgstb(&self) -> bool {
-                let val = (self.0 >> 16usize) & 0x01;
-                val != 0
+        pub struct Psc(pub u32);
+        impl Psc {
+            #[doc = "Prescaler value"]
+            pub const fn psc(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0xffff;
+                val as u16
             }
-            #[doc = "Freeze independent watchdog in Standby mode"]
-            pub fn set_fziwdgstb(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
+            #[doc = "Prescaler value"]
+            pub fn set_psc(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
         }
-        impl Default for Ur15 {
-            fn default() -> Ur15 {
-                Ur15(0)
+        impl Default for Psc {
+            fn default() -> Psc {
+                Psc(0)
             }
         }
-        #[doc = "SYSCFG user register 13"]
+        #[doc = "capture/compare enable register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur13(pub u32);
-        impl Ur13 {
-            #[doc = "Secured DTCM RAM Size"]
-            pub const fn sdrs(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x03;
-                val as u8
+        pub struct CcerGp(pub u32);
+        impl CcerGp {
+            #[doc = "Capture/Compare 1 output enable"]
+            pub fn cce(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 0usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
             }
-            #[doc = "Secured DTCM RAM Size"]
-            pub fn set_sdrs(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x03 << 0usize)) | (((val as u32) & 0x03) << 0usize);
+            #[doc = "Capture/Compare 1 output enable"]
+            pub fn set_cce(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 0usize + n * 4usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "D1 Standby reset"]
-            pub const fn d1sbrst(&self) -> bool {
-                let val = (self.0 >> 16usize) & 0x01;
+            #[doc = "Capture/Compare 1 output Polarity"]
+            pub fn ccp(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "D1 Standby reset"]
-            pub fn set_d1sbrst(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
+            #[doc = "Capture/Compare 1 output Polarity"]
+            pub fn set_ccp(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 4usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            }
+            #[doc = "Capture/Compare 1 output Polarity"]
+            pub fn ccnp(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 3usize + n * 4usize;
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
+            }
+            #[doc = "Capture/Compare 1 output Polarity"]
+            pub fn set_ccnp(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 3usize + n * 4usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
         }
-        impl Default for Ur13 {
-            fn default() -> Ur13 {
-                Ur13(0)
+        impl Default for CcerGp {
+            fn default() -> CcerGp {
+                CcerGp(0)
             }
         }
-        #[doc = "SYSCFG user register 14"]
+        #[doc = "DMA/Interrupt enable register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur14(pub u32);
-        impl Ur14 {
-            #[doc = "D1 Stop Reset"]
-            pub const fn d1stprst(&self) -> bool {
+        pub struct DierAdv(pub u32);
+        impl DierAdv {
+            #[doc = "Update interrupt enable"]
+            pub const fn uie(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "D1 Stop Reset"]
-            pub fn set_d1stprst(&mut self, val: bool) {
+            #[doc = "Update interrupt enable"]
+            pub fn set_uie(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-        }
-        impl Default for Ur14 {
-            fn default() -> Ur14 {
-                Ur14(0)
+            #[doc = "Capture/Compare 1 interrupt enable"]
+            pub fn ccie(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
             }
-        }
-        #[doc = "SYSCFG user register 8"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur8(pub u32);
-        impl Ur8 {
-            #[doc = "Mass erase protected area disabled for bank 2"]
-            pub const fn mepad_2(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
+            #[doc = "Capture/Compare 1 interrupt enable"]
+            pub fn set_ccie(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
+            }
+            #[doc = "COM interrupt enable"]
+            pub const fn comie(&self) -> bool {
+                let val = (self.0 >> 5usize) & 0x01;
                 val != 0
             }
-            #[doc = "Mass erase protected area disabled for bank 2"]
-            pub fn set_mepad_2(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            #[doc = "COM interrupt enable"]
+            pub fn set_comie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
             }
-            #[doc = "Mass erase secured area disabled for bank 2"]
-            pub const fn mesad_2(&self) -> bool {
-                let val = (self.0 >> 16usize) & 0x01;
+            #[doc = "Trigger interrupt enable"]
+            pub const fn tie(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
                 val != 0
             }
-            #[doc = "Mass erase secured area disabled for bank 2"]
-            pub fn set_mesad_2(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
+            #[doc = "Trigger interrupt enable"]
+            pub fn set_tie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
-        }
-        impl Default for Ur8 {
-            fn default() -> Ur8 {
-                Ur8(0)
+            #[doc = "Break interrupt enable"]
+            pub const fn bie(&self) -> bool {
+                let val = (self.0 >> 7usize) & 0x01;
+                val != 0
             }
-        }
-        #[doc = "SYSCFG user register 10"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur10(pub u32);
-        impl Ur10 {
-            #[doc = "Protected area end address for bank 2"]
-            pub const fn pa_end_2(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0x0fff;
-                val as u16
+            #[doc = "Break interrupt enable"]
+            pub fn set_bie(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
             }
-            #[doc = "Protected area end address for bank 2"]
-            pub fn set_pa_end_2(&mut self, val: u16) {
-                self.0 = (self.0 & !(0x0fff << 0usize)) | (((val as u32) & 0x0fff) << 0usize);
+            #[doc = "Update DMA request enable"]
+            pub const fn ude(&self) -> bool {
+                let val = (self.0 >> 8usize) & 0x01;
+                val != 0
             }
-            #[doc = "Secured area start address for bank 2"]
-            pub const fn sa_beg_2(&self) -> u16 {
-                let val = (self.0 >> 16usize) & 0x0fff;
-                val as u16
+            #[doc = "Update DMA request enable"]
+            pub fn set_ude(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
             }
-            #[doc = "Secured area start address for bank 2"]
-            pub fn set_sa_beg_2(&mut self, val: u16) {
-                self.0 = (self.0 & !(0x0fff << 16usize)) | (((val as u32) & 0x0fff) << 16usize);
+            #[doc = "Capture/Compare 1 DMA request enable"]
+            pub fn ccde(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 9usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
             }
-        }
-        impl Default for Ur10 {
-            fn default() -> Ur10 {
-                Ur10(0)
+            #[doc = "Capture/Compare 1 DMA request enable"]
+            pub fn set_ccde(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 9usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-        }
-        #[doc = "SYSCFG user register 16"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur16(pub u32);
-        impl Ur16 {
-            #[doc = "Freeze independent watchdog in Stop mode"]
-            pub const fn fziwdgstp(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
+            #[doc = "COM DMA request enable"]
+            pub const fn comde(&self) -> bool {
+                let val = (self.0 >> 13usize) & 0x01;
                 val != 0
             }
-            #[doc = "Freeze independent watchdog in Stop mode"]
-            pub fn set_fziwdgstp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            #[doc = "COM DMA request enable"]
+            pub fn set_comde(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 13usize)) | (((val as u32) & 0x01) << 13usize);
             }
-            #[doc = "Private key programmed"]
-            pub const fn pkp(&self) -> bool {
-                let val = (self.0 >> 16usize) & 0x01;
+            #[doc = "Trigger DMA request enable"]
+            pub const fn tde(&self) -> bool {
+                let val = (self.0 >> 14usize) & 0x01;
                 val != 0
             }
-            #[doc = "Private key programmed"]
-            pub fn set_pkp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
+            #[doc = "Trigger DMA request enable"]
+            pub fn set_tde(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 14usize)) | (((val as u32) & 0x01) << 14usize);
             }
         }
-        impl Default for Ur16 {
-            fn default() -> Ur16 {
-                Ur16(0)
+        impl Default for DierAdv {
+            fn default() -> DierAdv {
+                DierAdv(0)
             }
         }
-        #[doc = "SYSCFG user register 11"]
+        #[doc = "slave mode control register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur11(pub u32);
-        impl Ur11 {
-            #[doc = "Secured area end address for bank 2"]
-            pub const fn sa_end_2(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0x0fff;
-                val as u16
+        pub struct Smcr(pub u32);
+        impl Smcr {
+            #[doc = "Slave mode selection"]
+            pub const fn sms(&self) -> super::vals::Sms {
+                let val = (self.0 >> 0usize) & 0x07;
+                super::vals::Sms(val as u8)
             }
-            #[doc = "Secured area end address for bank 2"]
-            pub fn set_sa_end_2(&mut self, val: u16) {
-                self.0 = (self.0 & !(0x0fff << 0usize)) | (((val as u32) & 0x0fff) << 0usize);
+            #[doc = "Slave mode selection"]
+            pub fn set_sms(&mut self, val: super::vals::Sms) {
+                self.0 = (self.0 & !(0x07 << 0usize)) | (((val.0 as u32) & 0x07) << 0usize);
             }
-            #[doc = "Independent Watchdog 1 mode"]
-            pub const fn iwdg1m(&self) -> bool {
-                let val = (self.0 >> 16usize) & 0x01;
-                val != 0
+            #[doc = "Trigger selection"]
+            pub const fn ts(&self) -> super::vals::Ts {
+                let val = (self.0 >> 4usize) & 0x07;
+                super::vals::Ts(val as u8)
             }
-            #[doc = "Independent Watchdog 1 mode"]
-            pub fn set_iwdg1m(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
+            #[doc = "Trigger selection"]
+            pub fn set_ts(&mut self, val: super::vals::Ts) {
+                self.0 = (self.0 & !(0x07 << 4usize)) | (((val.0 as u32) & 0x07) << 4usize);
             }
-        }
-        impl Default for Ur11 {
-            fn default() -> Ur11 {
-                Ur11(0)
+            #[doc = "Master/Slave mode"]
+            pub const fn msm(&self) -> super::vals::Msm {
+                let val = (self.0 >> 7usize) & 0x01;
+                super::vals::Msm(val as u8)
             }
-        }
-        #[doc = "SYSCFG user register 3"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur3(pub u32);
-        impl Ur3 {
-            #[doc = "Boot Address 1"]
-            pub const fn boot_add1(&self) -> u16 {
-                let val = (self.0 >> 16usize) & 0xffff;
-                val as u16
+            #[doc = "Master/Slave mode"]
+            pub fn set_msm(&mut self, val: super::vals::Msm) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
             }
-            #[doc = "Boot Address 1"]
-            pub fn set_boot_add1(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 16usize)) | (((val as u32) & 0xffff) << 16usize);
+            #[doc = "External trigger filter"]
+            pub const fn etf(&self) -> super::vals::Etf {
+                let val = (self.0 >> 8usize) & 0x0f;
+                super::vals::Etf(val as u8)
+            }
+            #[doc = "External trigger filter"]
+            pub fn set_etf(&mut self, val: super::vals::Etf) {
+                self.0 = (self.0 & !(0x0f << 8usize)) | (((val.0 as u32) & 0x0f) << 8usize);
+            }
+            #[doc = "External trigger prescaler"]
+            pub const fn etps(&self) -> super::vals::Etps {
+                let val = (self.0 >> 12usize) & 0x03;
+                super::vals::Etps(val as u8)
+            }
+            #[doc = "External trigger prescaler"]
+            pub fn set_etps(&mut self, val: super::vals::Etps) {
+                self.0 = (self.0 & !(0x03 << 12usize)) | (((val.0 as u32) & 0x03) << 12usize);
+            }
+            #[doc = "External clock enable"]
+            pub const fn ece(&self) -> super::vals::Ece {
+                let val = (self.0 >> 14usize) & 0x01;
+                super::vals::Ece(val as u8)
+            }
+            #[doc = "External clock enable"]
+            pub fn set_ece(&mut self, val: super::vals::Ece) {
+                self.0 = (self.0 & !(0x01 << 14usize)) | (((val.0 as u32) & 0x01) << 14usize);
+            }
+            #[doc = "External trigger polarity"]
+            pub const fn etp(&self) -> super::vals::Etp {
+                let val = (self.0 >> 15usize) & 0x01;
+                super::vals::Etp(val as u8)
+            }
+            #[doc = "External trigger polarity"]
+            pub fn set_etp(&mut self, val: super::vals::Etp) {
+                self.0 = (self.0 & !(0x01 << 15usize)) | (((val.0 as u32) & 0x01) << 15usize);
             }
         }
-        impl Default for Ur3 {
-            fn default() -> Ur3 {
-                Ur3(0)
+        impl Default for Smcr {
+            fn default() -> Smcr {
+                Smcr(0)
             }
         }
-        #[doc = "SYSCFG user register 4"]
+        #[doc = "DMA control register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur4(pub u32);
-        impl Ur4 {
-            #[doc = "Mass Erase Protected Area Disabled for bank 1"]
-            pub const fn mepad_1(&self) -> bool {
-                let val = (self.0 >> 16usize) & 0x01;
-                val != 0
+        pub struct Dcr(pub u32);
+        impl Dcr {
+            #[doc = "DMA base address"]
+            pub const fn dba(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0x1f;
+                val as u8
             }
-            #[doc = "Mass Erase Protected Area Disabled for bank 1"]
-            pub fn set_mepad_1(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
+            #[doc = "DMA base address"]
+            pub fn set_dba(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x1f << 0usize)) | (((val as u32) & 0x1f) << 0usize);
+            }
+            #[doc = "DMA burst length"]
+            pub const fn dbl(&self) -> u8 {
+                let val = (self.0 >> 8usize) & 0x1f;
+                val as u8
+            }
+            #[doc = "DMA burst length"]
+            pub fn set_dbl(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x1f << 8usize)) | (((val as u32) & 0x1f) << 8usize);
             }
         }
-        impl Default for Ur4 {
-            fn default() -> Ur4 {
-                Ur4(0)
+        impl Default for Dcr {
+            fn default() -> Dcr {
+                Dcr(0)
             }
         }
-        #[doc = "SYSCFG package register"]
+        #[doc = "capture/compare register 1"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Pkgr(pub u32);
-        impl Pkgr {
-            #[doc = "Package"]
-            pub const fn pkg(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x0f;
-                val as u8
+        pub struct Ccr32(pub u32);
+        impl Ccr32 {
+            #[doc = "Capture/Compare 1 value"]
+            pub const fn ccr(&self) -> u32 {
+                let val = (self.0 >> 0usize) & 0xffff_ffff;
+                val as u32
             }
-            #[doc = "Package"]
-            pub fn set_pkg(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
+            #[doc = "Capture/Compare 1 value"]
+            pub fn set_ccr(&mut self, val: u32) {
+                self.0 =
+                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
             }
         }
-        impl Default for Pkgr {
-            fn default() -> Pkgr {
-                Pkgr(0)
+        impl Default for Ccr32 {
+            fn default() -> Ccr32 {
+                Ccr32(0)
             }
         }
-        #[doc = "SYSCFG power control register"]
+        #[doc = "auto-reload register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Pwrcr(pub u32);
-        impl Pwrcr {
-            #[doc = "Overdrive enable"]
-            pub const fn oden(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x0f;
-                val as u8
+        pub struct Arr16(pub u32);
+        impl Arr16 {
+            #[doc = "Auto-reload value"]
+            pub const fn arr(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0xffff;
+                val as u16
             }
-            #[doc = "Overdrive enable"]
-            pub fn set_oden(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
+            #[doc = "Auto-reload value"]
+            pub fn set_arr(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
         }
-        impl Default for Pwrcr {
-            fn default() -> Pwrcr {
-                Pwrcr(0)
+        impl Default for Arr16 {
+            fn default() -> Arr16 {
+                Arr16(0)
             }
         }
-        #[doc = "SYSCFG user register 12"]
+        #[doc = "DMA address for full transfer"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur12(pub u32);
-        impl Ur12 {
-            #[doc = "Secure mode"]
-            pub const fn secure(&self) -> bool {
-                let val = (self.0 >> 16usize) & 0x01;
-                val != 0
+        pub struct Dmar(pub u32);
+        impl Dmar {
+            #[doc = "DMA register for burst accesses"]
+            pub const fn dmab(&self) -> u16 {
+                let val = (self.0 >> 0usize) & 0xffff;
+                val as u16
             }
-            #[doc = "Secure mode"]
-            pub fn set_secure(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
+            #[doc = "DMA register for burst accesses"]
+            pub fn set_dmab(&mut self, val: u16) {
+                self.0 = (self.0 & !(0xffff << 0usize)) | (((val as u32) & 0xffff) << 0usize);
             }
         }
-        impl Default for Ur12 {
-            fn default() -> Ur12 {
-                Ur12(0)
+        impl Default for Dmar {
+            fn default() -> Dmar {
+                Dmar(0)
             }
         }
-        #[doc = "SYSCFG compensation cell code register"]
+        #[doc = "counter"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cccr(pub u32);
-        impl Cccr {
-            #[doc = "NMOS compensation code"]
-            pub const fn ncc(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x0f;
-                val as u8
-            }
-            #[doc = "NMOS compensation code"]
-            pub fn set_ncc(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
-            }
-            #[doc = "PMOS compensation code"]
-            pub const fn pcc(&self) -> u8 {
-                let val = (self.0 >> 4usize) & 0x0f;
-                val as u8
+        pub struct Cnt32(pub u32);
+        impl Cnt32 {
+            #[doc = "counter value"]
+            pub const fn cnt(&self) -> u32 {
+                let val = (self.0 >> 0usize) & 0xffff_ffff;
+                val as u32
             }
-            #[doc = "PMOS compensation code"]
-            pub fn set_pcc(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x0f << 4usize)) | (((val as u32) & 0x0f) << 4usize);
+            #[doc = "counter value"]
+            pub fn set_cnt(&mut self, val: u32) {
+                self.0 =
+                    (self.0 & !(0xffff_ffff << 0usize)) | (((val as u32) & 0xffff_ffff) << 0usize);
             }
         }
-        impl Default for Cccr {
-            fn default() -> Cccr {
-                Cccr(0)
+        impl Default for Cnt32 {
+            fn default() -> Cnt32 {
+                Cnt32(0)
             }
         }
-        #[doc = "peripheral mode configuration register"]
+        #[doc = "break and dead-time register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Pmcr(pub u32);
-        impl Pmcr {
-            #[doc = "I2C1 Fm+"]
-            pub const fn i2c1fmp(&self) -> bool {
-                let val = (self.0 >> 0usize) & 0x01;
-                val != 0
+        pub struct Bdtr(pub u32);
+        impl Bdtr {
+            #[doc = "Dead-time generator setup"]
+            pub const fn dtg(&self) -> u8 {
+                let val = (self.0 >> 0usize) & 0xff;
+                val as u8
             }
-            #[doc = "I2C1 Fm+"]
-            pub fn set_i2c1fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
+            #[doc = "Dead-time generator setup"]
+            pub fn set_dtg(&mut self, val: u8) {
+                self.0 = (self.0 & !(0xff << 0usize)) | (((val as u32) & 0xff) << 0usize);
             }
-            #[doc = "I2C2 Fm+"]
-            pub const fn i2c2fmp(&self) -> bool {
-                let val = (self.0 >> 1usize) & 0x01;
-                val != 0
+            #[doc = "Lock configuration"]
+            pub const fn lock(&self) -> u8 {
+                let val = (self.0 >> 8usize) & 0x03;
+                val as u8
             }
-            #[doc = "I2C2 Fm+"]
-            pub fn set_i2c2fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
+            #[doc = "Lock configuration"]
+            pub fn set_lock(&mut self, val: u8) {
+                self.0 = (self.0 & !(0x03 << 8usize)) | (((val as u32) & 0x03) << 8usize);
             }
-            #[doc = "I2C3 Fm+"]
-            pub const fn i2c3fmp(&self) -> bool {
-                let val = (self.0 >> 2usize) & 0x01;
-                val != 0
+            #[doc = "Off-state selection for Idle mode"]
+            pub const fn ossi(&self) -> super::vals::Ossi {
+                let val = (self.0 >> 10usize) & 0x01;
+                super::vals::Ossi(val as u8)
             }
-            #[doc = "I2C3 Fm+"]
-            pub fn set_i2c3fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 2usize)) | (((val as u32) & 0x01) << 2usize);
+            #[doc = "Off-state selection for Idle mode"]
+            pub fn set_ossi(&mut self, val: super::vals::Ossi) {
+                self.0 = (self.0 & !(0x01 << 10usize)) | (((val.0 as u32) & 0x01) << 10usize);
             }
-            #[doc = "I2C4 Fm+"]
-            pub const fn i2c4fmp(&self) -> bool {
-                let val = (self.0 >> 3usize) & 0x01;
-                val != 0
+            #[doc = "Off-state selection for Run mode"]
+            pub const fn ossr(&self) -> super::vals::Ossr {
+                let val = (self.0 >> 11usize) & 0x01;
+                super::vals::Ossr(val as u8)
             }
-            #[doc = "I2C4 Fm+"]
-            pub fn set_i2c4fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 3usize)) | (((val as u32) & 0x01) << 3usize);
+            #[doc = "Off-state selection for Run mode"]
+            pub fn set_ossr(&mut self, val: super::vals::Ossr) {
+                self.0 = (self.0 & !(0x01 << 11usize)) | (((val.0 as u32) & 0x01) << 11usize);
             }
-            #[doc = "PB(6) Fm+"]
-            pub const fn pb6fmp(&self) -> bool {
-                let val = (self.0 >> 4usize) & 0x01;
+            #[doc = "Break enable"]
+            pub const fn bke(&self) -> bool {
+                let val = (self.0 >> 12usize) & 0x01;
                 val != 0
             }
-            #[doc = "PB(6) Fm+"]
-            pub fn set_pb6fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 4usize)) | (((val as u32) & 0x01) << 4usize);
+            #[doc = "Break enable"]
+            pub fn set_bke(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 12usize)) | (((val as u32) & 0x01) << 12usize);
             }
-            #[doc = "PB(7) Fast Mode Plus"]
-            pub const fn pb7fmp(&self) -> bool {
-                let val = (self.0 >> 5usize) & 0x01;
+            #[doc = "Break polarity"]
+            pub const fn bkp(&self) -> bool {
+                let val = (self.0 >> 13usize) & 0x01;
                 val != 0
             }
-            #[doc = "PB(7) Fast Mode Plus"]
-            pub fn set_pb7fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
+            #[doc = "Break polarity"]
+            pub fn set_bkp(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 13usize)) | (((val as u32) & 0x01) << 13usize);
             }
-            #[doc = "PB(8) Fast Mode Plus"]
-            pub const fn pb8fmp(&self) -> bool {
-                let val = (self.0 >> 6usize) & 0x01;
+            #[doc = "Automatic output enable"]
+            pub const fn aoe(&self) -> bool {
+                let val = (self.0 >> 14usize) & 0x01;
                 val != 0
             }
-            #[doc = "PB(8) Fast Mode Plus"]
-            pub fn set_pb8fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
+            #[doc = "Automatic output enable"]
+            pub fn set_aoe(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 14usize)) | (((val as u32) & 0x01) << 14usize);
             }
-            #[doc = "PB(9) Fm+"]
-            pub const fn pb9fmp(&self) -> bool {
-                let val = (self.0 >> 7usize) & 0x01;
+            #[doc = "Main output enable"]
+            pub const fn moe(&self) -> bool {
+                let val = (self.0 >> 15usize) & 0x01;
                 val != 0
             }
-            #[doc = "PB(9) Fm+"]
-            pub fn set_pb9fmp(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
-            }
-            #[doc = "Booster Enable"]
-            pub const fn booste(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
-                val != 0
+            #[doc = "Main output enable"]
+            pub fn set_moe(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 15usize)) | (((val as u32) & 0x01) << 15usize);
             }
-            #[doc = "Booster Enable"]
-            pub fn set_booste(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+        }
+        impl Default for Bdtr {
+            fn default() -> Bdtr {
+                Bdtr(0)
             }
-            #[doc = "Analog switch supply voltage selection"]
-            pub const fn boostvddsel(&self) -> bool {
-                let val = (self.0 >> 9usize) & 0x01;
+        }
+        #[doc = "status register"]
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq)]
+        pub struct SrAdv(pub u32);
+        impl SrAdv {
+            #[doc = "Update interrupt flag"]
+            pub const fn uif(&self) -> bool {
+                let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "Analog switch supply voltage selection"]
-            pub fn set_boostvddsel(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 9usize)) | (((val as u32) & 0x01) << 9usize);
-            }
-            #[doc = "Ethernet PHY Interface Selection"]
-            pub const fn epis(&self) -> u8 {
-                let val = (self.0 >> 21usize) & 0x07;
-                val as u8
-            }
-            #[doc = "Ethernet PHY Interface Selection"]
-            pub fn set_epis(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x07 << 21usize)) | (((val as u32) & 0x07) << 21usize);
+            #[doc = "Update interrupt flag"]
+            pub fn set_uif(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "PA0 Switch Open"]
-            pub const fn pa0so(&self) -> bool {
-                let val = (self.0 >> 24usize) & 0x01;
+            #[doc = "Capture/compare 1 interrupt flag"]
+            pub fn ccif(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
                 val != 0
             }
-            #[doc = "PA0 Switch Open"]
-            pub fn set_pa0so(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 24usize)) | (((val as u32) & 0x01) << 24usize);
+            #[doc = "Capture/compare 1 interrupt flag"]
+            pub fn set_ccif(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 1usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
-            #[doc = "PA1 Switch Open"]
-            pub const fn pa1so(&self) -> bool {
-                let val = (self.0 >> 25usize) & 0x01;
+            #[doc = "COM interrupt flag"]
+            pub const fn comif(&self) -> bool {
+                let val = (self.0 >> 5usize) & 0x01;
                 val != 0
             }
-            #[doc = "PA1 Switch Open"]
-            pub fn set_pa1so(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 25usize)) | (((val as u32) & 0x01) << 25usize);
+            #[doc = "COM interrupt flag"]
+            pub fn set_comif(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 5usize)) | (((val as u32) & 0x01) << 5usize);
             }
-            #[doc = "PC2 Switch Open"]
-            pub const fn pc2so(&self) -> bool {
-                let val = (self.0 >> 26usize) & 0x01;
+            #[doc = "Trigger interrupt flag"]
+            pub const fn tif(&self) -> bool {
+                let val = (self.0 >> 6usize) & 0x01;
                 val != 0
             }
-            #[doc = "PC2 Switch Open"]
-            pub fn set_pc2so(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 26usize)) | (((val as u32) & 0x01) << 26usize);
+            #[doc = "Trigger interrupt flag"]
+            pub fn set_tif(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 6usize)) | (((val as u32) & 0x01) << 6usize);
             }
-            #[doc = "PC3 Switch Open"]
-            pub const fn pc3so(&self) -> bool {
-                let val = (self.0 >> 27usize) & 0x01;
+            #[doc = "Break interrupt flag"]
+            pub const fn bif(&self) -> bool {
+                let val = (self.0 >> 7usize) & 0x01;
                 val != 0
             }
-            #[doc = "PC3 Switch Open"]
-            pub fn set_pc3so(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 27usize)) | (((val as u32) & 0x01) << 27usize);
-            }
-        }
-        impl Default for Pmcr {
-            fn default() -> Pmcr {
-                Pmcr(0)
-            }
-        }
-        #[doc = "SYSCFG user register 6"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur6(pub u32);
-        impl Ur6 {
-            #[doc = "Protected area start address for bank 1"]
-            pub const fn pa_beg_1(&self) -> u16 {
-                let val = (self.0 >> 0usize) & 0x0fff;
-                val as u16
-            }
-            #[doc = "Protected area start address for bank 1"]
-            pub fn set_pa_beg_1(&mut self, val: u16) {
-                self.0 = (self.0 & !(0x0fff << 0usize)) | (((val as u32) & 0x0fff) << 0usize);
-            }
-            #[doc = "Protected area end address for bank 1"]
-            pub const fn pa_end_1(&self) -> u16 {
-                let val = (self.0 >> 16usize) & 0x0fff;
-                val as u16
-            }
-            #[doc = "Protected area end address for bank 1"]
-            pub fn set_pa_end_1(&mut self, val: u16) {
-                self.0 = (self.0 & !(0x0fff << 16usize)) | (((val as u32) & 0x0fff) << 16usize);
-            }
-        }
-        impl Default for Ur6 {
-            fn default() -> Ur6 {
-                Ur6(0)
-            }
-        }
-        #[doc = "SYSCFG user register 2"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur2(pub u32);
-        impl Ur2 {
-            #[doc = "BOR_LVL Brownout Reset Threshold Level"]
-            pub const fn borh(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x03;
-                val as u8
-            }
-            #[doc = "BOR_LVL Brownout Reset Threshold Level"]
-            pub fn set_borh(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x03 << 0usize)) | (((val as u32) & 0x03) << 0usize);
+            #[doc = "Break interrupt flag"]
+            pub fn set_bif(&mut self, val: bool) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val as u32) & 0x01) << 7usize);
             }
-            #[doc = "Boot Address 0"]
-            pub const fn boot_add0(&self) -> u16 {
-                let val = (self.0 >> 16usize) & 0xffff;
-                val as u16
+            #[doc = "Capture/Compare 1 overcapture flag"]
+            pub fn ccof(&self, n: usize) -> bool {
+                assert!(n < 4usize);
+                let offs = 9usize + n * 1usize;
+                let val = (self.0 >> offs) & 0x01;
+                val != 0
             }
-            #[doc = "Boot Address 0"]
-            pub fn set_boot_add0(&mut self, val: u16) {
-                self.0 = (self.0 & !(0xffff << 16usize)) | (((val as u32) & 0xffff) << 16usize);
+            #[doc = "Capture/Compare 1 overcapture flag"]
+            pub fn set_ccof(&mut self, n: usize, val: bool) {
+                assert!(n < 4usize);
+                let offs = 9usize + n * 1usize;
+                self.0 = (self.0 & !(0x01 << offs)) | (((val as u32) & 0x01) << offs);
             }
         }
-        impl Default for Ur2 {
-            fn default() -> Ur2 {
-                Ur2(0)
+        impl Default for SrAdv {
+            fn default() -> SrAdv {
+                SrAdv(0)
             }
         }
-        #[doc = "SYSCFG user register 9"]
+        #[doc = "repetition counter register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur9(pub u32);
-        impl Ur9 {
-            #[doc = "Write protection for flash bank 2"]
-            pub const fn wrpn_2(&self) -> u8 {
+        pub struct Rcr(pub u32);
+        impl Rcr {
+            #[doc = "Repetition counter value"]
+            pub const fn rep(&self) -> u8 {
                 let val = (self.0 >> 0usize) & 0xff;
                 val as u8
             }
-            #[doc = "Write protection for flash bank 2"]
-            pub fn set_wrpn_2(&mut self, val: u8) {
+            #[doc = "Repetition counter value"]
+            pub fn set_rep(&mut self, val: u8) {
                 self.0 = (self.0 & !(0xff << 0usize)) | (((val as u32) & 0xff) << 0usize);
             }
-            #[doc = "Protected area start address for bank 2"]
-            pub const fn pa_beg_2(&self) -> u16 {
-                let val = (self.0 >> 16usize) & 0x0fff;
-                val as u16
-            }
-            #[doc = "Protected area start address for bank 2"]
-            pub fn set_pa_beg_2(&mut self, val: u16) {
-                self.0 = (self.0 & !(0x0fff << 16usize)) | (((val as u32) & 0x0fff) << 16usize);
-            }
-        }
-        impl Default for Ur9 {
-            fn default() -> Ur9 {
-                Ur9(0)
-            }
-        }
-        #[doc = "external interrupt configuration register 2"]
-        #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Exticr(pub u32);
-        impl Exticr {
-            #[doc = "EXTI x configuration (x = 4 to 7)"]
-            pub fn exti(&self, n: usize) -> u8 {
-                assert!(n < 4usize);
-                let offs = 0usize + n * 4usize;
-                let val = (self.0 >> offs) & 0x0f;
-                val as u8
-            }
-            #[doc = "EXTI x configuration (x = 4 to 7)"]
-            pub fn set_exti(&mut self, n: usize, val: u8) {
-                assert!(n < 4usize);
-                let offs = 0usize + n * 4usize;
-                self.0 = (self.0 & !(0x0f << offs)) | (((val as u32) & 0x0f) << offs);
-            }
         }
-        impl Default for Exticr {
-            fn default() -> Exticr {
-                Exticr(0)
+        impl Default for Rcr {
+            fn default() -> Rcr {
+                Rcr(0)
             }
         }
-        #[doc = "compensation cell control/status register"]
+        #[doc = "control register 1"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Cccsr(pub u32);
-        impl Cccsr {
-            #[doc = "enable"]
-            pub const fn en(&self) -> bool {
+        pub struct Cr1Basic(pub u32);
+        impl Cr1Basic {
+            #[doc = "Counter enable"]
+            pub const fn cen(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "enable"]
-            pub fn set_en(&mut self, val: bool) {
+            #[doc = "Counter enable"]
+            pub fn set_cen(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
-            #[doc = "Code selection"]
-            pub const fn cs(&self) -> bool {
+            #[doc = "Update disable"]
+            pub const fn udis(&self) -> bool {
                 let val = (self.0 >> 1usize) & 0x01;
                 val != 0
             }
-            #[doc = "Code selection"]
-            pub fn set_cs(&mut self, val: bool) {
+            #[doc = "Update disable"]
+            pub fn set_udis(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 1usize)) | (((val as u32) & 0x01) << 1usize);
             }
-            #[doc = "Compensation cell ready flag"]
-            pub const fn ready(&self) -> bool {
-                let val = (self.0 >> 8usize) & 0x01;
-                val != 0
+            #[doc = "Update request source"]
+            pub const fn urs(&self) -> super::vals::Urs {
+                let val = (self.0 >> 2usize) & 0x01;
+                super::vals::Urs(val as u8)
             }
-            #[doc = "Compensation cell ready flag"]
-            pub fn set_ready(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 8usize)) | (((val as u32) & 0x01) << 8usize);
+            #[doc = "Update request source"]
+            pub fn set_urs(&mut self, val: super::vals::Urs) {
+                self.0 = (self.0 & !(0x01 << 2usize)) | (((val.0 as u32) & 0x01) << 2usize);
             }
-            #[doc = "High-speed at low-voltage"]
-            pub const fn hslv(&self) -> bool {
-                let val = (self.0 >> 16usize) & 0x01;
-                val != 0
+            #[doc = "One-pulse mode"]
+            pub const fn opm(&self) -> super::vals::Opm {
+                let val = (self.0 >> 3usize) & 0x01;
+                super::vals::Opm(val as u8)
             }
-            #[doc = "High-speed at low-voltage"]
-            pub fn set_hslv(&mut self, val: bool) {
-                self.0 = (self.0 & !(0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize);
+            #[doc = "One-pulse mode"]
+            pub fn set_opm(&mut self, val: super::vals::Opm) {
+                self.0 = (self.0 & !(0x01 << 3usize)) | (((val.0 as u32) & 0x01) << 3usize);
+            }
+            #[doc = "Auto-reload preload enable"]
+            pub const fn arpe(&self) -> super::vals::Arpe {
+                let val = (self.0 >> 7usize) & 0x01;
+                super::vals::Arpe(val as u8)
+            }
+            #[doc = "Auto-reload preload enable"]
+            pub fn set_arpe(&mut self, val: super::vals::Arpe) {
+                self.0 = (self.0 & !(0x01 << 7usize)) | (((val.0 as u32) & 0x01) << 7usize);
             }
         }
-        impl Default for Cccsr {
-            fn default() -> Cccsr {
-                Cccsr(0)
+        impl Default for Cr1Basic {
+            fn default() -> Cr1Basic {
+                Cr1Basic(0)
             }
         }
-        #[doc = "SYSCFG user register 17"]
+        #[doc = "status register"]
         #[repr(transparent)]
         #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ur17(pub u32);
-        impl Ur17 {
-            #[doc = "I/O high speed / low voltage"]
-            pub const fn io_hslv(&self) -> bool {
+        pub struct SrBasic(pub u32);
+        impl SrBasic {
+            #[doc = "Update interrupt flag"]
+            pub const fn uif(&self) -> bool {
                 let val = (self.0 >> 0usize) & 0x01;
                 val != 0
             }
-            #[doc = "I/O high speed / low voltage"]
-            pub fn set_io_hslv(&mut self, val: bool) {
+            #[doc = "Update interrupt flag"]
+            pub fn set_uif(&mut self, val: bool) {
                 self.0 = (self.0 & !(0x01 << 0usize)) | (((val as u32) & 0x01) << 0usize);
             }
         }
-        impl Default for Ur17 {
-            fn default() -> Ur17 {
-                Ur17(0)
+        impl Default for SrBasic {
+            fn default() -> SrBasic {
+                SrBasic(0)
             }
         }
-        #[doc = "SYSCFG compensation cell value register"]
+    }
+    pub mod vals {
+        use crate::generic::*;
         #[repr(transparent)]
-        #[derive(Copy, Clone, Eq, PartialEq)]
-        pub struct Ccvr(pub u32);
-        impl Ccvr {
-            #[doc = "NMOS compensation value"]
-            pub const fn ncv(&self) -> u8 {
-                let val = (self.0 >> 0usize) & 0x0f;
-                val as u8
-            }
-            #[doc = "NMOS compensation value"]
-            pub fn set_ncv(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x0f << 0usize)) | (((val as u32) & 0x0f) << 0usize);
-            }
-            #[doc = "PMOS compensation value"]
-            pub const fn pcv(&self) -> u8 {
-                let val = (self.0 >> 4usize) & 0x0f;
-                val as u8
-            }
-            #[doc = "PMOS compensation value"]
-            pub fn set_pcv(&mut self, val: u8) {
-                self.0 = (self.0 & !(0x0f << 4usize)) | (((val as u32) & 0x0f) << 4usize);
-            }
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Cms(pub u8);
+        impl Cms {
+            #[doc = "The counter counts up or down depending on the direction bit"]
+            pub const EDGEALIGNED: Self = Self(0);
+            #[doc = "The counter counts up and down alternatively. Output compare interrupt flags are set only when the counter is counting down."]
+            pub const CENTERALIGNED1: Self = Self(0x01);
+            #[doc = "The counter counts up and down alternatively. Output compare interrupt flags are set only when the counter is counting up."]
+            pub const CENTERALIGNED2: Self = Self(0x02);
+            #[doc = "The counter counts up and down alternatively. Output compare interrupt flags are set both when the counter is counting up or down."]
+            pub const CENTERALIGNED3: Self = Self(0x03);
         }
-        impl Default for Ccvr {
-            fn default() -> Ccvr {
-                Ccvr(0)
-            }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Tis(pub u8);
+        impl Tis {
+            #[doc = "The TIMx_CH1 pin is connected to TI1 input"]
+            pub const NORMAL: Self = Self(0);
+            #[doc = "The TIMx_CH1, CH2, CH3 pins are connected to TI1 input"]
+            pub const XOR: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Msm(pub u8);
+        impl Msm {
+            #[doc = "No action"]
+            pub const NOSYNC: Self = Self(0);
+            #[doc = "The effect of an event on the trigger input (TRGI) is delayed to allow a perfect synchronization between the current timer and its slaves (through TRGO). It is useful if we want to synchronize several timers on a single external event."]
+            pub const SYNC: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Mms(pub u8);
+        impl Mms {
+            #[doc = "The UG bit from the TIMx_EGR register is used as trigger output"]
+            pub const RESET: Self = Self(0);
+            #[doc = "The counter enable signal, CNT_EN, is used as trigger output"]
+            pub const ENABLE: Self = Self(0x01);
+            #[doc = "The update event is selected as trigger output"]
+            pub const UPDATE: Self = Self(0x02);
+            #[doc = "The trigger output send a positive pulse when the CC1IF flag it to be set, as soon as a capture or a compare match occurred"]
+            pub const COMPAREPULSE: Self = Self(0x03);
+            #[doc = "OC1REF signal is used as trigger output"]
+            pub const COMPAREOC1: Self = Self(0x04);
+            #[doc = "OC2REF signal is used as trigger output"]
+            pub const COMPAREOC2: Self = Self(0x05);
+            #[doc = "OC3REF signal is used as trigger output"]
+            pub const COMPAREOC3: Self = Self(0x06);
+            #[doc = "OC4REF signal is used as trigger output"]
+            pub const COMPAREOC4: Self = Self(0x07);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Dir(pub u8);
+        impl Dir {
+            #[doc = "Counter used as upcounter"]
+            pub const UP: Self = Self(0);
+            #[doc = "Counter used as downcounter"]
+            pub const DOWN: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Arpe(pub u8);
+        impl Arpe {
+            #[doc = "TIMx_APRR register is not buffered"]
+            pub const DISABLED: Self = Self(0);
+            #[doc = "TIMx_APRR register is buffered"]
+            pub const ENABLED: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Sms(pub u8);
+        impl Sms {
+            #[doc = "Slave mode disabled - if CEN = ‘1 then the prescaler is clocked directly by the internal clock."]
+            pub const DISABLED: Self = Self(0);
+            #[doc = "Encoder mode 1 - Counter counts up/down on TI2FP1 edge depending on TI1FP2 level."]
+            pub const ENCODER_MODE_1: Self = Self(0x01);
+            #[doc = "Encoder mode 2 - Counter counts up/down on TI1FP2 edge depending on TI2FP1 level."]
+            pub const ENCODER_MODE_2: Self = Self(0x02);
+            #[doc = "Encoder mode 3 - Counter counts up/down on both TI1FP1 and TI2FP2 edges depending on the level of the other input."]
+            pub const ENCODER_MODE_3: Self = Self(0x03);
+            #[doc = "Reset Mode - Rising edge of the selected trigger input (TRGI) reinitializes the counter and generates an update of the registers."]
+            pub const RESET_MODE: Self = Self(0x04);
+            #[doc = "Gated Mode - The counter clock is enabled when the trigger input (TRGI) is high. The counter stops (but is not reset) as soon as the trigger becomes low. Both start and stop of the counter are controlled."]
+            pub const GATED_MODE: Self = Self(0x05);
+            #[doc = "Trigger Mode - The counter starts at a rising edge of the trigger TRGI (but it is not reset). Only the start of the counter is controlled."]
+            pub const TRIGGER_MODE: Self = Self(0x06);
+            #[doc = "External Clock Mode 1 - Rising edges of the selected trigger (TRGI) clock the counter."]
+            pub const EXT_CLOCK_MODE: Self = Self(0x07);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Ocm(pub u8);
+        impl Ocm {
+            #[doc = "The comparison between the output compare register TIMx_CCRy and the counter TIMx_CNT has no effect on the outputs"]
+            pub const FROZEN: Self = Self(0);
+            #[doc = "Set channel to active level on match. OCyREF signal is forced high when the counter matches the capture/compare register"]
+            pub const ACTIVEONMATCH: Self = Self(0x01);
+            #[doc = "Set channel to inactive level on match. OCyREF signal is forced low when the counter matches the capture/compare register"]
+            pub const INACTIVEONMATCH: Self = Self(0x02);
+            #[doc = "OCyREF toggles when TIMx_CNT=TIMx_CCRy"]
+            pub const TOGGLE: Self = Self(0x03);
+            #[doc = "OCyREF is forced low"]
+            pub const FORCEINACTIVE: Self = Self(0x04);
+            #[doc = "OCyREF is forced high"]
+            pub const FORCEACTIVE: Self = Self(0x05);
+            #[doc = "In upcounting, channel is active as long as TIMx_CNT<TIMx_CCRy else inactive. In downcounting, channel is inactive as long as TIMx_CNT>TIMx_CCRy else active"]
+            pub const PWMMODE1: Self = Self(0x06);
+            #[doc = "Inversely to PwmMode1"]
+            pub const PWMMODE2: Self = Self(0x07);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Ocpe(pub u8);
+        impl Ocpe {
+            #[doc = "Preload register on CCR2 disabled. New values written to CCR2 are taken into account immediately"]
+            pub const DISABLED: Self = Self(0);
+            #[doc = "Preload register on CCR2 enabled. Preload value is loaded into active register on each update event"]
+            pub const ENABLED: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Ckd(pub u8);
+        impl Ckd {
+            #[doc = "t_DTS = t_CK_INT"]
+            pub const DIV1: Self = Self(0);
+            #[doc = "t_DTS = 2 × t_CK_INT"]
+            pub const DIV2: Self = Self(0x01);
+            #[doc = "t_DTS = 4 × t_CK_INT"]
+            pub const DIV4: Self = Self(0x02);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Icf(pub u8);
+        impl Icf {
+            #[doc = "No filter, sampling is done at fDTS"]
+            pub const NOFILTER: Self = Self(0);
+            #[doc = "fSAMPLING=fCK_INT, N=2"]
+            pub const FCK_INT_N2: Self = Self(0x01);
+            #[doc = "fSAMPLING=fCK_INT, N=4"]
+            pub const FCK_INT_N4: Self = Self(0x02);
+            #[doc = "fSAMPLING=fCK_INT, N=8"]
+            pub const FCK_INT_N8: Self = Self(0x03);
+            #[doc = "fSAMPLING=fDTS/2, N=6"]
+            pub const FDTS_DIV2_N6: Self = Self(0x04);
+            #[doc = "fSAMPLING=fDTS/2, N=8"]
+            pub const FDTS_DIV2_N8: Self = Self(0x05);
+            #[doc = "fSAMPLING=fDTS/4, N=6"]
+            pub const FDTS_DIV4_N6: Self = Self(0x06);
+            #[doc = "fSAMPLING=fDTS/4, N=8"]
+            pub const FDTS_DIV4_N8: Self = Self(0x07);
+            #[doc = "fSAMPLING=fDTS/8, N=6"]
+            pub const FDTS_DIV8_N6: Self = Self(0x08);
+            #[doc = "fSAMPLING=fDTS/8, N=8"]
+            pub const FDTS_DIV8_N8: Self = Self(0x09);
+            #[doc = "fSAMPLING=fDTS/16, N=5"]
+            pub const FDTS_DIV16_N5: Self = Self(0x0a);
+            #[doc = "fSAMPLING=fDTS/16, N=6"]
+            pub const FDTS_DIV16_N6: Self = Self(0x0b);
+            #[doc = "fSAMPLING=fDTS/16, N=8"]
+            pub const FDTS_DIV16_N8: Self = Self(0x0c);
+            #[doc = "fSAMPLING=fDTS/32, N=5"]
+            pub const FDTS_DIV32_N5: Self = Self(0x0d);
+            #[doc = "fSAMPLING=fDTS/32, N=6"]
+            pub const FDTS_DIV32_N6: Self = Self(0x0e);
+            #[doc = "fSAMPLING=fDTS/32, N=8"]
+            pub const FDTS_DIV32_N8: Self = Self(0x0f);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Urs(pub u8);
+        impl Urs {
+            #[doc = "Any of counter overflow/underflow, setting UG, or update through slave mode, generates an update interrupt or DMA request"]
+            pub const ANYEVENT: Self = Self(0);
+            #[doc = "Only counter overflow/underflow generates an update interrupt or DMA request"]
+            pub const COUNTERONLY: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Ccds(pub u8);
+        impl Ccds {
+            #[doc = "CCx DMA request sent when CCx event occurs"]
+            pub const ONCOMPARE: Self = Self(0);
+            #[doc = "CCx DMA request sent when update event occurs"]
+            pub const ONUPDATE: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct CcmrInputCcs(pub u8);
+        impl CcmrInputCcs {
+            #[doc = "CCx channel is configured as input, normal mapping: ICx mapped to TIx"]
+            pub const TI4: Self = Self(0x01);
+            #[doc = "CCx channel is configured as input, alternate mapping (switches 1 with 2, 3 with 4)"]
+            pub const TI3: Self = Self(0x02);
+            #[doc = "CCx channel is configured as input, ICx is mapped on TRC"]
+            pub const TRC: Self = Self(0x03);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Opm(pub u8);
+        impl Opm {
+            #[doc = "Counter is not stopped at update event"]
+            pub const DISABLED: Self = Self(0);
+            #[doc = "Counter stops counting at the next update event (clearing the CEN bit)"]
+            pub const ENABLED: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct CcmrOutputCcs(pub u8);
+        impl CcmrOutputCcs {
+            #[doc = "CCx channel is configured as output"]
+            pub const OUTPUT: Self = Self(0);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Ece(pub u8);
+        impl Ece {
+            #[doc = "External clock mode 2 disabled"]
+            pub const DISABLED: Self = Self(0);
+            #[doc = "External clock mode 2 enabled. The counter is clocked by any active edge on the ETRF signal."]
+            pub const ENABLED: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Etp(pub u8);
+        impl Etp {
+            #[doc = "ETR is noninverted, active at high level or rising edge"]
+            pub const NOTINVERTED: Self = Self(0);
+            #[doc = "ETR is inverted, active at low level or falling edge"]
+            pub const INVERTED: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Etf(pub u8);
+        impl Etf {
+            #[doc = "No filter, sampling is done at fDTS"]
+            pub const NOFILTER: Self = Self(0);
+            #[doc = "fSAMPLING=fCK_INT, N=2"]
+            pub const FCK_INT_N2: Self = Self(0x01);
+            #[doc = "fSAMPLING=fCK_INT, N=4"]
+            pub const FCK_INT_N4: Self = Self(0x02);
+            #[doc = "fSAMPLING=fCK_INT, N=8"]
+            pub const FCK_INT_N8: Self = Self(0x03);
+            #[doc = "fSAMPLING=fDTS/2, N=6"]
+            pub const FDTS_DIV2_N6: Self = Self(0x04);
+            #[doc = "fSAMPLING=fDTS/2, N=8"]
+            pub const FDTS_DIV2_N8: Self = Self(0x05);
+            #[doc = "fSAMPLING=fDTS/4, N=6"]
+            pub const FDTS_DIV4_N6: Self = Self(0x06);
+            #[doc = "fSAMPLING=fDTS/4, N=8"]
+            pub const FDTS_DIV4_N8: Self = Self(0x07);
+            #[doc = "fSAMPLING=fDTS/8, N=6"]
+            pub const FDTS_DIV8_N6: Self = Self(0x08);
+            #[doc = "fSAMPLING=fDTS/8, N=8"]
+            pub const FDTS_DIV8_N8: Self = Self(0x09);
+            #[doc = "fSAMPLING=fDTS/16, N=5"]
+            pub const FDTS_DIV16_N5: Self = Self(0x0a);
+            #[doc = "fSAMPLING=fDTS/16, N=6"]
+            pub const FDTS_DIV16_N6: Self = Self(0x0b);
+            #[doc = "fSAMPLING=fDTS/16, N=8"]
+            pub const FDTS_DIV16_N8: Self = Self(0x0c);
+            #[doc = "fSAMPLING=fDTS/32, N=5"]
+            pub const FDTS_DIV32_N5: Self = Self(0x0d);
+            #[doc = "fSAMPLING=fDTS/32, N=6"]
+            pub const FDTS_DIV32_N6: Self = Self(0x0e);
+            #[doc = "fSAMPLING=fDTS/32, N=8"]
+            pub const FDTS_DIV32_N8: Self = Self(0x0f);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Ts(pub u8);
+        impl Ts {
+            #[doc = "Internal Trigger 0 (ITR0)"]
+            pub const ITR0: Self = Self(0);
+            #[doc = "Internal Trigger 1 (ITR1)"]
+            pub const ITR1: Self = Self(0x01);
+            #[doc = "Internal Trigger 2 (ITR2)"]
+            pub const ITR2: Self = Self(0x02);
+            #[doc = "TI1 Edge Detector (TI1F_ED)"]
+            pub const TI1F_ED: Self = Self(0x04);
+            #[doc = "Filtered Timer Input 1 (TI1FP1)"]
+            pub const TI1FP1: Self = Self(0x05);
+            #[doc = "Filtered Timer Input 2 (TI2FP2)"]
+            pub const TI2FP2: Self = Self(0x06);
+            #[doc = "External Trigger input (ETRF)"]
+            pub const ETRF: Self = Self(0x07);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Ossr(pub u8);
+        impl Ossr {
+            #[doc = "When inactive, OC/OCN outputs are disabled"]
+            pub const DISABLED: Self = Self(0);
+            #[doc = "When inactive, OC/OCN outputs are enabled with their inactive level"]
+            pub const IDLELEVEL: Self = Self(0x01);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Etps(pub u8);
+        impl Etps {
+            #[doc = "Prescaler OFF"]
+            pub const DIV1: Self = Self(0);
+            #[doc = "ETRP frequency divided by 2"]
+            pub const DIV2: Self = Self(0x01);
+            #[doc = "ETRP frequency divided by 4"]
+            pub const DIV4: Self = Self(0x02);
+            #[doc = "ETRP frequency divided by 8"]
+            pub const DIV8: Self = Self(0x03);
+        }
+        #[repr(transparent)]
+        #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd)]
+        pub struct Ossi(pub u8);
+        impl Ossi {
+            #[doc = "When inactive, OC/OCN outputs are disabled"]
+            pub const DISABLED: Self = Self(0);
+            #[doc = "When inactive, OC/OCN outputs are forced to idle level"]
+            pub const IDLELEVEL: Self = Self(0x01);
         }
     }
 }
diff --git a/embassy-stm32/src/pac/stm32f401cb.rs b/embassy-stm32/src/pac/stm32f401cb.rs
index 4741e9d31..fe69202d8 100644
--- a/embassy-stm32/src/pac/stm32f401cb.rs
+++ b/embassy-stm32/src/pac/stm32f401cb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f401cc.rs b/embassy-stm32/src/pac/stm32f401cc.rs
index 4741e9d31..fe69202d8 100644
--- a/embassy-stm32/src/pac/stm32f401cc.rs
+++ b/embassy-stm32/src/pac/stm32f401cc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f401cd.rs b/embassy-stm32/src/pac/stm32f401cd.rs
index 4741e9d31..fe69202d8 100644
--- a/embassy-stm32/src/pac/stm32f401cd.rs
+++ b/embassy-stm32/src/pac/stm32f401cd.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f401ce.rs b/embassy-stm32/src/pac/stm32f401ce.rs
index 4741e9d31..fe69202d8 100644
--- a/embassy-stm32/src/pac/stm32f401ce.rs
+++ b/embassy-stm32/src/pac/stm32f401ce.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f401rb.rs b/embassy-stm32/src/pac/stm32f401rb.rs
index 4741e9d31..fe69202d8 100644
--- a/embassy-stm32/src/pac/stm32f401rb.rs
+++ b/embassy-stm32/src/pac/stm32f401rb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f401rc.rs b/embassy-stm32/src/pac/stm32f401rc.rs
index 4741e9d31..fe69202d8 100644
--- a/embassy-stm32/src/pac/stm32f401rc.rs
+++ b/embassy-stm32/src/pac/stm32f401rc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f401rd.rs b/embassy-stm32/src/pac/stm32f401rd.rs
index 4741e9d31..fe69202d8 100644
--- a/embassy-stm32/src/pac/stm32f401rd.rs
+++ b/embassy-stm32/src/pac/stm32f401rd.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f401re.rs b/embassy-stm32/src/pac/stm32f401re.rs
index 4741e9d31..fe69202d8 100644
--- a/embassy-stm32/src/pac/stm32f401re.rs
+++ b/embassy-stm32/src/pac/stm32f401re.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f401vb.rs b/embassy-stm32/src/pac/stm32f401vb.rs
index 4741e9d31..fe69202d8 100644
--- a/embassy-stm32/src/pac/stm32f401vb.rs
+++ b/embassy-stm32/src/pac/stm32f401vb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f401vc.rs b/embassy-stm32/src/pac/stm32f401vc.rs
index 4741e9d31..fe69202d8 100644
--- a/embassy-stm32/src/pac/stm32f401vc.rs
+++ b/embassy-stm32/src/pac/stm32f401vc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f401vd.rs b/embassy-stm32/src/pac/stm32f401vd.rs
index 4741e9d31..fe69202d8 100644
--- a/embassy-stm32/src/pac/stm32f401vd.rs
+++ b/embassy-stm32/src/pac/stm32f401vd.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f401ve.rs b/embassy-stm32/src/pac/stm32f401ve.rs
index 4741e9d31..fe69202d8 100644
--- a/embassy-stm32/src/pac/stm32f401ve.rs
+++ b/embassy-stm32/src/pac/stm32f401ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f405oe.rs b/embassy-stm32/src/pac/stm32f405oe.rs
index a82a17890..ef281f87c 100644
--- a/embassy-stm32/src/pac/stm32f405oe.rs
+++ b/embassy-stm32/src/pac/stm32f405oe.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f405og.rs b/embassy-stm32/src/pac/stm32f405og.rs
index a82a17890..ef281f87c 100644
--- a/embassy-stm32/src/pac/stm32f405og.rs
+++ b/embassy-stm32/src/pac/stm32f405og.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f405rg.rs b/embassy-stm32/src/pac/stm32f405rg.rs
index a82a17890..ef281f87c 100644
--- a/embassy-stm32/src/pac/stm32f405rg.rs
+++ b/embassy-stm32/src/pac/stm32f405rg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f405vg.rs b/embassy-stm32/src/pac/stm32f405vg.rs
index a82a17890..ef281f87c 100644
--- a/embassy-stm32/src/pac/stm32f405vg.rs
+++ b/embassy-stm32/src/pac/stm32f405vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f405zg.rs b/embassy-stm32/src/pac/stm32f405zg.rs
index a82a17890..ef281f87c 100644
--- a/embassy-stm32/src/pac/stm32f405zg.rs
+++ b/embassy-stm32/src/pac/stm32f405zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f407ie.rs b/embassy-stm32/src/pac/stm32f407ie.rs
index 2a9aea05f..e331efc83 100644
--- a/embassy-stm32/src/pac/stm32f407ie.rs
+++ b/embassy-stm32/src/pac/stm32f407ie.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f407ig.rs b/embassy-stm32/src/pac/stm32f407ig.rs
index 2a9aea05f..e331efc83 100644
--- a/embassy-stm32/src/pac/stm32f407ig.rs
+++ b/embassy-stm32/src/pac/stm32f407ig.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f407ve.rs b/embassy-stm32/src/pac/stm32f407ve.rs
index 2a9aea05f..e331efc83 100644
--- a/embassy-stm32/src/pac/stm32f407ve.rs
+++ b/embassy-stm32/src/pac/stm32f407ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f407vg.rs b/embassy-stm32/src/pac/stm32f407vg.rs
index 2a9aea05f..e331efc83 100644
--- a/embassy-stm32/src/pac/stm32f407vg.rs
+++ b/embassy-stm32/src/pac/stm32f407vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f407ze.rs b/embassy-stm32/src/pac/stm32f407ze.rs
index 2a9aea05f..e331efc83 100644
--- a/embassy-stm32/src/pac/stm32f407ze.rs
+++ b/embassy-stm32/src/pac/stm32f407ze.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f407zg.rs b/embassy-stm32/src/pac/stm32f407zg.rs
index 2a9aea05f..e331efc83 100644
--- a/embassy-stm32/src/pac/stm32f407zg.rs
+++ b/embassy-stm32/src/pac/stm32f407zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f410c8.rs b/embassy-stm32/src/pac/stm32f410c8.rs
index 05f9ca68c..0ade08eff 100644
--- a/embassy-stm32/src/pac/stm32f410c8.rs
+++ b/embassy-stm32/src/pac/stm32f410c8.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f410cb.rs b/embassy-stm32/src/pac/stm32f410cb.rs
index 05f9ca68c..0ade08eff 100644
--- a/embassy-stm32/src/pac/stm32f410cb.rs
+++ b/embassy-stm32/src/pac/stm32f410cb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f410r8.rs b/embassy-stm32/src/pac/stm32f410r8.rs
index 05f9ca68c..0ade08eff 100644
--- a/embassy-stm32/src/pac/stm32f410r8.rs
+++ b/embassy-stm32/src/pac/stm32f410r8.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f410rb.rs b/embassy-stm32/src/pac/stm32f410rb.rs
index 05f9ca68c..0ade08eff 100644
--- a/embassy-stm32/src/pac/stm32f410rb.rs
+++ b/embassy-stm32/src/pac/stm32f410rb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f410t8.rs b/embassy-stm32/src/pac/stm32f410t8.rs
index 25d99f0a2..01c938453 100644
--- a/embassy-stm32/src/pac/stm32f410t8.rs
+++ b/embassy-stm32/src/pac/stm32f410t8.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f410tb.rs b/embassy-stm32/src/pac/stm32f410tb.rs
index 25d99f0a2..01c938453 100644
--- a/embassy-stm32/src/pac/stm32f410tb.rs
+++ b/embassy-stm32/src/pac/stm32f410tb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f411cc.rs b/embassy-stm32/src/pac/stm32f411cc.rs
index c1d9cef53..1e54e97c9 100644
--- a/embassy-stm32/src/pac/stm32f411cc.rs
+++ b/embassy-stm32/src/pac/stm32f411cc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f411ce.rs b/embassy-stm32/src/pac/stm32f411ce.rs
index c1d9cef53..1e54e97c9 100644
--- a/embassy-stm32/src/pac/stm32f411ce.rs
+++ b/embassy-stm32/src/pac/stm32f411ce.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f411rc.rs b/embassy-stm32/src/pac/stm32f411rc.rs
index c1d9cef53..1e54e97c9 100644
--- a/embassy-stm32/src/pac/stm32f411rc.rs
+++ b/embassy-stm32/src/pac/stm32f411rc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f411re.rs b/embassy-stm32/src/pac/stm32f411re.rs
index c1d9cef53..1e54e97c9 100644
--- a/embassy-stm32/src/pac/stm32f411re.rs
+++ b/embassy-stm32/src/pac/stm32f411re.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f411vc.rs b/embassy-stm32/src/pac/stm32f411vc.rs
index c1d9cef53..1e54e97c9 100644
--- a/embassy-stm32/src/pac/stm32f411vc.rs
+++ b/embassy-stm32/src/pac/stm32f411vc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f411ve.rs b/embassy-stm32/src/pac/stm32f411ve.rs
index c1d9cef53..1e54e97c9 100644
--- a/embassy-stm32/src/pac/stm32f411ve.rs
+++ b/embassy-stm32/src/pac/stm32f411ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f412ce.rs b/embassy-stm32/src/pac/stm32f412ce.rs
index a29b62d2a..9f734f6e1 100644
--- a/embassy-stm32/src/pac/stm32f412ce.rs
+++ b/embassy-stm32/src/pac/stm32f412ce.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f412cg.rs b/embassy-stm32/src/pac/stm32f412cg.rs
index a29b62d2a..9f734f6e1 100644
--- a/embassy-stm32/src/pac/stm32f412cg.rs
+++ b/embassy-stm32/src/pac/stm32f412cg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f412re.rs b/embassy-stm32/src/pac/stm32f412re.rs
index 4633e3a3a..faee66505 100644
--- a/embassy-stm32/src/pac/stm32f412re.rs
+++ b/embassy-stm32/src/pac/stm32f412re.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f412rg.rs b/embassy-stm32/src/pac/stm32f412rg.rs
index 4633e3a3a..faee66505 100644
--- a/embassy-stm32/src/pac/stm32f412rg.rs
+++ b/embassy-stm32/src/pac/stm32f412rg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f412ve.rs b/embassy-stm32/src/pac/stm32f412ve.rs
index d27c86bfd..035b44f21 100644
--- a/embassy-stm32/src/pac/stm32f412ve.rs
+++ b/embassy-stm32/src/pac/stm32f412ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f412vg.rs b/embassy-stm32/src/pac/stm32f412vg.rs
index d27c86bfd..035b44f21 100644
--- a/embassy-stm32/src/pac/stm32f412vg.rs
+++ b/embassy-stm32/src/pac/stm32f412vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f412ze.rs b/embassy-stm32/src/pac/stm32f412ze.rs
index d27c86bfd..035b44f21 100644
--- a/embassy-stm32/src/pac/stm32f412ze.rs
+++ b/embassy-stm32/src/pac/stm32f412ze.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f412zg.rs b/embassy-stm32/src/pac/stm32f412zg.rs
index d27c86bfd..035b44f21 100644
--- a/embassy-stm32/src/pac/stm32f412zg.rs
+++ b/embassy-stm32/src/pac/stm32f412zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f413cg.rs b/embassy-stm32/src/pac/stm32f413cg.rs
index daace7a47..b2b2c30d6 100644
--- a/embassy-stm32/src/pac/stm32f413cg.rs
+++ b/embassy-stm32/src/pac/stm32f413cg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f413ch.rs b/embassy-stm32/src/pac/stm32f413ch.rs
index daace7a47..b2b2c30d6 100644
--- a/embassy-stm32/src/pac/stm32f413ch.rs
+++ b/embassy-stm32/src/pac/stm32f413ch.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f413mg.rs b/embassy-stm32/src/pac/stm32f413mg.rs
index 0b03ec443..e653d0cb1 100644
--- a/embassy-stm32/src/pac/stm32f413mg.rs
+++ b/embassy-stm32/src/pac/stm32f413mg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f413mh.rs b/embassy-stm32/src/pac/stm32f413mh.rs
index 0b03ec443..e653d0cb1 100644
--- a/embassy-stm32/src/pac/stm32f413mh.rs
+++ b/embassy-stm32/src/pac/stm32f413mh.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f413rg.rs b/embassy-stm32/src/pac/stm32f413rg.rs
index 0b03ec443..e653d0cb1 100644
--- a/embassy-stm32/src/pac/stm32f413rg.rs
+++ b/embassy-stm32/src/pac/stm32f413rg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f413rh.rs b/embassy-stm32/src/pac/stm32f413rh.rs
index 0b03ec443..e653d0cb1 100644
--- a/embassy-stm32/src/pac/stm32f413rh.rs
+++ b/embassy-stm32/src/pac/stm32f413rh.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f413vg.rs b/embassy-stm32/src/pac/stm32f413vg.rs
index 0b03ec443..e653d0cb1 100644
--- a/embassy-stm32/src/pac/stm32f413vg.rs
+++ b/embassy-stm32/src/pac/stm32f413vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f413vh.rs b/embassy-stm32/src/pac/stm32f413vh.rs
index 0b03ec443..e653d0cb1 100644
--- a/embassy-stm32/src/pac/stm32f413vh.rs
+++ b/embassy-stm32/src/pac/stm32f413vh.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f413zg.rs b/embassy-stm32/src/pac/stm32f413zg.rs
index 0b03ec443..e653d0cb1 100644
--- a/embassy-stm32/src/pac/stm32f413zg.rs
+++ b/embassy-stm32/src/pac/stm32f413zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f413zh.rs b/embassy-stm32/src/pac/stm32f413zh.rs
index 0b03ec443..e653d0cb1 100644
--- a/embassy-stm32/src/pac/stm32f413zh.rs
+++ b/embassy-stm32/src/pac/stm32f413zh.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f415og.rs b/embassy-stm32/src/pac/stm32f415og.rs
index e9a6b51c0..46f5b252c 100644
--- a/embassy-stm32/src/pac/stm32f415og.rs
+++ b/embassy-stm32/src/pac/stm32f415og.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f415rg.rs b/embassy-stm32/src/pac/stm32f415rg.rs
index e9a6b51c0..46f5b252c 100644
--- a/embassy-stm32/src/pac/stm32f415rg.rs
+++ b/embassy-stm32/src/pac/stm32f415rg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f415vg.rs b/embassy-stm32/src/pac/stm32f415vg.rs
index e9a6b51c0..46f5b252c 100644
--- a/embassy-stm32/src/pac/stm32f415vg.rs
+++ b/embassy-stm32/src/pac/stm32f415vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f415zg.rs b/embassy-stm32/src/pac/stm32f415zg.rs
index e9a6b51c0..46f5b252c 100644
--- a/embassy-stm32/src/pac/stm32f415zg.rs
+++ b/embassy-stm32/src/pac/stm32f415zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f417ie.rs b/embassy-stm32/src/pac/stm32f417ie.rs
index b34f999b9..1a528a3ca 100644
--- a/embassy-stm32/src/pac/stm32f417ie.rs
+++ b/embassy-stm32/src/pac/stm32f417ie.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f417ig.rs b/embassy-stm32/src/pac/stm32f417ig.rs
index b34f999b9..1a528a3ca 100644
--- a/embassy-stm32/src/pac/stm32f417ig.rs
+++ b/embassy-stm32/src/pac/stm32f417ig.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f417ve.rs b/embassy-stm32/src/pac/stm32f417ve.rs
index b34f999b9..1a528a3ca 100644
--- a/embassy-stm32/src/pac/stm32f417ve.rs
+++ b/embassy-stm32/src/pac/stm32f417ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f417vg.rs b/embassy-stm32/src/pac/stm32f417vg.rs
index b34f999b9..1a528a3ca 100644
--- a/embassy-stm32/src/pac/stm32f417vg.rs
+++ b/embassy-stm32/src/pac/stm32f417vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f417ze.rs b/embassy-stm32/src/pac/stm32f417ze.rs
index b34f999b9..1a528a3ca 100644
--- a/embassy-stm32/src/pac/stm32f417ze.rs
+++ b/embassy-stm32/src/pac/stm32f417ze.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f417zg.rs b/embassy-stm32/src/pac/stm32f417zg.rs
index b34f999b9..1a528a3ca 100644
--- a/embassy-stm32/src/pac/stm32f417zg.rs
+++ b/embassy-stm32/src/pac/stm32f417zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f423ch.rs b/embassy-stm32/src/pac/stm32f423ch.rs
index 8f86077ca..887aa7126 100644
--- a/embassy-stm32/src/pac/stm32f423ch.rs
+++ b/embassy-stm32/src/pac/stm32f423ch.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f423mh.rs b/embassy-stm32/src/pac/stm32f423mh.rs
index 7d787dfde..00c927ce2 100644
--- a/embassy-stm32/src/pac/stm32f423mh.rs
+++ b/embassy-stm32/src/pac/stm32f423mh.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f423rh.rs b/embassy-stm32/src/pac/stm32f423rh.rs
index 7d787dfde..00c927ce2 100644
--- a/embassy-stm32/src/pac/stm32f423rh.rs
+++ b/embassy-stm32/src/pac/stm32f423rh.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f423vh.rs b/embassy-stm32/src/pac/stm32f423vh.rs
index 7d787dfde..00c927ce2 100644
--- a/embassy-stm32/src/pac/stm32f423vh.rs
+++ b/embassy-stm32/src/pac/stm32f423vh.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f423zh.rs b/embassy-stm32/src/pac/stm32f423zh.rs
index 7d787dfde..00c927ce2 100644
--- a/embassy-stm32/src/pac/stm32f423zh.rs
+++ b/embassy-stm32/src/pac/stm32f423zh.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f427ag.rs b/embassy-stm32/src/pac/stm32f427ag.rs
index 8130dfa2b..61acdfec2 100644
--- a/embassy-stm32/src/pac/stm32f427ag.rs
+++ b/embassy-stm32/src/pac/stm32f427ag.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f427ai.rs b/embassy-stm32/src/pac/stm32f427ai.rs
index 8130dfa2b..61acdfec2 100644
--- a/embassy-stm32/src/pac/stm32f427ai.rs
+++ b/embassy-stm32/src/pac/stm32f427ai.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f427ig.rs b/embassy-stm32/src/pac/stm32f427ig.rs
index 8130dfa2b..61acdfec2 100644
--- a/embassy-stm32/src/pac/stm32f427ig.rs
+++ b/embassy-stm32/src/pac/stm32f427ig.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f427ii.rs b/embassy-stm32/src/pac/stm32f427ii.rs
index 8130dfa2b..61acdfec2 100644
--- a/embassy-stm32/src/pac/stm32f427ii.rs
+++ b/embassy-stm32/src/pac/stm32f427ii.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f427vg.rs b/embassy-stm32/src/pac/stm32f427vg.rs
index 8130dfa2b..61acdfec2 100644
--- a/embassy-stm32/src/pac/stm32f427vg.rs
+++ b/embassy-stm32/src/pac/stm32f427vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f427vi.rs b/embassy-stm32/src/pac/stm32f427vi.rs
index 8130dfa2b..61acdfec2 100644
--- a/embassy-stm32/src/pac/stm32f427vi.rs
+++ b/embassy-stm32/src/pac/stm32f427vi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f427zg.rs b/embassy-stm32/src/pac/stm32f427zg.rs
index 8130dfa2b..61acdfec2 100644
--- a/embassy-stm32/src/pac/stm32f427zg.rs
+++ b/embassy-stm32/src/pac/stm32f427zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f427zi.rs b/embassy-stm32/src/pac/stm32f427zi.rs
index 8130dfa2b..61acdfec2 100644
--- a/embassy-stm32/src/pac/stm32f427zi.rs
+++ b/embassy-stm32/src/pac/stm32f427zi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429ag.rs b/embassy-stm32/src/pac/stm32f429ag.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429ag.rs
+++ b/embassy-stm32/src/pac/stm32f429ag.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429ai.rs b/embassy-stm32/src/pac/stm32f429ai.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429ai.rs
+++ b/embassy-stm32/src/pac/stm32f429ai.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429be.rs b/embassy-stm32/src/pac/stm32f429be.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429be.rs
+++ b/embassy-stm32/src/pac/stm32f429be.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429bg.rs b/embassy-stm32/src/pac/stm32f429bg.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429bg.rs
+++ b/embassy-stm32/src/pac/stm32f429bg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429bi.rs b/embassy-stm32/src/pac/stm32f429bi.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429bi.rs
+++ b/embassy-stm32/src/pac/stm32f429bi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429ie.rs b/embassy-stm32/src/pac/stm32f429ie.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429ie.rs
+++ b/embassy-stm32/src/pac/stm32f429ie.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429ig.rs b/embassy-stm32/src/pac/stm32f429ig.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429ig.rs
+++ b/embassy-stm32/src/pac/stm32f429ig.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429ii.rs b/embassy-stm32/src/pac/stm32f429ii.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429ii.rs
+++ b/embassy-stm32/src/pac/stm32f429ii.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429ne.rs b/embassy-stm32/src/pac/stm32f429ne.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429ne.rs
+++ b/embassy-stm32/src/pac/stm32f429ne.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429ng.rs b/embassy-stm32/src/pac/stm32f429ng.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429ng.rs
+++ b/embassy-stm32/src/pac/stm32f429ng.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429ni.rs b/embassy-stm32/src/pac/stm32f429ni.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429ni.rs
+++ b/embassy-stm32/src/pac/stm32f429ni.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429ve.rs b/embassy-stm32/src/pac/stm32f429ve.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429ve.rs
+++ b/embassy-stm32/src/pac/stm32f429ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429vg.rs b/embassy-stm32/src/pac/stm32f429vg.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429vg.rs
+++ b/embassy-stm32/src/pac/stm32f429vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429vi.rs b/embassy-stm32/src/pac/stm32f429vi.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429vi.rs
+++ b/embassy-stm32/src/pac/stm32f429vi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429ze.rs b/embassy-stm32/src/pac/stm32f429ze.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429ze.rs
+++ b/embassy-stm32/src/pac/stm32f429ze.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f429zg.rs b/embassy-stm32/src/pac/stm32f429zg.rs
index b76378e03..a1a3ab422 100644
--- a/embassy-stm32/src/pac/stm32f429zg.rs
+++ b/embassy-stm32/src/pac/stm32f429zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f437ai.rs b/embassy-stm32/src/pac/stm32f437ai.rs
index 5648362a9..3c30eec9a 100644
--- a/embassy-stm32/src/pac/stm32f437ai.rs
+++ b/embassy-stm32/src/pac/stm32f437ai.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f437ig.rs b/embassy-stm32/src/pac/stm32f437ig.rs
index 5648362a9..3c30eec9a 100644
--- a/embassy-stm32/src/pac/stm32f437ig.rs
+++ b/embassy-stm32/src/pac/stm32f437ig.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f437ii.rs b/embassy-stm32/src/pac/stm32f437ii.rs
index 5648362a9..3c30eec9a 100644
--- a/embassy-stm32/src/pac/stm32f437ii.rs
+++ b/embassy-stm32/src/pac/stm32f437ii.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f437vg.rs b/embassy-stm32/src/pac/stm32f437vg.rs
index 5648362a9..3c30eec9a 100644
--- a/embassy-stm32/src/pac/stm32f437vg.rs
+++ b/embassy-stm32/src/pac/stm32f437vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f437vi.rs b/embassy-stm32/src/pac/stm32f437vi.rs
index 5648362a9..3c30eec9a 100644
--- a/embassy-stm32/src/pac/stm32f437vi.rs
+++ b/embassy-stm32/src/pac/stm32f437vi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f437zg.rs b/embassy-stm32/src/pac/stm32f437zg.rs
index 5648362a9..3c30eec9a 100644
--- a/embassy-stm32/src/pac/stm32f437zg.rs
+++ b/embassy-stm32/src/pac/stm32f437zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f437zi.rs b/embassy-stm32/src/pac/stm32f437zi.rs
index 5648362a9..3c30eec9a 100644
--- a/embassy-stm32/src/pac/stm32f437zi.rs
+++ b/embassy-stm32/src/pac/stm32f437zi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f439ai.rs b/embassy-stm32/src/pac/stm32f439ai.rs
index b0b55bfe7..379a3d707 100644
--- a/embassy-stm32/src/pac/stm32f439ai.rs
+++ b/embassy-stm32/src/pac/stm32f439ai.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f439bg.rs b/embassy-stm32/src/pac/stm32f439bg.rs
index b0b55bfe7..379a3d707 100644
--- a/embassy-stm32/src/pac/stm32f439bg.rs
+++ b/embassy-stm32/src/pac/stm32f439bg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f439bi.rs b/embassy-stm32/src/pac/stm32f439bi.rs
index b0b55bfe7..379a3d707 100644
--- a/embassy-stm32/src/pac/stm32f439bi.rs
+++ b/embassy-stm32/src/pac/stm32f439bi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f439ig.rs b/embassy-stm32/src/pac/stm32f439ig.rs
index b0b55bfe7..379a3d707 100644
--- a/embassy-stm32/src/pac/stm32f439ig.rs
+++ b/embassy-stm32/src/pac/stm32f439ig.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f439ii.rs b/embassy-stm32/src/pac/stm32f439ii.rs
index b0b55bfe7..379a3d707 100644
--- a/embassy-stm32/src/pac/stm32f439ii.rs
+++ b/embassy-stm32/src/pac/stm32f439ii.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f439ng.rs b/embassy-stm32/src/pac/stm32f439ng.rs
index b0b55bfe7..379a3d707 100644
--- a/embassy-stm32/src/pac/stm32f439ng.rs
+++ b/embassy-stm32/src/pac/stm32f439ng.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f439ni.rs b/embassy-stm32/src/pac/stm32f439ni.rs
index b0b55bfe7..379a3d707 100644
--- a/embassy-stm32/src/pac/stm32f439ni.rs
+++ b/embassy-stm32/src/pac/stm32f439ni.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f439vg.rs b/embassy-stm32/src/pac/stm32f439vg.rs
index b0b55bfe7..379a3d707 100644
--- a/embassy-stm32/src/pac/stm32f439vg.rs
+++ b/embassy-stm32/src/pac/stm32f439vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f439vi.rs b/embassy-stm32/src/pac/stm32f439vi.rs
index b0b55bfe7..379a3d707 100644
--- a/embassy-stm32/src/pac/stm32f439vi.rs
+++ b/embassy-stm32/src/pac/stm32f439vi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f439zg.rs b/embassy-stm32/src/pac/stm32f439zg.rs
index b0b55bfe7..379a3d707 100644
--- a/embassy-stm32/src/pac/stm32f439zg.rs
+++ b/embassy-stm32/src/pac/stm32f439zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f439zi.rs b/embassy-stm32/src/pac/stm32f439zi.rs
index b0b55bfe7..379a3d707 100644
--- a/embassy-stm32/src/pac/stm32f439zi.rs
+++ b/embassy-stm32/src/pac/stm32f439zi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f446mc.rs b/embassy-stm32/src/pac/stm32f446mc.rs
index 6059c646b..99da317ff 100644
--- a/embassy-stm32/src/pac/stm32f446mc.rs
+++ b/embassy-stm32/src/pac/stm32f446mc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f446me.rs b/embassy-stm32/src/pac/stm32f446me.rs
index 6059c646b..99da317ff 100644
--- a/embassy-stm32/src/pac/stm32f446me.rs
+++ b/embassy-stm32/src/pac/stm32f446me.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f446rc.rs b/embassy-stm32/src/pac/stm32f446rc.rs
index 6059c646b..99da317ff 100644
--- a/embassy-stm32/src/pac/stm32f446rc.rs
+++ b/embassy-stm32/src/pac/stm32f446rc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f446re.rs b/embassy-stm32/src/pac/stm32f446re.rs
index 6059c646b..99da317ff 100644
--- a/embassy-stm32/src/pac/stm32f446re.rs
+++ b/embassy-stm32/src/pac/stm32f446re.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f446vc.rs b/embassy-stm32/src/pac/stm32f446vc.rs
index 6059c646b..99da317ff 100644
--- a/embassy-stm32/src/pac/stm32f446vc.rs
+++ b/embassy-stm32/src/pac/stm32f446vc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f446ve.rs b/embassy-stm32/src/pac/stm32f446ve.rs
index 6059c646b..99da317ff 100644
--- a/embassy-stm32/src/pac/stm32f446ve.rs
+++ b/embassy-stm32/src/pac/stm32f446ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f446zc.rs b/embassy-stm32/src/pac/stm32f446zc.rs
index 6059c646b..99da317ff 100644
--- a/embassy-stm32/src/pac/stm32f446zc.rs
+++ b/embassy-stm32/src/pac/stm32f446zc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f446ze.rs b/embassy-stm32/src/pac/stm32f446ze.rs
index 6059c646b..99da317ff 100644
--- a/embassy-stm32/src/pac/stm32f446ze.rs
+++ b/embassy-stm32/src/pac/stm32f446ze.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469ae.rs b/embassy-stm32/src/pac/stm32f469ae.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469ae.rs
+++ b/embassy-stm32/src/pac/stm32f469ae.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469ag.rs b/embassy-stm32/src/pac/stm32f469ag.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469ag.rs
+++ b/embassy-stm32/src/pac/stm32f469ag.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469ai.rs b/embassy-stm32/src/pac/stm32f469ai.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469ai.rs
+++ b/embassy-stm32/src/pac/stm32f469ai.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469be.rs b/embassy-stm32/src/pac/stm32f469be.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469be.rs
+++ b/embassy-stm32/src/pac/stm32f469be.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469bg.rs b/embassy-stm32/src/pac/stm32f469bg.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469bg.rs
+++ b/embassy-stm32/src/pac/stm32f469bg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469bi.rs b/embassy-stm32/src/pac/stm32f469bi.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469bi.rs
+++ b/embassy-stm32/src/pac/stm32f469bi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469ie.rs b/embassy-stm32/src/pac/stm32f469ie.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469ie.rs
+++ b/embassy-stm32/src/pac/stm32f469ie.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469ig.rs b/embassy-stm32/src/pac/stm32f469ig.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469ig.rs
+++ b/embassy-stm32/src/pac/stm32f469ig.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469ii.rs b/embassy-stm32/src/pac/stm32f469ii.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469ii.rs
+++ b/embassy-stm32/src/pac/stm32f469ii.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469ne.rs b/embassy-stm32/src/pac/stm32f469ne.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469ne.rs
+++ b/embassy-stm32/src/pac/stm32f469ne.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469ng.rs b/embassy-stm32/src/pac/stm32f469ng.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469ng.rs
+++ b/embassy-stm32/src/pac/stm32f469ng.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469ni.rs b/embassy-stm32/src/pac/stm32f469ni.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469ni.rs
+++ b/embassy-stm32/src/pac/stm32f469ni.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469ve.rs b/embassy-stm32/src/pac/stm32f469ve.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469ve.rs
+++ b/embassy-stm32/src/pac/stm32f469ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469vg.rs b/embassy-stm32/src/pac/stm32f469vg.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469vg.rs
+++ b/embassy-stm32/src/pac/stm32f469vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469vi.rs b/embassy-stm32/src/pac/stm32f469vi.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469vi.rs
+++ b/embassy-stm32/src/pac/stm32f469vi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469ze.rs b/embassy-stm32/src/pac/stm32f469ze.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469ze.rs
+++ b/embassy-stm32/src/pac/stm32f469ze.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469zg.rs b/embassy-stm32/src/pac/stm32f469zg.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469zg.rs
+++ b/embassy-stm32/src/pac/stm32f469zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f469zi.rs b/embassy-stm32/src/pac/stm32f469zi.rs
index f4c158e42..bf68c2f6f 100644
--- a/embassy-stm32/src/pac/stm32f469zi.rs
+++ b/embassy-stm32/src/pac/stm32f469zi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f479ag.rs b/embassy-stm32/src/pac/stm32f479ag.rs
index 17da2d122..67bdb0390 100644
--- a/embassy-stm32/src/pac/stm32f479ag.rs
+++ b/embassy-stm32/src/pac/stm32f479ag.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f479ai.rs b/embassy-stm32/src/pac/stm32f479ai.rs
index 17da2d122..67bdb0390 100644
--- a/embassy-stm32/src/pac/stm32f479ai.rs
+++ b/embassy-stm32/src/pac/stm32f479ai.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f479bg.rs b/embassy-stm32/src/pac/stm32f479bg.rs
index 17da2d122..67bdb0390 100644
--- a/embassy-stm32/src/pac/stm32f479bg.rs
+++ b/embassy-stm32/src/pac/stm32f479bg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f479bi.rs b/embassy-stm32/src/pac/stm32f479bi.rs
index 17da2d122..67bdb0390 100644
--- a/embassy-stm32/src/pac/stm32f479bi.rs
+++ b/embassy-stm32/src/pac/stm32f479bi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f479ig.rs b/embassy-stm32/src/pac/stm32f479ig.rs
index 17da2d122..67bdb0390 100644
--- a/embassy-stm32/src/pac/stm32f479ig.rs
+++ b/embassy-stm32/src/pac/stm32f479ig.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f479ii.rs b/embassy-stm32/src/pac/stm32f479ii.rs
index 17da2d122..67bdb0390 100644
--- a/embassy-stm32/src/pac/stm32f479ii.rs
+++ b/embassy-stm32/src/pac/stm32f479ii.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f479ng.rs b/embassy-stm32/src/pac/stm32f479ng.rs
index 17da2d122..67bdb0390 100644
--- a/embassy-stm32/src/pac/stm32f479ng.rs
+++ b/embassy-stm32/src/pac/stm32f479ng.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f479ni.rs b/embassy-stm32/src/pac/stm32f479ni.rs
index 17da2d122..67bdb0390 100644
--- a/embassy-stm32/src/pac/stm32f479ni.rs
+++ b/embassy-stm32/src/pac/stm32f479ni.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f479vg.rs b/embassy-stm32/src/pac/stm32f479vg.rs
index 17da2d122..67bdb0390 100644
--- a/embassy-stm32/src/pac/stm32f479vg.rs
+++ b/embassy-stm32/src/pac/stm32f479vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f479vi.rs b/embassy-stm32/src/pac/stm32f479vi.rs
index 17da2d122..67bdb0390 100644
--- a/embassy-stm32/src/pac/stm32f479vi.rs
+++ b/embassy-stm32/src/pac/stm32f479vi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f479zg.rs b/embassy-stm32/src/pac/stm32f479zg.rs
index 17da2d122..67bdb0390 100644
--- a/embassy-stm32/src/pac/stm32f479zg.rs
+++ b/embassy-stm32/src/pac/stm32f479zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32f479zi.rs b/embassy-stm32/src/pac/stm32f479zi.rs
index 17da2d122..67bdb0390 100644
--- a/embassy-stm32/src/pac/stm32f479zi.rs
+++ b/embassy-stm32/src/pac/stm32f479zi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x40020000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40026000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40026400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40013c00 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x40020000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l412c8.rs b/embassy-stm32/src/pac/stm32l412c8.rs
index 8427d5587..5478ea82e 100644
--- a/embassy-stm32/src/pac/stm32l412c8.rs
+++ b/embassy-stm32/src/pac/stm32l412c8.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l412cb.rs b/embassy-stm32/src/pac/stm32l412cb.rs
index 8427d5587..5478ea82e 100644
--- a/embassy-stm32/src/pac/stm32l412cb.rs
+++ b/embassy-stm32/src/pac/stm32l412cb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l412k8.rs b/embassy-stm32/src/pac/stm32l412k8.rs
index 253602961..f7027eeac 100644
--- a/embassy-stm32/src/pac/stm32l412k8.rs
+++ b/embassy-stm32/src/pac/stm32l412k8.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l412kb.rs b/embassy-stm32/src/pac/stm32l412kb.rs
index 253602961..f7027eeac 100644
--- a/embassy-stm32/src/pac/stm32l412kb.rs
+++ b/embassy-stm32/src/pac/stm32l412kb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l412r8.rs b/embassy-stm32/src/pac/stm32l412r8.rs
index 8427d5587..5478ea82e 100644
--- a/embassy-stm32/src/pac/stm32l412r8.rs
+++ b/embassy-stm32/src/pac/stm32l412r8.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l412rb.rs b/embassy-stm32/src/pac/stm32l412rb.rs
index 8427d5587..5478ea82e 100644
--- a/embassy-stm32/src/pac/stm32l412rb.rs
+++ b/embassy-stm32/src/pac/stm32l412rb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l412t8.rs b/embassy-stm32/src/pac/stm32l412t8.rs
index 253602961..f7027eeac 100644
--- a/embassy-stm32/src/pac/stm32l412t8.rs
+++ b/embassy-stm32/src/pac/stm32l412t8.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l412tb.rs b/embassy-stm32/src/pac/stm32l412tb.rs
index 253602961..f7027eeac 100644
--- a/embassy-stm32/src/pac/stm32l412tb.rs
+++ b/embassy-stm32/src/pac/stm32l412tb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l422cb.rs b/embassy-stm32/src/pac/stm32l422cb.rs
index 5fcd4a2ba..7a85aca7c 100644
--- a/embassy-stm32/src/pac/stm32l422cb.rs
+++ b/embassy-stm32/src/pac/stm32l422cb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l422kb.rs b/embassy-stm32/src/pac/stm32l422kb.rs
index 03d9a9580..7de35a6c1 100644
--- a/embassy-stm32/src/pac/stm32l422kb.rs
+++ b/embassy-stm32/src/pac/stm32l422kb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l422rb.rs b/embassy-stm32/src/pac/stm32l422rb.rs
index 5fcd4a2ba..7a85aca7c 100644
--- a/embassy-stm32/src/pac/stm32l422rb.rs
+++ b/embassy-stm32/src/pac/stm32l422rb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l422tb.rs b/embassy-stm32/src/pac/stm32l422tb.rs
index 03d9a9580..7de35a6c1 100644
--- a/embassy-stm32/src/pac/stm32l422tb.rs
+++ b/embassy-stm32/src/pac/stm32l422tb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l431cb.rs b/embassy-stm32/src/pac/stm32l431cb.rs
index f718bcf10..cab88d7ae 100644
--- a/embassy-stm32/src/pac/stm32l431cb.rs
+++ b/embassy-stm32/src/pac/stm32l431cb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l431cc.rs b/embassy-stm32/src/pac/stm32l431cc.rs
index f718bcf10..cab88d7ae 100644
--- a/embassy-stm32/src/pac/stm32l431cc.rs
+++ b/embassy-stm32/src/pac/stm32l431cc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l431kb.rs b/embassy-stm32/src/pac/stm32l431kb.rs
index 107be4cfb..cb3c2eb5e 100644
--- a/embassy-stm32/src/pac/stm32l431kb.rs
+++ b/embassy-stm32/src/pac/stm32l431kb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l431kc.rs b/embassy-stm32/src/pac/stm32l431kc.rs
index 107be4cfb..cb3c2eb5e 100644
--- a/embassy-stm32/src/pac/stm32l431kc.rs
+++ b/embassy-stm32/src/pac/stm32l431kc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l431rb.rs b/embassy-stm32/src/pac/stm32l431rb.rs
index f718bcf10..cab88d7ae 100644
--- a/embassy-stm32/src/pac/stm32l431rb.rs
+++ b/embassy-stm32/src/pac/stm32l431rb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l431rc.rs b/embassy-stm32/src/pac/stm32l431rc.rs
index f718bcf10..cab88d7ae 100644
--- a/embassy-stm32/src/pac/stm32l431rc.rs
+++ b/embassy-stm32/src/pac/stm32l431rc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l431vc.rs b/embassy-stm32/src/pac/stm32l431vc.rs
index f718bcf10..cab88d7ae 100644
--- a/embassy-stm32/src/pac/stm32l431vc.rs
+++ b/embassy-stm32/src/pac/stm32l431vc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l432kb.rs b/embassy-stm32/src/pac/stm32l432kb.rs
index 9e7b655e5..78ef53b1f 100644
--- a/embassy-stm32/src/pac/stm32l432kb.rs
+++ b/embassy-stm32/src/pac/stm32l432kb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l432kc.rs b/embassy-stm32/src/pac/stm32l432kc.rs
index 9e7b655e5..78ef53b1f 100644
--- a/embassy-stm32/src/pac/stm32l432kc.rs
+++ b/embassy-stm32/src/pac/stm32l432kc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l433cb.rs b/embassy-stm32/src/pac/stm32l433cb.rs
index 37d1c5132..2736824db 100644
--- a/embassy-stm32/src/pac/stm32l433cb.rs
+++ b/embassy-stm32/src/pac/stm32l433cb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l433cc.rs b/embassy-stm32/src/pac/stm32l433cc.rs
index 37d1c5132..2736824db 100644
--- a/embassy-stm32/src/pac/stm32l433cc.rs
+++ b/embassy-stm32/src/pac/stm32l433cc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l433rb.rs b/embassy-stm32/src/pac/stm32l433rb.rs
index 37d1c5132..2736824db 100644
--- a/embassy-stm32/src/pac/stm32l433rb.rs
+++ b/embassy-stm32/src/pac/stm32l433rb.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l433rc.rs b/embassy-stm32/src/pac/stm32l433rc.rs
index 37d1c5132..2736824db 100644
--- a/embassy-stm32/src/pac/stm32l433rc.rs
+++ b/embassy-stm32/src/pac/stm32l433rc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l433vc.rs b/embassy-stm32/src/pac/stm32l433vc.rs
index 37d1c5132..2736824db 100644
--- a/embassy-stm32/src/pac/stm32l433vc.rs
+++ b/embassy-stm32/src/pac/stm32l433vc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l442kc.rs b/embassy-stm32/src/pac/stm32l442kc.rs
index 1d26457bf..2bcd51e9f 100644
--- a/embassy-stm32/src/pac/stm32l442kc.rs
+++ b/embassy-stm32/src/pac/stm32l442kc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l443cc.rs b/embassy-stm32/src/pac/stm32l443cc.rs
index d677d6106..93f7c8bfa 100644
--- a/embassy-stm32/src/pac/stm32l443cc.rs
+++ b/embassy-stm32/src/pac/stm32l443cc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l443rc.rs b/embassy-stm32/src/pac/stm32l443rc.rs
index d677d6106..93f7c8bfa 100644
--- a/embassy-stm32/src/pac/stm32l443rc.rs
+++ b/embassy-stm32/src/pac/stm32l443rc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l443vc.rs b/embassy-stm32/src/pac/stm32l443vc.rs
index d677d6106..93f7c8bfa 100644
--- a/embassy-stm32/src/pac/stm32l443vc.rs
+++ b/embassy-stm32/src/pac/stm32l443vc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l451cc.rs b/embassy-stm32/src/pac/stm32l451cc.rs
index 87c472cd6..031a9af00 100644
--- a/embassy-stm32/src/pac/stm32l451cc.rs
+++ b/embassy-stm32/src/pac/stm32l451cc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l451ce.rs b/embassy-stm32/src/pac/stm32l451ce.rs
index 87c472cd6..031a9af00 100644
--- a/embassy-stm32/src/pac/stm32l451ce.rs
+++ b/embassy-stm32/src/pac/stm32l451ce.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l451rc.rs b/embassy-stm32/src/pac/stm32l451rc.rs
index 87c472cd6..031a9af00 100644
--- a/embassy-stm32/src/pac/stm32l451rc.rs
+++ b/embassy-stm32/src/pac/stm32l451rc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l451re.rs b/embassy-stm32/src/pac/stm32l451re.rs
index 87c472cd6..031a9af00 100644
--- a/embassy-stm32/src/pac/stm32l451re.rs
+++ b/embassy-stm32/src/pac/stm32l451re.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l451vc.rs b/embassy-stm32/src/pac/stm32l451vc.rs
index 87c472cd6..031a9af00 100644
--- a/embassy-stm32/src/pac/stm32l451vc.rs
+++ b/embassy-stm32/src/pac/stm32l451vc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l451ve.rs b/embassy-stm32/src/pac/stm32l451ve.rs
index 87c472cd6..031a9af00 100644
--- a/embassy-stm32/src/pac/stm32l451ve.rs
+++ b/embassy-stm32/src/pac/stm32l451ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l452cc.rs b/embassy-stm32/src/pac/stm32l452cc.rs
index bda3893b3..70c0e7e4e 100644
--- a/embassy-stm32/src/pac/stm32l452cc.rs
+++ b/embassy-stm32/src/pac/stm32l452cc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l452ce.rs b/embassy-stm32/src/pac/stm32l452ce.rs
index bda3893b3..70c0e7e4e 100644
--- a/embassy-stm32/src/pac/stm32l452ce.rs
+++ b/embassy-stm32/src/pac/stm32l452ce.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l452rc.rs b/embassy-stm32/src/pac/stm32l452rc.rs
index bda3893b3..70c0e7e4e 100644
--- a/embassy-stm32/src/pac/stm32l452rc.rs
+++ b/embassy-stm32/src/pac/stm32l452rc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l452re.rs b/embassy-stm32/src/pac/stm32l452re.rs
index bda3893b3..70c0e7e4e 100644
--- a/embassy-stm32/src/pac/stm32l452re.rs
+++ b/embassy-stm32/src/pac/stm32l452re.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l452vc.rs b/embassy-stm32/src/pac/stm32l452vc.rs
index bda3893b3..70c0e7e4e 100644
--- a/embassy-stm32/src/pac/stm32l452vc.rs
+++ b/embassy-stm32/src/pac/stm32l452vc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l452ve.rs b/embassy-stm32/src/pac/stm32l452ve.rs
index bda3893b3..70c0e7e4e 100644
--- a/embassy-stm32/src/pac/stm32l452ve.rs
+++ b/embassy-stm32/src/pac/stm32l452ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l462ce.rs b/embassy-stm32/src/pac/stm32l462ce.rs
index fddd66b31..5eff9047e 100644
--- a/embassy-stm32/src/pac/stm32l462ce.rs
+++ b/embassy-stm32/src/pac/stm32l462ce.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l462re.rs b/embassy-stm32/src/pac/stm32l462re.rs
index fddd66b31..5eff9047e 100644
--- a/embassy-stm32/src/pac/stm32l462re.rs
+++ b/embassy-stm32/src/pac/stm32l462re.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l462ve.rs b/embassy-stm32/src/pac/stm32l462ve.rs
index fddd66b31..5eff9047e 100644
--- a/embassy-stm32/src/pac/stm32l462ve.rs
+++ b/embassy-stm32/src/pac/stm32l462ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l471qe.rs b/embassy-stm32/src/pac/stm32l471qe.rs
index cbb9d325d..719376864 100644
--- a/embassy-stm32/src/pac/stm32l471qe.rs
+++ b/embassy-stm32/src/pac/stm32l471qe.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l471qg.rs b/embassy-stm32/src/pac/stm32l471qg.rs
index cbb9d325d..719376864 100644
--- a/embassy-stm32/src/pac/stm32l471qg.rs
+++ b/embassy-stm32/src/pac/stm32l471qg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l471re.rs b/embassy-stm32/src/pac/stm32l471re.rs
index cbb9d325d..719376864 100644
--- a/embassy-stm32/src/pac/stm32l471re.rs
+++ b/embassy-stm32/src/pac/stm32l471re.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l471rg.rs b/embassy-stm32/src/pac/stm32l471rg.rs
index cbb9d325d..719376864 100644
--- a/embassy-stm32/src/pac/stm32l471rg.rs
+++ b/embassy-stm32/src/pac/stm32l471rg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l471ve.rs b/embassy-stm32/src/pac/stm32l471ve.rs
index cbb9d325d..719376864 100644
--- a/embassy-stm32/src/pac/stm32l471ve.rs
+++ b/embassy-stm32/src/pac/stm32l471ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l471vg.rs b/embassy-stm32/src/pac/stm32l471vg.rs
index cbb9d325d..719376864 100644
--- a/embassy-stm32/src/pac/stm32l471vg.rs
+++ b/embassy-stm32/src/pac/stm32l471vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l471ze.rs b/embassy-stm32/src/pac/stm32l471ze.rs
index cbb9d325d..719376864 100644
--- a/embassy-stm32/src/pac/stm32l471ze.rs
+++ b/embassy-stm32/src/pac/stm32l471ze.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l471zg.rs b/embassy-stm32/src/pac/stm32l471zg.rs
index cbb9d325d..719376864 100644
--- a/embassy-stm32/src/pac/stm32l471zg.rs
+++ b/embassy-stm32/src/pac/stm32l471zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l475rc.rs b/embassy-stm32/src/pac/stm32l475rc.rs
index 3e4e328e7..5b9937410 100644
--- a/embassy-stm32/src/pac/stm32l475rc.rs
+++ b/embassy-stm32/src/pac/stm32l475rc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l475re.rs b/embassy-stm32/src/pac/stm32l475re.rs
index 3e4e328e7..5b9937410 100644
--- a/embassy-stm32/src/pac/stm32l475re.rs
+++ b/embassy-stm32/src/pac/stm32l475re.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l475rg.rs b/embassy-stm32/src/pac/stm32l475rg.rs
index 3e4e328e7..5b9937410 100644
--- a/embassy-stm32/src/pac/stm32l475rg.rs
+++ b/embassy-stm32/src/pac/stm32l475rg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l475vc.rs b/embassy-stm32/src/pac/stm32l475vc.rs
index 3e4e328e7..5b9937410 100644
--- a/embassy-stm32/src/pac/stm32l475vc.rs
+++ b/embassy-stm32/src/pac/stm32l475vc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l475ve.rs b/embassy-stm32/src/pac/stm32l475ve.rs
index 3e4e328e7..5b9937410 100644
--- a/embassy-stm32/src/pac/stm32l475ve.rs
+++ b/embassy-stm32/src/pac/stm32l475ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l475vg.rs b/embassy-stm32/src/pac/stm32l475vg.rs
index 3e4e328e7..5b9937410 100644
--- a/embassy-stm32/src/pac/stm32l475vg.rs
+++ b/embassy-stm32/src/pac/stm32l475vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476je.rs b/embassy-stm32/src/pac/stm32l476je.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476je.rs
+++ b/embassy-stm32/src/pac/stm32l476je.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476jg.rs b/embassy-stm32/src/pac/stm32l476jg.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476jg.rs
+++ b/embassy-stm32/src/pac/stm32l476jg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476me.rs b/embassy-stm32/src/pac/stm32l476me.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476me.rs
+++ b/embassy-stm32/src/pac/stm32l476me.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476mg.rs b/embassy-stm32/src/pac/stm32l476mg.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476mg.rs
+++ b/embassy-stm32/src/pac/stm32l476mg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476qe.rs b/embassy-stm32/src/pac/stm32l476qe.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476qe.rs
+++ b/embassy-stm32/src/pac/stm32l476qe.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476qg.rs b/embassy-stm32/src/pac/stm32l476qg.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476qg.rs
+++ b/embassy-stm32/src/pac/stm32l476qg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476rc.rs b/embassy-stm32/src/pac/stm32l476rc.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476rc.rs
+++ b/embassy-stm32/src/pac/stm32l476rc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476re.rs b/embassy-stm32/src/pac/stm32l476re.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476re.rs
+++ b/embassy-stm32/src/pac/stm32l476re.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476rg.rs b/embassy-stm32/src/pac/stm32l476rg.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476rg.rs
+++ b/embassy-stm32/src/pac/stm32l476rg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476vc.rs b/embassy-stm32/src/pac/stm32l476vc.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476vc.rs
+++ b/embassy-stm32/src/pac/stm32l476vc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476ve.rs b/embassy-stm32/src/pac/stm32l476ve.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476ve.rs
+++ b/embassy-stm32/src/pac/stm32l476ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476vg.rs b/embassy-stm32/src/pac/stm32l476vg.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476vg.rs
+++ b/embassy-stm32/src/pac/stm32l476vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476ze.rs b/embassy-stm32/src/pac/stm32l476ze.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476ze.rs
+++ b/embassy-stm32/src/pac/stm32l476ze.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l476zg.rs b/embassy-stm32/src/pac/stm32l476zg.rs
index 2a33537ee..1c16aaaba 100644
--- a/embassy-stm32/src/pac/stm32l476zg.rs
+++ b/embassy-stm32/src/pac/stm32l476zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l485jc.rs b/embassy-stm32/src/pac/stm32l485jc.rs
index 66f7d70a1..c5fb8087f 100644
--- a/embassy-stm32/src/pac/stm32l485jc.rs
+++ b/embassy-stm32/src/pac/stm32l485jc.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l485je.rs b/embassy-stm32/src/pac/stm32l485je.rs
index 66f7d70a1..c5fb8087f 100644
--- a/embassy-stm32/src/pac/stm32l485je.rs
+++ b/embassy-stm32/src/pac/stm32l485je.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l486jg.rs b/embassy-stm32/src/pac/stm32l486jg.rs
index 14e0e6d91..d791c148d 100644
--- a/embassy-stm32/src/pac/stm32l486jg.rs
+++ b/embassy-stm32/src/pac/stm32l486jg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l486qg.rs b/embassy-stm32/src/pac/stm32l486qg.rs
index 14e0e6d91..d791c148d 100644
--- a/embassy-stm32/src/pac/stm32l486qg.rs
+++ b/embassy-stm32/src/pac/stm32l486qg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l486rg.rs b/embassy-stm32/src/pac/stm32l486rg.rs
index 14e0e6d91..d791c148d 100644
--- a/embassy-stm32/src/pac/stm32l486rg.rs
+++ b/embassy-stm32/src/pac/stm32l486rg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l486vg.rs b/embassy-stm32/src/pac/stm32l486vg.rs
index 14e0e6d91..d791c148d 100644
--- a/embassy-stm32/src/pac/stm32l486vg.rs
+++ b/embassy-stm32/src/pac/stm32l486vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l486zg.rs b/embassy-stm32/src/pac/stm32l486zg.rs
index 14e0e6d91..d791c148d 100644
--- a/embassy-stm32/src/pac/stm32l486zg.rs
+++ b/embassy-stm32/src/pac/stm32l486zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l496ae.rs b/embassy-stm32/src/pac/stm32l496ae.rs
index b539d5190..336533a16 100644
--- a/embassy-stm32/src/pac/stm32l496ae.rs
+++ b/embassy-stm32/src/pac/stm32l496ae.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l496ag.rs b/embassy-stm32/src/pac/stm32l496ag.rs
index b539d5190..336533a16 100644
--- a/embassy-stm32/src/pac/stm32l496ag.rs
+++ b/embassy-stm32/src/pac/stm32l496ag.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l496qe.rs b/embassy-stm32/src/pac/stm32l496qe.rs
index b539d5190..336533a16 100644
--- a/embassy-stm32/src/pac/stm32l496qe.rs
+++ b/embassy-stm32/src/pac/stm32l496qe.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l496qg.rs b/embassy-stm32/src/pac/stm32l496qg.rs
index b539d5190..336533a16 100644
--- a/embassy-stm32/src/pac/stm32l496qg.rs
+++ b/embassy-stm32/src/pac/stm32l496qg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l496re.rs b/embassy-stm32/src/pac/stm32l496re.rs
index b539d5190..336533a16 100644
--- a/embassy-stm32/src/pac/stm32l496re.rs
+++ b/embassy-stm32/src/pac/stm32l496re.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l496rg.rs b/embassy-stm32/src/pac/stm32l496rg.rs
index b539d5190..336533a16 100644
--- a/embassy-stm32/src/pac/stm32l496rg.rs
+++ b/embassy-stm32/src/pac/stm32l496rg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l496ve.rs b/embassy-stm32/src/pac/stm32l496ve.rs
index b539d5190..336533a16 100644
--- a/embassy-stm32/src/pac/stm32l496ve.rs
+++ b/embassy-stm32/src/pac/stm32l496ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l496vg.rs b/embassy-stm32/src/pac/stm32l496vg.rs
index b539d5190..336533a16 100644
--- a/embassy-stm32/src/pac/stm32l496vg.rs
+++ b/embassy-stm32/src/pac/stm32l496vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l496wg.rs b/embassy-stm32/src/pac/stm32l496wg.rs
index b539d5190..336533a16 100644
--- a/embassy-stm32/src/pac/stm32l496wg.rs
+++ b/embassy-stm32/src/pac/stm32l496wg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l496ze.rs b/embassy-stm32/src/pac/stm32l496ze.rs
index b539d5190..336533a16 100644
--- a/embassy-stm32/src/pac/stm32l496ze.rs
+++ b/embassy-stm32/src/pac/stm32l496ze.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l496zg.rs b/embassy-stm32/src/pac/stm32l496zg.rs
index b539d5190..336533a16 100644
--- a/embassy-stm32/src/pac/stm32l496zg.rs
+++ b/embassy-stm32/src/pac/stm32l496zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4a6ag.rs b/embassy-stm32/src/pac/stm32l4a6ag.rs
index 85af8eeef..2bc671656 100644
--- a/embassy-stm32/src/pac/stm32l4a6ag.rs
+++ b/embassy-stm32/src/pac/stm32l4a6ag.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4a6qg.rs b/embassy-stm32/src/pac/stm32l4a6qg.rs
index 85af8eeef..2bc671656 100644
--- a/embassy-stm32/src/pac/stm32l4a6qg.rs
+++ b/embassy-stm32/src/pac/stm32l4a6qg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4a6rg.rs b/embassy-stm32/src/pac/stm32l4a6rg.rs
index 85af8eeef..2bc671656 100644
--- a/embassy-stm32/src/pac/stm32l4a6rg.rs
+++ b/embassy-stm32/src/pac/stm32l4a6rg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4a6vg.rs b/embassy-stm32/src/pac/stm32l4a6vg.rs
index 85af8eeef..2bc671656 100644
--- a/embassy-stm32/src/pac/stm32l4a6vg.rs
+++ b/embassy-stm32/src/pac/stm32l4a6vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4a6zg.rs b/embassy-stm32/src/pac/stm32l4a6zg.rs
index 85af8eeef..2bc671656 100644
--- a/embassy-stm32/src/pac/stm32l4a6zg.rs
+++ b/embassy-stm32/src/pac/stm32l4a6zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4p5ae.rs b/embassy-stm32/src/pac/stm32l4p5ae.rs
index febb8c60b..7d8ca0863 100644
--- a/embassy-stm32/src/pac/stm32l4p5ae.rs
+++ b/embassy-stm32/src/pac/stm32l4p5ae.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4p5ag.rs b/embassy-stm32/src/pac/stm32l4p5ag.rs
index febb8c60b..7d8ca0863 100644
--- a/embassy-stm32/src/pac/stm32l4p5ag.rs
+++ b/embassy-stm32/src/pac/stm32l4p5ag.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4p5ce.rs b/embassy-stm32/src/pac/stm32l4p5ce.rs
index febb8c60b..7d8ca0863 100644
--- a/embassy-stm32/src/pac/stm32l4p5ce.rs
+++ b/embassy-stm32/src/pac/stm32l4p5ce.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4p5cg.rs b/embassy-stm32/src/pac/stm32l4p5cg.rs
index febb8c60b..7d8ca0863 100644
--- a/embassy-stm32/src/pac/stm32l4p5cg.rs
+++ b/embassy-stm32/src/pac/stm32l4p5cg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4p5qe.rs b/embassy-stm32/src/pac/stm32l4p5qe.rs
index febb8c60b..7d8ca0863 100644
--- a/embassy-stm32/src/pac/stm32l4p5qe.rs
+++ b/embassy-stm32/src/pac/stm32l4p5qe.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4p5qg.rs b/embassy-stm32/src/pac/stm32l4p5qg.rs
index febb8c60b..7d8ca0863 100644
--- a/embassy-stm32/src/pac/stm32l4p5qg.rs
+++ b/embassy-stm32/src/pac/stm32l4p5qg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4p5re.rs b/embassy-stm32/src/pac/stm32l4p5re.rs
index febb8c60b..7d8ca0863 100644
--- a/embassy-stm32/src/pac/stm32l4p5re.rs
+++ b/embassy-stm32/src/pac/stm32l4p5re.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4p5rg.rs b/embassy-stm32/src/pac/stm32l4p5rg.rs
index febb8c60b..7d8ca0863 100644
--- a/embassy-stm32/src/pac/stm32l4p5rg.rs
+++ b/embassy-stm32/src/pac/stm32l4p5rg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4p5ve.rs b/embassy-stm32/src/pac/stm32l4p5ve.rs
index febb8c60b..7d8ca0863 100644
--- a/embassy-stm32/src/pac/stm32l4p5ve.rs
+++ b/embassy-stm32/src/pac/stm32l4p5ve.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4p5vg.rs b/embassy-stm32/src/pac/stm32l4p5vg.rs
index febb8c60b..7d8ca0863 100644
--- a/embassy-stm32/src/pac/stm32l4p5vg.rs
+++ b/embassy-stm32/src/pac/stm32l4p5vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4p5ze.rs b/embassy-stm32/src/pac/stm32l4p5ze.rs
index febb8c60b..7d8ca0863 100644
--- a/embassy-stm32/src/pac/stm32l4p5ze.rs
+++ b/embassy-stm32/src/pac/stm32l4p5ze.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4p5zg.rs b/embassy-stm32/src/pac/stm32l4p5zg.rs
index febb8c60b..7d8ca0863 100644
--- a/embassy-stm32/src/pac/stm32l4p5zg.rs
+++ b/embassy-stm32/src/pac/stm32l4p5zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4q5ag.rs b/embassy-stm32/src/pac/stm32l4q5ag.rs
index 31d2f1038..03c5b6793 100644
--- a/embassy-stm32/src/pac/stm32l4q5ag.rs
+++ b/embassy-stm32/src/pac/stm32l4q5ag.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4q5cg.rs b/embassy-stm32/src/pac/stm32l4q5cg.rs
index 31d2f1038..03c5b6793 100644
--- a/embassy-stm32/src/pac/stm32l4q5cg.rs
+++ b/embassy-stm32/src/pac/stm32l4q5cg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4q5qg.rs b/embassy-stm32/src/pac/stm32l4q5qg.rs
index 31d2f1038..03c5b6793 100644
--- a/embassy-stm32/src/pac/stm32l4q5qg.rs
+++ b/embassy-stm32/src/pac/stm32l4q5qg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4q5rg.rs b/embassy-stm32/src/pac/stm32l4q5rg.rs
index 31d2f1038..03c5b6793 100644
--- a/embassy-stm32/src/pac/stm32l4q5rg.rs
+++ b/embassy-stm32/src/pac/stm32l4q5rg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4q5vg.rs b/embassy-stm32/src/pac/stm32l4q5vg.rs
index 31d2f1038..03c5b6793 100644
--- a/embassy-stm32/src/pac/stm32l4q5vg.rs
+++ b/embassy-stm32/src/pac/stm32l4q5vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4q5zg.rs b/embassy-stm32/src/pac/stm32l4q5zg.rs
index 31d2f1038..03c5b6793 100644
--- a/embassy-stm32/src/pac/stm32l4q5zg.rs
+++ b/embassy-stm32/src/pac/stm32l4q5zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r5ag.rs b/embassy-stm32/src/pac/stm32l4r5ag.rs
index 13145983d..70339417f 100644
--- a/embassy-stm32/src/pac/stm32l4r5ag.rs
+++ b/embassy-stm32/src/pac/stm32l4r5ag.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r5ai.rs b/embassy-stm32/src/pac/stm32l4r5ai.rs
index 13145983d..70339417f 100644
--- a/embassy-stm32/src/pac/stm32l4r5ai.rs
+++ b/embassy-stm32/src/pac/stm32l4r5ai.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r5qg.rs b/embassy-stm32/src/pac/stm32l4r5qg.rs
index 13145983d..70339417f 100644
--- a/embassy-stm32/src/pac/stm32l4r5qg.rs
+++ b/embassy-stm32/src/pac/stm32l4r5qg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r5qi.rs b/embassy-stm32/src/pac/stm32l4r5qi.rs
index 13145983d..70339417f 100644
--- a/embassy-stm32/src/pac/stm32l4r5qi.rs
+++ b/embassy-stm32/src/pac/stm32l4r5qi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r5vg.rs b/embassy-stm32/src/pac/stm32l4r5vg.rs
index 13145983d..70339417f 100644
--- a/embassy-stm32/src/pac/stm32l4r5vg.rs
+++ b/embassy-stm32/src/pac/stm32l4r5vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r5vi.rs b/embassy-stm32/src/pac/stm32l4r5vi.rs
index 13145983d..70339417f 100644
--- a/embassy-stm32/src/pac/stm32l4r5vi.rs
+++ b/embassy-stm32/src/pac/stm32l4r5vi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r5zg.rs b/embassy-stm32/src/pac/stm32l4r5zg.rs
index 13145983d..70339417f 100644
--- a/embassy-stm32/src/pac/stm32l4r5zg.rs
+++ b/embassy-stm32/src/pac/stm32l4r5zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r5zi.rs b/embassy-stm32/src/pac/stm32l4r5zi.rs
index 13145983d..70339417f 100644
--- a/embassy-stm32/src/pac/stm32l4r5zi.rs
+++ b/embassy-stm32/src/pac/stm32l4r5zi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r7ai.rs b/embassy-stm32/src/pac/stm32l4r7ai.rs
index 295f7b0a9..9d88e59af 100644
--- a/embassy-stm32/src/pac/stm32l4r7ai.rs
+++ b/embassy-stm32/src/pac/stm32l4r7ai.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r7vi.rs b/embassy-stm32/src/pac/stm32l4r7vi.rs
index 295f7b0a9..9d88e59af 100644
--- a/embassy-stm32/src/pac/stm32l4r7vi.rs
+++ b/embassy-stm32/src/pac/stm32l4r7vi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r7zi.rs b/embassy-stm32/src/pac/stm32l4r7zi.rs
index 295f7b0a9..9d88e59af 100644
--- a/embassy-stm32/src/pac/stm32l4r7zi.rs
+++ b/embassy-stm32/src/pac/stm32l4r7zi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r9ag.rs b/embassy-stm32/src/pac/stm32l4r9ag.rs
index 638ae31c1..edb5287c2 100644
--- a/embassy-stm32/src/pac/stm32l4r9ag.rs
+++ b/embassy-stm32/src/pac/stm32l4r9ag.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r9ai.rs b/embassy-stm32/src/pac/stm32l4r9ai.rs
index 638ae31c1..edb5287c2 100644
--- a/embassy-stm32/src/pac/stm32l4r9ai.rs
+++ b/embassy-stm32/src/pac/stm32l4r9ai.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r9vg.rs b/embassy-stm32/src/pac/stm32l4r9vg.rs
index 638ae31c1..edb5287c2 100644
--- a/embassy-stm32/src/pac/stm32l4r9vg.rs
+++ b/embassy-stm32/src/pac/stm32l4r9vg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r9vi.rs b/embassy-stm32/src/pac/stm32l4r9vi.rs
index 638ae31c1..edb5287c2 100644
--- a/embassy-stm32/src/pac/stm32l4r9vi.rs
+++ b/embassy-stm32/src/pac/stm32l4r9vi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r9zg.rs b/embassy-stm32/src/pac/stm32l4r9zg.rs
index 638ae31c1..edb5287c2 100644
--- a/embassy-stm32/src/pac/stm32l4r9zg.rs
+++ b/embassy-stm32/src/pac/stm32l4r9zg.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4r9zi.rs b/embassy-stm32/src/pac/stm32l4r9zi.rs
index 638ae31c1..edb5287c2 100644
--- a/embassy-stm32/src/pac/stm32l4r9zi.rs
+++ b/embassy-stm32/src/pac/stm32l4r9zi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4s5ai.rs b/embassy-stm32/src/pac/stm32l4s5ai.rs
index 43368de84..e7d2eb0ce 100644
--- a/embassy-stm32/src/pac/stm32l4s5ai.rs
+++ b/embassy-stm32/src/pac/stm32l4s5ai.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4s5qi.rs b/embassy-stm32/src/pac/stm32l4s5qi.rs
index 43368de84..e7d2eb0ce 100644
--- a/embassy-stm32/src/pac/stm32l4s5qi.rs
+++ b/embassy-stm32/src/pac/stm32l4s5qi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4s5vi.rs b/embassy-stm32/src/pac/stm32l4s5vi.rs
index 43368de84..e7d2eb0ce 100644
--- a/embassy-stm32/src/pac/stm32l4s5vi.rs
+++ b/embassy-stm32/src/pac/stm32l4s5vi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4s5zi.rs b/embassy-stm32/src/pac/stm32l4s5zi.rs
index 43368de84..e7d2eb0ce 100644
--- a/embassy-stm32/src/pac/stm32l4s5zi.rs
+++ b/embassy-stm32/src/pac/stm32l4s5zi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4s7ai.rs b/embassy-stm32/src/pac/stm32l4s7ai.rs
index 76e53d066..072ffc23b 100644
--- a/embassy-stm32/src/pac/stm32l4s7ai.rs
+++ b/embassy-stm32/src/pac/stm32l4s7ai.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4s7vi.rs b/embassy-stm32/src/pac/stm32l4s7vi.rs
index 76e53d066..072ffc23b 100644
--- a/embassy-stm32/src/pac/stm32l4s7vi.rs
+++ b/embassy-stm32/src/pac/stm32l4s7vi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4s7zi.rs b/embassy-stm32/src/pac/stm32l4s7zi.rs
index 76e53d066..072ffc23b 100644
--- a/embassy-stm32/src/pac/stm32l4s7zi.rs
+++ b/embassy-stm32/src/pac/stm32l4s7zi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4s9ai.rs b/embassy-stm32/src/pac/stm32l4s9ai.rs
index 2bf7b4bdd..c3ef398d3 100644
--- a/embassy-stm32/src/pac/stm32l4s9ai.rs
+++ b/embassy-stm32/src/pac/stm32l4s9ai.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4s9vi.rs b/embassy-stm32/src/pac/stm32l4s9vi.rs
index 2bf7b4bdd..c3ef398d3 100644
--- a/embassy-stm32/src/pac/stm32l4s9vi.rs
+++ b/embassy-stm32/src/pac/stm32l4s9vi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);
diff --git a/embassy-stm32/src/pac/stm32l4s9zi.rs b/embassy-stm32/src/pac/stm32l4s9zi.rs
index 2bf7b4bdd..c3ef398d3 100644
--- a/embassy-stm32/src/pac/stm32l4s9zi.rs
+++ b/embassy-stm32/src/pac/stm32l4s9zi.rs
@@ -6,23 +6,23 @@ pub fn GPIO(n: usize) -> gpio::Gpio {
     gpio::Gpio((0x48000000 + 0x400 * n) as _)
 }
 pub const DMA1: dma::Dma = dma::Dma(0x40020000 as _);
-impl_dma_channel!(DMA1_CH0, 1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+impl_dma_channel!(DMA1_CH0, DMA1, 0);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
+impl_dma_channel!(DMA1_CH7, DMA1, 7);
 pub const DMA2: dma::Dma = dma::Dma(0x40020400 as _);
-impl_dma_channel!(DMA2_CH0, 2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+impl_dma_channel!(DMA2_CH0, DMA2, 0);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
+impl_dma_channel!(DMA2_CH7, DMA2, 7);
 pub const EXTI: exti::Exti = exti::Exti(0x40010400 as _);
 pub const GPIOA: gpio::Gpio = gpio::Gpio(0x48000000 as _);
 impl_gpio_pin!(PA0, 0, 0, EXTI0);