register properties encode

Author: burrbull

src/svd/cluster.rs

@@ -68,8 +68,7 @@ impl Encode for Cluster {
     fn encode(&self) -> Result<Element, SVDError> {
         match self {
             Cluster::Single(i) => {
-                let mut e = i.encode()?;
-                Ok(e)
+                i.encode()
             }
             Cluster::Array(i, a) => {
                 let mut e = i.encode()?;

src/svd/clusterinfo.rs

@@ -4,7 +4,7 @@ use xmltree::Element;
 use types::Parse;
 
 #[cfg(feature = "unproven")]
-use encode::Encode;
+use encode::{Encode, EncodeChildren};
 #[cfg(feature = "unproven")]
 use new_element;
 
@@ -69,26 +69,7 @@ impl Encode for ClusterInfo {
             Some(format!("{}", self.address_offset)),
         ));
 
-        if let Some(ref v) = self.size {
-            e.children
-                .push(new_element("size", Some(format!("{}", v))));
-        }
-
-        if let Some(ref v) = self.access {
-            e.children.push(v.encode()?);
-        }
-
-        if let Some(ref v) = self.reset_value {
-            e.children.push(new_element(
-                "resetValue",
-                Some(format!("{}", v)),
-            ));
-        }
-
-        if let Some(ref v) = self.reset_mask {
-            e.children
-                .push(new_element("resetMask", Some(format!("{}", v))));
-        }
+        e.children.extend(self.default_register_properties.encode()?);
 
         for c in &self.children {
             e.children.push(c.encode()?);

src/svd/device.rs

@@ -7,7 +7,7 @@ use parse;
 use types::Parse;
 
 #[cfg(feature = "unproven")]
-use encode::Encode;
+use encode::{Encode, EncodeChildren};
 use error::SVDError;
 #[cfg(feature = "unproven")]
 use new_element;
@@ -120,6 +120,8 @@ impl Encode for Device {
             None => (),
         }
 
+        elem.children.extend(self.default_register_properties.encode()?);
+
         match self.cpu {
             Some(ref v) => {
                 elem.children.push(v.encode()?);

src/svd/peripheral.rs

@@ -8,7 +8,7 @@ use failure::ResultExt;
 use parse;
 
 #[cfg(feature = "unproven")]
-use encode::Encode;
+use encode::{Encode, EncodeChildren};
 #[cfg(feature = "unproven")]
 use new_element;
 use types::Parse;
@@ -171,6 +171,9 @@ impl Encode for Peripheral {
             "baseAddress",
             Some(format!("0x{:.08x}", self.base_address)),
         ));
+
+        elem.children.extend(self.default_register_properties.encode()?);
+
         match self.address_block {
             Some(ref v) => {
                 elem.children.push(v.encode()?);

src/svd/register.rs

@@ -60,7 +60,7 @@ impl Encode for Register {
             Register::Single(ref info) => info.encode(),
             Register::Array(ref info, ref array_info) => {
                 // TODO: is this correct? probably not, need tests
-                let mut base = info.encode()?;
+                let base = info.encode()?;
                 base.merge(&array_info.encode()?);
                 Ok(base)
             }