mirrors/embedded-trainings-2020
1
0
Fork 0
mirror of https://github.com/ferrous-systems/embedded-trainings-2020.git synced 2024-05-07 11:02:56 +00:00
Code Issues Projects Releases Wiki Activity

control flow cleanup

Browse source
This commit is contained in:
Lotte Steenbrink 2020-06-19 11:22:56 +02:00
parent 3fac13606e
commit b65b432762
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
tools/dk-run/src/main.rs
View file

@ -192,29 +192,30 @@ fn notmain() -> Result<i32, anyhow::Error> {
// run
let core = Rc::new(core);
let mut num_retries = 5;
let rtt_addr_result = rtt_addr.ok_or_else(|| anyhow!("RTT control block not available"))?;
let mut rtt: Result<Rtt, probe_rs_rtt::Error>;
let mut num_retries = 3; // picked at random, increase if necessary
loop {
rtt = Rtt::attach_region(
core.clone(),
&sess,
&ScanRegion::Exact(rtt_addr.ok_or_else(|| anyhow!("RTT control block not available"))?), // todo only do this once?
&ScanRegion::Exact(rtt_addr_result),
);
// todo clean up control flow
if rtt.is_ok() {
log::info!("Successfully attached RTT");
break;
match rtt {
Ok(_) => { break; }
Err(res) => {
num_retries -= 1;
if num_retries == 0 {
log::info!("Max number of retries exceeded. Giving up.");
return Err(anyhow!(res));
}
log::info!("Attaching RTT failed. retrying");
}
}
num_retries -= 1;
if num_retries == 0 {
break;
}
log::info!("Attaching RTT failed. retrying");
}
log::info!("Successfully attached RTT");
let channel = rtt
.unwrap() // using ? instead wouldn't show the user any helpful error message