Skip to content

[SVD] Fix derived peripherals not inheriting default properties #8494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emesare merged 1 commit into from
Aug 31, 2026
+6 −4
Merged

[SVD] Fix derived peripherals not inheriting default properties #8494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 4 deletions plugins/svd/src/mapper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ pub struct DeviceMapper {
}

impl DeviceMapper {
pub fn new(settings: LoadSettings, address_size: usize, mut device: Device) -> Self {
svd_parser::expand_properties(&mut device);

pub fn new(settings: LoadSettings, address_size: usize, device: Device) -> Self {
// TODO: Until https://github.com/rust-embedded/svd/issues/288 is fixed
let mut new_device = device.clone();
new_device.peripherals.clear();
Expand All @@ -69,7 +67,11 @@ impl DeviceMapper {
}

// TODO: Return error instead.
let expanded_device = svd_parser::expand(&new_device).expect("Failed to expand device!");
let mut expanded_device =
svd_parser::expand(&new_device).expect("Failed to expand device!");
// Property expansion skips derived peripherals. Resolve derivedFrom first so registers
// supplied by a derived peripheral still inherit its or the device's default properties.
svd_parser::expand_properties(&mut expanded_device);
Self {
settings,
device: expanded_device,
Expand Down
Loading