expand_properties

Author: burrbull

Cargo.toml

@@ -28,7 +28,7 @@ clap = { version = "3.0", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 quick-xml = { version = "0.18", features = ["serialize"] }
 svd-rs = { version = "0.13.2", features = ["serde", "derive-from"]  }
-svd-parser = { version = "0.13.2", features = ["expand"] }
+svd-parser = { version = "0.13.4", features = ["expand"] }
 svd-encoder = "0.13.1"
 yaml-rust = "0.4"
 serde_yaml = "0.8.23"

src/cli.rs

@@ -64,6 +64,10 @@ enum Command {
         #[clap(long)]
         expand: bool,
 
+        /// Take size, access, reset_value, reset_mask from parents if absent in register
+        #[clap(long)]
+        expand_properties: bool,
+
         /// Skip enumeratedValues and writeConstraints during parsing (XML input only)
         #[clap(long)]
         ignore_enums: bool,
@@ -88,13 +92,15 @@ impl Command {
                 input_format,
                 output_format,
                 expand,
+                expand_properties,
                 ignore_enums,
             } => convert_cli::convert(
                 in_path,
                 out_path,
                 *input_format,
                 *output_format,
                 *expand,
+                *expand_properties,
                 *ignore_enums,
             )?,
         }

src/convert/convert_cli.rs

@@ -49,6 +49,7 @@ pub fn convert(
     input_format: Option<InputFormat>,
     output_format: Option<OutputFormat>,
     expand: bool,
+    expand_properties: bool,
     ignore_enums: bool,
 ) -> Result<()> {
     let input_format = match input_format {
@@ -69,14 +70,17 @@ pub fn convert(
     let mut input = String::new();
     File::open(in_path)?.read_to_string(&mut input)?;
 
-    let device = match input_format {
+    let mut device = match input_format {
         InputFormat::Xml => svd_parser::parse_with_config(
             &input,
             &svd_parser::Config::default().ignore_enums(ignore_enums),
         )?,
         InputFormat::Yaml => serde_yaml::from_str(&input)?,
         InputFormat::Json => serde_json::from_str(&input)?,
     };
+    if expand_properties {
+        svd_parser::expand_properties(&mut device);
+    }
     let device = if expand {
         svd_parser::expand(&device)?
     } else {