Skip to content

Commit

Permalink
Merge #381
Browse files Browse the repository at this point in the history
381: TPIU: swo_supports: make struct fields public, improve documentation r=thejpster a=tmplt

A few small changes that I missed the first time around when the TPIU API was expanded.

Co-authored-by: Viktor Sonesten <v@tmplt.dev>
  • Loading branch information
bors[bot] and tmplt authored Jan 6, 2022
2 parents e0b93a0 + a66e4a6 commit ef049c9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- DWT: add `configure` API for address, cycle count comparison (#342, #367).
- ITM: add `configure` API (#342).
- TPIU: add API for *Formatter and Flush Control* (FFCR) and *Selected Pin Control* (SPPR) registers (#342).
- TPIU: add `swo_supports` for checking what SWO configurations the target supports. (#381)
- Add `std` and `serde` crate features for improved host-side ITM decode functionality when working with the downstream `itm`, `cargo-rtic-scope` crates (#363, #366).
- Added the ability to name the statics generated by `singleton!()` for better debuggability (#364, #380).

Expand Down
11 changes: 6 additions & 5 deletions src/peripheral/tpiu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,18 @@ impl core::convert::TryFrom<u8> for TraceProtocol {
}
}

/// The SWO options supported by the TPIU.
/// The SWO options supported by the TPIU, and the mimimum size of the
/// FIFO output queue for trace data.
#[derive(Debug, Eq, PartialEq, Copy, Clone)]
pub struct SWOSupports {
/// Whether UART/NRZ encoding is supported for SWO.
nrz_encoding: bool,
pub nrz_encoding: bool,
/// Whether Manchester encoding is supported for SWO.
manchester_encoding: bool,
pub manchester_encoding: bool,
/// Whether parallel trace port operation is supported.
parallel_operation: bool,
pub parallel_operation: bool,
/// The minimum implemented FIFO queue size of the TPIU for trace data.
min_queue_size: u8,
pub min_queue_size: u8,
}

impl TPIU {
Expand Down

0 comments on commit ef049c9

Please sign in to comment.