update to svd-rs 0.4.10

rust-embedded · Feb 9, 2025 · 1e9a431 · 1e9a431
1 parent dac8766
commit 1e9a431
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 - Some fixes for the `svd2rust-regress` tool and update of its documentation
 - Other internal clippy fixes for `clippy::manual_div_ceil`, `clippy::nonminimal_bool` and
   `clippy::needless_lifetimes`
+- Update `svd-rs` to 0.4.10
 
 ## [v0.35.0] - 2024-11-12
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -58,11 +58,11 @@ url = { version = "2.5", features = ["serde"] }
 
 [dependencies.svd-parser]
 features = ["expand"]
-version = "0.14.7"
+version = "0.14.8"
 
 [dependencies.svd-rs]
 features = ["serde"]
-version = "0.14.9"
+version = "0.14.10"
 
 [dependencies.syn]
 version = "2.0"

diff --git a/src/generate/register.rs b/src/generate/register.rs
@@ -1341,24 +1341,15 @@ pub fn fields(
                 });
             }
 
-            // Update register modify bit masks
-            let offsets = match f {
-                MaybeArray::Array(info, dim) => (0..dim.dim)
-                    .map(|i| i * dim.dim_increment + info.bit_offset())
-                    .collect(),
-                MaybeArray::Single(info) => vec![info.bit_offset()],
-            };
-            for o in offsets {
-                let bitmask = (u64::MAX >> (64 - width)) << o;
-                use ModifiedWriteValues::*;
-                match mwv {
-                    Modify | Set | Clear => {}
-                    OneToSet | OneToClear | OneToToggle => {
-                        one_to_modify_fields_bitmap |= bitmask;
-                    }
-                    ZeroToClear | ZeroToSet | ZeroToToggle => {
-                        zero_to_modify_fields_bitmap |= bitmask;
-                    }
+            let bitmask = f.bitmask();
+            use ModifiedWriteValues::*;
+            match mwv {
+                Modify | Set | Clear => {}
+                OneToSet | OneToClear | OneToToggle => {
+                    one_to_modify_fields_bitmap |= bitmask;
+                }
+                ZeroToClear | ZeroToSet | ZeroToToggle => {
+                    zero_to_modify_fields_bitmap |= bitmask;
                 }
             }
         }