Fix DMA

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)

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);

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_CH0, DMA1, 0);
-impl_dma_channel!(DMA1_CH1, 1, 1);
+impl_dma_channel!(DMA1_CH1, DMA1, 1);
-impl_dma_channel!(DMA1_CH2, 1, 2);
+impl_dma_channel!(DMA1_CH2, DMA1, 2);
-impl_dma_channel!(DMA1_CH3, 1, 3);
+impl_dma_channel!(DMA1_CH3, DMA1, 3);
-impl_dma_channel!(DMA1_CH4, 1, 4);
+impl_dma_channel!(DMA1_CH4, DMA1, 4);
-impl_dma_channel!(DMA1_CH5, 1, 5);
+impl_dma_channel!(DMA1_CH5, DMA1, 5);
-impl_dma_channel!(DMA1_CH6, 1, 6);
+impl_dma_channel!(DMA1_CH6, DMA1, 6);
-impl_dma_channel!(DMA1_CH7, 1, 7);
+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_CH0, DMA2, 0);
-impl_dma_channel!(DMA2_CH1, 2, 1);
+impl_dma_channel!(DMA2_CH1, DMA2, 1);
-impl_dma_channel!(DMA2_CH2, 2, 2);
+impl_dma_channel!(DMA2_CH2, DMA2, 2);
-impl_dma_channel!(DMA2_CH3, 2, 3);
+impl_dma_channel!(DMA2_CH3, DMA2, 3);
-impl_dma_channel!(DMA2_CH4, 2, 4);
+impl_dma_channel!(DMA2_CH4, DMA2, 4);
-impl_dma_channel!(DMA2_CH5, 2, 5);
+impl_dma_channel!(DMA2_CH5, DMA2, 5);
-impl_dma_channel!(DMA2_CH6, 2, 6);
+impl_dma_channel!(DMA2_CH6, DMA2, 6);
-impl_dma_channel!(DMA2_CH7, 2, 7);
+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);