Merge #201

201: expand properties r=Emilgardis a=burrbull

Closes #200 

r? `@Emilgardis` 

Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

svd-parser/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## [v0.13.3] - 2022-05-09
+
+- Add `expand_properties` (under `expand` feature)
+
 ## [v0.13.2] - 2022-04-23
 
 - Add `expand` (under `expand` feature) and `ignore_enums` options
@@ -31,7 +35,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 Previous versions in common [changelog](../CHANGELOG.md).
 
-[Unreleased]: https://github.com/rust-embedded/svd/compare/svd-parser-v0.13.2...HEAD
+[Unreleased]: https://github.com/rust-embedded/svd/compare/svd-parser-v0.13.3...HEAD
+[v0.13.3]: https://github.com/rust-embedded/svd/compare/svd-parser-v0.13.3...svd-parser-v0.13.2
 [v0.13.2]: https://github.com/rust-embedded/svd/compare/svd-rs-v0.13.2...svd-parser-v0.13.2
 [v0.13.1]: https://github.com/rust-embedded/svd/compare/v0.13.0...svd-parser-v0.13.1
 [v0.13.0]: https://github.com/rust-embedded/svd/compare/v0.12.0...v0.13.0

svd-parser/Cargo.toml

@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
 name = "svd-parser"
 repository = "https://github.com/rust-embedded/svd"
 edition = "2018"
-version = "0.13.2"
+version = "0.13.3"
 readme = "README.md"
 
 [features]

svd-parser/src/expand.rs

@@ -5,7 +5,7 @@ use std::collections::HashMap;
 use std::mem::take;
 use svd_rs::{
     array::names, cluster, field, peripheral, register, BitRange, Cluster, ClusterInfo, DeriveFrom,
-    Device, EnumeratedValues, Field, Peripheral, Register, RegisterCluster,
+    Device, EnumeratedValues, Field, Peripheral, Register, RegisterCluster, RegisterProperties,
 };
 
 #[derive(Clone, Debug, Default)]
@@ -398,3 +398,38 @@ pub fn expand(indevice: &Device) -> Result<Device> {
 
     Ok(device)
 }
+
+/// Takes register `size`, `access`, `reset_value` and `reset_mask`
+/// from peripheral or device properties if absent in register
+pub fn expand_properties(device: &mut Device) {
+    let default = device.default_register_properties.clone();
+    for p in &mut device.peripherals {
+        if p.derived_from.is_some() {
+            continue;
+        }
+        let default = p.default_register_properties.derive_from(&default);
+        if let Some(regs) = p.registers.as_mut() {
+            expand_properties_registers(regs, &default);
+        }
+    }
+}
+
+fn expand_properties_registers(regs: &mut [RegisterCluster], default: &RegisterProperties) {
+    for rc in regs {
+        match rc {
+            RegisterCluster::Cluster(c) => {
+                if c.derived_from.is_some() {
+                    continue;
+                }
+                let default = c.default_register_properties.derive_from(&default);
+                expand_properties_registers(&mut c.children, &default);
+            }
+            RegisterCluster::Register(r) => {
+                if r.derived_from.is_some() {
+                    continue;
+                }
+                r.properties = r.properties.derive_from(default);
+            }
+        }
+    }
+}

svd-parser/src/lib.rs

@@ -46,6 +46,8 @@ pub struct Config {
     /// Expand arrays and resolve derivedFrom
     // TODO: split it on several independent options
     pub expand: bool,
+    /// Derive register properties from parents
+    pub expand_properties: bool,
     /// Skip parsing and emitting `enumeratedValues` and `writeConstraint` in `Field`
     pub ignore_enums: bool,
 }
@@ -64,6 +66,14 @@ impl Config {
         self
     }
 
+    #[cfg(feature = "expand")]
+    /// Takes register `size`, `access`, `reset_value` and `reset_mask`
+    /// from peripheral or device properties if absent in register
+    pub fn expand_properties(mut self, val: bool) -> Self {
+        self.expand_properties = val;
+        self
+    }
+
     /// Skip parsing `enumeratedValues` and `writeConstraint` in `Field`
     pub fn ignore_enums(mut self, val: bool) -> Self {
         self.ignore_enums = val;
@@ -158,6 +168,11 @@ pub fn parse_with_config(xml: &str, config: &Config) -> anyhow::Result<Device> {
         }
     }?;
 
+    #[cfg(feature = "expand")]
+    if config.expand_properties {
+        expand::expand_properties(&mut device);
+    }
+
     #[cfg(feature = "expand")]
     if config.expand {
         device = expand::expand(&device)?;
@@ -203,7 +218,7 @@ mod writeconstraint;
 mod expand;
 
 #[cfg(feature = "expand")]
-pub use expand::expand;
+pub use expand::{expand, expand_properties};
 /// SVD parse Errors.
 #[derive(Clone, Debug, PartialEq, thiserror::Error)]
 pub enum SVDError {