From 849ed606a1319816b5450c1d18473d1f3a6f0bfc Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Sun, 28 Apr 2024 23:19:15 +0200 Subject: [PATCH] Add normalize_peri_name. --- stm32-data-gen/src/chips.rs | 40 ++++++++------------------- stm32-data-gen/src/dma.rs | 8 ++++-- stm32-data-gen/src/gpio_af.rs | 3 +- stm32-data-gen/src/header.rs | 1 + stm32-data-gen/src/interrupts.rs | 2 ++ stm32-data-gen/src/main.rs | 1 + stm32-data-gen/src/normalize_peris.rs | 14 ++++++++++ 7 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 stm32-data-gen/src/normalize_peris.rs diff --git a/stm32-data-gen/src/chips.rs b/stm32-data-gen/src/chips.rs index 7a387c5..a324263 100644 --- a/stm32-data-gen/src/chips.rs +++ b/stm32-data-gen/src/chips.rs @@ -5,6 +5,7 @@ use stm32_data_serde::chip::core::peripheral::Pin; use super::*; use crate::gpio_af::parse_signal_name; +use crate::normalize_peris::normalize_peri_name; mod xml { use serde::Deserialize; @@ -1008,7 +1009,7 @@ fn process_core( let mut peri_kinds = HashMap::new(); for ip in group.ips.values() { - let pname = ip.instance_name.clone(); + let pname = normalize_peri_name(&ip.instance_name); let pkind = format!("{}:{}", ip.name, ip.version); let pkind = pkind.strip_suffix("_Cube").unwrap_or(&pkind); @@ -1035,18 +1036,10 @@ fn process_core( "TOUCHSENSING", ]; - if FAKE_PERIPHERALS.contains(&pname.as_str()) { + if FAKE_PERIPHERALS.contains(&pname) { continue; } - let pname = match pname.as_str() { - "HDMI_CEC" => "CEC".to_string(), - "SUBGHZ" => "SUBGHZSPI".to_string(), - // remove when https://github.com/stm32-rs/stm32-rs/pull/789 merges - "USB_DRD_FS" => "USB".to_string(), - _ => pname, - }; - if pname.starts_with("ADC") { if let Entry::Vacant(entry) = peri_kinds.entry("ADC_COMMON".to_string()) { entry.insert(format!("ADC_COMMON:{}", ip.version.strip_suffix("_Cube").unwrap())); @@ -1057,7 +1050,7 @@ fn process_core( entry.insert(format!("ADC3_COMMON:{}", ip.version.strip_suffix("_Cube").unwrap())); } } - peri_kinds.insert(pname, pkind.to_string()); + peri_kinds.insert(pname.to_string(), pkind.to_string()); } const GHOST_PERIS: &[&str] = &[ "GPIOA", @@ -1150,12 +1143,12 @@ fn process_core( continue; }; periph_pins.entry(signal_peri.to_string()).or_default().push( - stm32_data_serde::chip::core::peripheral::Pin { - pin: pin_name.clone(), + stm32_data_serde::chip::core::peripheral::Pin { + pin: pin_name.clone(), signal: signal_name.to_string(), - af: None, - }, - ); + af: None, + }, + ); } } for pins in periph_pins.values_mut() { @@ -1169,15 +1162,7 @@ fn process_core( continue; } - let addr = if (chip_name.starts_with("STM32F0") - || chip_name.starts_with("STM32L1") - || chip_name.starts_with("STM32L0")) - && pname == "ADC" - { - defines.get_peri_addr("ADC1") - } else if chip_name.starts_with("STM32H7") && pname == "HRTIM" { - defines.get_peri_addr("HRTIM1") - } else if let Some(cap) = regex!(r"^FDCANRAM(?P[0-9]+)$").captures(&pname) { + let addr = if let Some(cap) = regex!(r"^FDCANRAM(?P[0-9]+)$").captures(&pname) { defines.get_peri_addr("FDCANRAM").map(|addr| { if chip_name.starts_with("STM32H7") { addr @@ -1192,10 +1177,7 @@ fn process_core( defines.get_peri_addr(&pname) }; - let addr = match addr { - Some(addr) => addr, - None => continue, - }; + let Some(addr) = addr else { continue }; let mut p = stm32_data_serde::chip::core::Peripheral { name: if pname == "SBS" { diff --git a/stm32-data-gen/src/dma.rs b/stm32-data-gen/src/dma.rs index 116edc7..e74cf42 100644 --- a/stm32-data-gen/src/dma.rs +++ b/stm32-data-gen/src/dma.rs @@ -2,6 +2,8 @@ use std::collections::HashMap; use anyhow::Context; +use crate::normalize_peris::normalize_peri_name; + mod xml { use serde::Deserialize; @@ -150,7 +152,7 @@ impl DmaChannels { }; chip_dma .peripherals - .entry(target_peri_name.to_string()) + .entry(normalize_peri_name(target_peri_name).to_string()) .or_default() .push(stm32_data_serde::chip::core::peripheral::DmaChannel { signal: request.to_string(), @@ -270,7 +272,7 @@ impl DmaChannels { }; chip_dma .peripherals - .entry(target_peri_name.to_string()) + .entry(normalize_peri_name(target_peri_name).to_string()) .or_default() .push(entry); } @@ -320,7 +322,7 @@ impl DmaChannels { }; chip_dma .peripherals - .entry(target_peri_name.to_string()) + .entry(normalize_peri_name(target_peri_name).to_string()) .or_default() .push(stm32_data_serde::chip::core::peripheral::DmaChannel { signal: request.to_string(), diff --git a/stm32-data-gen/src/gpio_af.rs b/stm32-data-gen/src/gpio_af.rs index df1d773..4bfc176 100644 --- a/stm32-data-gen/src/gpio_af.rs +++ b/stm32-data-gen/src/gpio_af.rs @@ -1,5 +1,6 @@ use std::collections::HashMap; +use crate::normalize_peris::normalize_peri_name; use crate::regex; mod xml { @@ -121,6 +122,6 @@ pub fn parse_signal_name(signal_name: &str) -> Option<(&str, &str)> { Some((peri_name, signal_name.strip_suffix("OUT").unwrap_or(signal_name))) } else { - Some((peri_name, signal_name)) + Some((normalize_peri_name(peri_name), signal_name)) } } diff --git a/stm32-data-gen/src/header.rs b/stm32-data-gen/src/header.rs index 82fc349..269fcac 100644 --- a/stm32-data-gen/src/header.rs +++ b/stm32-data-gen/src/header.rs @@ -175,6 +175,7 @@ impl Defines { &["OCTOSPI2_R_BASE", "OCTOSPI2_R_BASE_NS", "OCTOSPI2_REG_BASE"], ), ("FLASH", &["FLASH_R_BASE", "FLASH_REG_BASE"]), + ("ADC", &["ADC1_BASE", "ADC_BASE"]), ( "ADC_COMMON", &["ADC_COMMON", "ADC1_COMMON", "ADC12_COMMON", "ADC123_COMMON"], diff --git a/stm32-data-gen/src/interrupts.rs b/stm32-data-gen/src/interrupts.rs index cdbcd28..28487b6 100644 --- a/stm32-data-gen/src/interrupts.rs +++ b/stm32-data-gen/src/interrupts.rs @@ -3,6 +3,7 @@ use std::collections::{HashMap, HashSet}; use log::*; use crate::chips::ChipGroup; +use crate::normalize_peris::normalize_peri_name; use crate::regex; mod xml { @@ -342,6 +343,7 @@ impl ChipInterrupts { } for (p, s) in interrupt_signals { + let p = normalize_peri_name(&p).to_string(); let signals = chip_signals.entry(p).or_default(); let irqs = signals.entry(s).or_default(); irqs.insert(header_name.clone()); diff --git a/stm32-data-gen/src/main.rs b/stm32-data-gen/src/main.rs index c687f42..e01f330 100644 --- a/stm32-data-gen/src/main.rs +++ b/stm32-data-gen/src/main.rs @@ -5,6 +5,7 @@ mod gpio_af; mod header; mod interrupts; mod memory; +mod normalize_peris; mod rcc; mod registers; diff --git a/stm32-data-gen/src/normalize_peris.rs b/stm32-data-gen/src/normalize_peris.rs new file mode 100644 index 0000000..50020a1 --- /dev/null +++ b/stm32-data-gen/src/normalize_peris.rs @@ -0,0 +1,14 @@ +#[rustfmt::skip] +static NORMALIZE: &[(&str, &str)] = &[ + ("HRTIM", "HRTIM1"), + ("HDMI_CEC", "CEC"), + ("SUBGHZ", "SUBGHZSPI"), + ("USB_DRD_FS", "USB"), +]; + +pub fn normalize_peri_name(name: &str) -> &str { + if let Some((_, res)) = NORMALIZE.iter().find(|(n, _)| *n == name) { + return res; + } + return name; +}