Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/svd2ir.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ pub fn convert_peripheral(ir: &mut IR, p: &svd::Peripheral) -> anyhow::Result<()

if let Some(fields) = &r.fields {
let mut fieldset_name = block.name.clone();
let mut field_name_counts: BTreeMap<String, usize> = BTreeMap::new();
fieldset_name.push(replace_suffix(&r.name, ""));
fieldsets.push(ProtoFieldset {
name: fieldset_name.clone(),
Expand All @@ -74,7 +75,14 @@ pub fn convert_peripheral(ir: &mut IR, p: &svd::Peripheral) -> anyhow::Result<()
let mut enum_write = None;
let mut enum_readwrite = None;

let field_name = replace_suffix(&f.name, "");
let mut field_name = replace_suffix(&f.name, "");

let field_name_count =
field_name_counts.entry(field_name.clone()).or_insert(0);
*field_name_count += 1;
if *field_name_count > 1 {
field_name = format!("{}{}", field_name, field_name_count);
}

for e in &f.enumerated_values {
let e = if let Some(derived_from) = &e.derived_from {
Expand Down
2 changes: 1 addition & 1 deletion src/transform/sanitize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ pub(crate) fn rename_duplicate_variants(enumm: &mut crate::ir::Enum) {
for v in &mut enumm.variants {
if name_counts.get(&v.name).is_some_and(|&c| c > 1) {
v.name = format!("{}_{:x}", v.name, v.value);
// increment new name to catch cascading name collisons
// increment new name to catch cascading name collisions
*name_counts.entry(v.name.clone()).or_insert(0) += 1;
}
}
Expand Down