max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a regex to match find enable and rst regs

Browse Source
This commit is contained in:
Timo Kröger 2021-07-30 17:17:38 +02:00
parent 4e47b15daf
commit c985c031d4
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
stm32-metapac-gen/src/lib.rs
View File

@ -118,7 +118,7 @@ impl BlockInfo {
fn find_reg_for_field<'c>( fn find_reg_for_field<'c>(
rcc: &'c ir::IR, rcc: &'c ir::IR,
reg_prefix: &str, reg_regex: &str,
field_name: &str, field_name: &str,
) -> Option<(&'c str, &'c str)> { ) -> Option<(&'c str, &'c str)> {
rcc.fieldsets.iter().find_map(|(name, fieldset)| { rcc.fieldsets.iter().find_map(|(name, fieldset)| {
@ -126,7 +126,7 @@ fn find_reg_for_field<'c>(
// not help matching for clock name. // not help matching for clock name.
if name.starts_with("C1") || name.starts_with("C2") { if name.starts_with("C1") || name.starts_with("C2") {
None None
} else if name.starts_with(reg_prefix) { } else if Regex::new(reg_regex).unwrap().is_match(name) {
fieldset fieldset
.fields .fields
.iter() .iter()
@ -441,31 +441,22 @@ pub fn gen(options: Options) {
}; };
if let Some(clock_prefix) = clock_prefix { if let Some(clock_prefix) = clock_prefix {
// Ignore the numbers in clock name when searching for enable bits because clock
// names do not map cleanly to regsiter names.
// Example:
// stm32f0: RCC_APB2ENR - APB peripheral clock enable register 2 CLOCK: APB1
// stm32f4: RCC_APB2ENR - RCC APB2 peripheral clock enable register CLOCK: APB2
//
// Search for the enable bit in all available registers to support the stm32f0 case.
let search_clock_prefix = clock_prefix.trim_end_matches(char::is_numeric);
// Workaround for clock registers being split on some chip families. Assume fields are // Workaround for clock registers being split on some chip families. Assume fields are
// named after peripheral and look for first field matching and use that register. // named after peripheral and look for first field matching and use that register.
let mut en = let mut en =
find_reg_for_field(&rcc, search_clock_prefix, &format!("{}EN", name)); find_reg_for_field(&rcc, "^.+ENR\\d*$", &format!("{}EN", name));
let mut rst = let mut rst =
find_reg_for_field(&rcc, search_clock_prefix, &format!("{}RST", name)); find_reg_for_field(&rcc, "^.+RSTR\\d*$", &format!("{}RST", name));
if en.is_none() && name.ends_with("1") { if en.is_none() && name.ends_with("1") {
en = find_reg_for_field( en = find_reg_for_field(
&rcc, &rcc,
search_clock_prefix, "^.+ENR\\d*$",
&format!("{}EN", &name[..name.len() - 1]), &format!("{}EN", &name[..name.len() - 1]),
); );
rst = find_reg_for_field( rst = find_reg_for_field(
&rcc, &rcc,
search_clock_prefix, "^.+RSTR\\d*$",
&format!("{}RST", &name[..name.len() - 1]), &format!("{}RST", &name[..name.len() - 1]),
); );
} }