From 27f2f75ee2603310898665d059e05d2029dbe5ce Mon Sep 17 00:00:00 2001
From: Wataru Otsubo <wotsubo@icepp.s.u-tokyo.ac.jp>
Date: Thu, 24 Apr 2025 03:04:04 +0900
Subject: [PATCH 1/3] add(converter): support value under register, by
 inserting field during conversion

---
 src/converter.rs | 57 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/converter.rs b/src/converter.rs
index 27d78b0..472ef0f 100644
--- a/src/converter.rs
+++ b/src/converter.rs
@@ -389,11 +389,19 @@ impl Register {
             .transpose()?;
         let desc = node.attribute("desc").map(str::to_string);
 
-        let children: Vec<_> = node
-            .children()
-            .filter(|node| node.is_element() && node.tag_name().name().eq("field"))
-            .map(Field::from_xml_dom)
-            .collect::<Result<_, _>>()?;
+        let children: Vec<_> = {
+            let mut child_elements = node.children().filter(|node| node.is_element());
+            if child_elements.any(|node| node.tag_name().name().eq("value")) {
+                // Generate virtual single field under the register, to absorb difference between
+                // normal format
+                vec![Field::from_xml_register_dom(node)?]
+            } else {
+                child_elements
+                    .filter(|node| node.tag_name().name().eq("field"))
+                    .map(Field::from_xml_dom)
+                    .collect::<Result<_, _>>()?
+            }
+        };
 
         // Validation
         if default.is_some() && !children.is_empty() {
@@ -505,6 +513,45 @@ impl Field {
             elements: children,
         })
     }
+
+    /// Generate Field from Registers (piracy), guessing a lot of parameters.
+    pub(crate) fn from_xml_register_dom(node: Node) -> Result<Self, DomConversionError> {
+        let name = util::get_name(node)?;
+        let mask = node
+            .ancestors()
+            .filter_map(|node| util::get_type(node))
+            .next()
+            .transpose()?
+            .map_or_else(
+                || Err(DomConversionError::parameter_completion_error("type", node)),
+                |dtype| match dtype {
+                    crate::types::DataType::D32 => Ok(u32::MAX),
+                },
+            )?;
+        if node.has_attribute("default") {
+            return Err(DomConversionError::other_error(
+                "unsupported structure: register with @default without field",
+                node,
+            ));
+        }
+        let desc = node.attribute("desc").map(str::to_string);
+        let children = node
+            .children()
+            .filter(|node| node.is_element())
+            .map(Value::from_xml_dom)
+            .collect::<Result<_, _>>()?;
+
+        Ok(Field {
+            name,
+            mask,
+            interface: None,
+            multiple: None,
+            default: None,
+            sclr: None,
+            desc,
+            elements: children,
+        })
+    }
 }
 
 impl Value {

From 6ee8239682ff140c793952a83a9ba15639ebc04a Mon Sep 17 00:00:00 2001
From: Wataru Otsubo <wotsubo@icepp.s.u-tokyo.ac.jp>
Date: Thu, 24 Apr 2025 03:06:26 +0900
Subject: [PATCH 2/3] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5212799..9adca3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Packagin with Nix flakes (with nixpkgs buildRustPackage) [!16](https://gitlab.cern.ch/wotsubo/endcap-sl-software-ri-generator/-/merge_requests/16)
 - Now xml metadata can be overwritten with corresponding environmental variables. [!17](https://gitlab.cern.ch/wotsubo/endcap-sl-software-ri-generator/-/merge_requests/17)
+- Support value element just under the register element by inserting single field during conversion. [!3](https://gitlab.cern.ch/wotsubo/endcap-sl-software-ri-generator/-/merge_requests/18)
 
 ### Changed
 

From 3379babe12f7d651d804b6c6c2d99558caae216d Mon Sep 17 00:00:00 2001
From: Wataru Otsubo <wotsubo@icepp.s.u-tokyo.ac.jp>
Date: Thu, 24 Apr 2025 03:11:08 +0900
Subject: [PATCH 3/3] fix(converter): use mask of parent register for virtual
 field if exists

---
 src/converter.rs | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/converter.rs b/src/converter.rs
index 472ef0f..fbdf7f1 100644
--- a/src/converter.rs
+++ b/src/converter.rs
@@ -517,17 +517,22 @@ impl Field {
     /// Generate Field from Registers (piracy), guessing a lot of parameters.
     pub(crate) fn from_xml_register_dom(node: Node) -> Result<Self, DomConversionError> {
         let name = util::get_name(node)?;
-        let mask = node
-            .ancestors()
-            .filter_map(|node| util::get_type(node))
-            .next()
-            .transpose()?
-            .map_or_else(
-                || Err(DomConversionError::parameter_completion_error("type", node)),
-                |dtype| match dtype {
-                    crate::types::DataType::D32 => Ok(u32::MAX),
-                },
-            )?;
+        let mask = match node.attribute("mask") {
+            Some(mask) => mask
+                .parse_prefixed_u32()
+                .map_err(|e| DomConversionError::parse_prefixed_u32_error(e, "mask", node))?,
+            None => node
+                .ancestors()
+                .filter_map(|node| util::get_type(node))
+                .next()
+                .transpose()?
+                .map_or_else(
+                    || Err(DomConversionError::parameter_completion_error("type", node)),
+                    |dtype| match dtype {
+                        crate::types::DataType::D32 => Ok(u32::MAX),
+                    },
+                )?,
+        };
         if node.has_attribute("default") {
             return Err(DomConversionError::other_error(
                 "unsupported structure: register with @default without field",