expand properties

Author: burrbull

svd-parser/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+- Add `expand_properties` (under `expand` feature)
+
 ## [v0.13.2] - 2022-04-23
 
 - Add `expand` (under `expand` feature) and `ignore_enums` options

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,31 @@ 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 {
+        let default = p.default_register_properties.derive_from(&default);
+        if let Some(regs) = p.registers.as_mut() {
+            for rc in regs {
+                expand_properties_register_cluster(rc, &default);
+            }
+        }
+    }
+}
+
+fn expand_properties_register_cluster(rc: &mut RegisterCluster, default: &RegisterProperties) {
+    match rc {
+        RegisterCluster::Cluster(c) => {
+            let default = c.default_register_properties.derive_from(&default);
+            for rc in &mut c.children {
+                expand_properties_register_cluster(rc, &default);
+            }
+        }
+        RegisterCluster::Register(r) => {
+            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;
@@ -162,6 +172,11 @@ pub fn parse_with_config(xml: &str, config: &Config) -> anyhow::Result<Device> {
     if config.expand {
         device = expand::expand(&device)?;
     }
+
+    #[cfg(feature = "expand")]
+    if config.expand_properties {
+        expand::expand_properties(&mut device);
+    }
     Ok(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 {