From 706b07e020731bf5f387353682cb10bdfb9e8ee7 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Mon, 29 Apr 2024 17:56:01 +0200 Subject: [PATCH] Normalize DAC => DAC1 --- stm32-data-gen/src/chips.rs | 9 +-------- stm32-data-gen/src/header.rs | 2 ++ stm32-data-gen/src/normalize_peris.rs | 1 + 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/stm32-data-gen/src/chips.rs b/stm32-data-gen/src/chips.rs index 143963d..7f1c0f3 100644 --- a/stm32-data-gen/src/chips.rs +++ b/stm32-data-gen/src/chips.rs @@ -1303,14 +1303,7 @@ fn process_core( for p in &mut peripherals { let mut chs = Vec::new(); for dma in &chip_dmas { - let mut peri_chs = dma_channels.0.get(dma).unwrap().peripherals.get(&p.name); - - // DAC1 is sometimes interchanged with DAC - if peri_chs.is_none() && p.name == "DAC1" { - peri_chs = dma_channels.0.get(dma).unwrap().peripherals.get("DAC"); - } - - if let Some(peri_chs) = peri_chs { + if let Some(peri_chs) = dma_channels.0.get(dma).unwrap().peripherals.get(&p.name) { chs.extend( peri_chs .iter() diff --git a/stm32-data-gen/src/header.rs b/stm32-data-gen/src/header.rs index 5653668..5bddcb2 100644 --- a/stm32-data-gen/src/header.rs +++ b/stm32-data-gen/src/header.rs @@ -175,6 +175,8 @@ impl Defines { &["OCTOSPI2_R_BASE", "OCTOSPI2_R_BASE_NS", "OCTOSPI2_REG_BASE"], ), ("FLASH", &["FLASH_R_BASE", "FLASH_REG_BASE"]), + ("DAC", &["DAC1_BASE", "DAC_BASE"]), + ("DAC1", &["DAC1_BASE", "DAC_BASE"]), ("ADC", &["ADC1_BASE", "ADC_BASE"]), ("ADC1", &["ADC1_BASE", "ADC_BASE"]), ( diff --git a/stm32-data-gen/src/normalize_peris.rs b/stm32-data-gen/src/normalize_peris.rs index 7ef5854..a11ba05 100644 --- a/stm32-data-gen/src/normalize_peris.rs +++ b/stm32-data-gen/src/normalize_peris.rs @@ -1,6 +1,7 @@ #[rustfmt::skip] static NORMALIZE: &[(&str, &str)] = &[ ("ADC", "ADC1"), + ("DAC", "DAC1"), ("HRTIM", "HRTIM1"), ("HDMI_CEC", "CEC"), ("SUBGHZ", "SUBGHZSPI"),