Skip to content

Commit ac586d0

Browse files
authored
Merge pull request #289 from emesare/add_missing_addr_block_df
Add missing `DeriveFrom` entry for `address_block`
2 parents 3019dbc + 378d237 commit ac586d0

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

svd-rs/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10+
- Add missing entry for `address_block` in `DeriveFrom` impl
11+
1012
## [v0.14.11] - 2025-02-10
1113

1214
- Partially revert #283. Check name on "%s" when derive array

svd-rs/src/derive_from.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ impl DeriveFrom for PeripheralInfo {
5656
.default_register_properties
5757
.derive_from(&other.default_register_properties);
5858
derived.registers = derived.registers.or_else(|| other.registers.clone());
59+
derived.address_block = derived
60+
.address_block
61+
.or_else(|| other.address_block.clone());
5962
if derived.interrupt.is_empty() {
6063
derived.interrupt = other.interrupt.clone();
6164
}

0 commit comments

Comments
 (0)