Skip to content

Commit 02d6656

Browse files
committed
Update svd-parser to 0.14.2
1 parent 6069091 commit 02d6656

File tree

4 files changed

+31
-139
lines changed

4 files changed

+31
-139
lines changed

Cargo.lock

+26-134
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ anyhow = "1.0.75"
1515
regex = "1.9.5"
1616
serde = { version = "1.0.188", features = [ "derive" ]}
1717
serde_yaml = "0.9.25"
18-
svd-parser = { version = "0.10.2", features = ["derive-from"] }
18+
svd-parser = { version = "0.14.2", features = ["derive-from"] }

src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ fn main() -> Result<()> {
139139
}
140140
}
141141

142-
fn load_svd(path: &str) -> Result<svd_parser::Device> {
142+
fn load_svd(path: &str) -> Result<svd_parser::svd::Device> {
143143
let xml = &mut String::new();
144144
File::open(path)
145145
.context("Cannot open the SVD file")?

src/svd2ir.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use log::*;
22
use std::collections::{HashMap, HashSet};
3-
use svd_parser as svd;
3+
use svd_parser::svd;
44

55
use crate::util;
66
use crate::{ir::*, transform};
@@ -195,7 +195,7 @@ pub fn convert_peripheral(ir: &mut IR, p: &svd::Peripheral) -> anyhow::Result<()
195195
None
196196
};
197197

198-
let access = match r.access {
198+
let access = match r.properties.access {
199199
None => Access::ReadWrite,
200200
Some(svd::Access::ReadOnly) => Access::Read,
201201
Some(svd::Access::WriteOnly) => Access::Write,
@@ -211,7 +211,7 @@ pub fn convert_peripheral(ir: &mut IR, p: &svd::Peripheral) -> anyhow::Result<()
211211
byte_offset: r.address_offset,
212212
inner: BlockItemInner::Register(Register {
213213
access, // todo
214-
bit_size: r.size.unwrap_or(32),
214+
bit_size: r.properties.size.unwrap_or(32),
215215
fieldset: fieldset_name.clone(),
216216
}),
217217
};

0 commit comments

Comments
 (0)