Normalize DAC => DAC1

This commit is contained in:
Dario Nieuwenhuis 2024-04-29 17:56:01 +02:00
parent d296bed417
commit 706b07e020
3 changed files with 4 additions and 8 deletions

View File

@ -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()

View File

@ -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"]),
(

View File

@ -1,6 +1,7 @@
#[rustfmt::skip]
static NORMALIZE: &[(&str, &str)] = &[
("ADC", "ADC1"),
("DAC", "DAC1"),
("HRTIM", "HRTIM1"),
("HDMI_CEC", "CEC"),
("SUBGHZ", "SUBGHZSPI"),