Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

### Fixed

- Handling of missing register description (optional field)

## [v0.16.0] - 2019-08-05

### Added
Expand Down
6 changes: 3 additions & 3 deletions src/generate/peripheral.rs
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ fn expand_register(
match register {
Register::Single(info) => register_expanded.push(RegisterBlockField {
field: convert_svd_register(register, name),
description: info.description.clone().unwrap(),
description: info.description.clone().unwrap_or_else(|| "".to_string()),
offset: info.address_offset,
size: register_size,
}),
Expand All @@ -699,15 +699,15 @@ fn expand_register(
if array_convertible {
register_expanded.push(RegisterBlockField {
field: convert_svd_register(&register, name),
description: info.description.clone().unwrap(),
description: info.description.clone().unwrap_or_else(|| "".to_string()),
offset: info.address_offset,
size: register_size * array_info.dim,
});
} else {
for (field_num, field) in expand_svd_register(register, name).iter().enumerate() {
register_expanded.push(RegisterBlockField {
field: field.clone(),
description: info.description.clone().unwrap(),
description: info.description.clone().unwrap_or_else(|| "".to_string()),
offset: info.address_offset + field_num as u32 * array_info.dim_increment,
size: register_size,
});
Expand Down
10 changes: 8 additions & 2 deletions src/generate/register.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use crate::svd::{
Usage, WriteConstraint,
};
use cast::u64;
use log::warn;
use quote::Tokens;
use syn::Ident;

Expand Down Expand Up @@ -33,8 +34,13 @@ pub fn render(
rsize.next_power_of_two()
};
let rty = rsize.to_ty()?;
let description =
util::escape_brackets(util::respace(&register.description.clone().unwrap()).as_ref());
let description = util::escape_brackets(
util::respace(&register.description.clone().unwrap_or_else(|| {
warn!("Missing description for register {}", register.name);
"".to_string()
}))
.as_ref(),
);

let mut mod_items = vec![];
let mut r_impl_items = vec![];
Expand Down