aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2023-01-14 21:02:10 +0000
committerGravatar GitHub <noreply@github.com> 2023-01-14 21:02:10 +0000
commit86ce8919aec4623a0816b28f1adcd86db33689c8 (patch)
tree9d3c39572c45871adcacd6211220f16433bb191b
parentb1fda94037c83302083a02d3f98760c1677f0813 (diff)
parentde3056eb3dd98f0859949fd32647cc90663f43e2 (diff)
downloadrtic-86ce8919aec4623a0816b28f1adcd86db33689c8.tar.gz
rtic-86ce8919aec4623a0816b28f1adcd86db33689c8.tar.zst
rtic-86ce8919aec4623a0816b28f1adcd86db33689c8.zip
Merge #680
680: Update cortex-m-semihosting requirement from 0.3.3 to 0.5.0 r=AfoHT a=dependabot[bot] Updates the requirements on [cortex-m-semihosting](https://github.com/rust-embedded/cortex-m) to permit the latest version. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/rust-embedded/cortex-m/blob/master/CHANGELOG.md">cortex-m-semihosting's changelog</a>.</em></p> <blockquote> <h2>[v0.5.0] - 2018-05-11</h2> <h3>Added</h3> <ul> <li> <p><code>DebugMonitor</code> and <code>SecureFault</code> variants to the <code>Exception</code> enumeration.</p> </li> <li> <p>An optional <code>&quot;inline-asm&quot;</code> feature</p> </li> </ul> <h3>Changed</h3> <ul> <li> <p>[breaking-change] This crate now requires <code>arm-none-eabi-gcc</code> to be installed and available in <code>$PATH</code> when built with the <code>&quot;inline-asm&quot;</code> feature disabled (which is disabled by default).</p> </li> <li> <p>[breaking-change] The <code>register::{apsr,lr,pc}</code> modules are now behind the <code>&quot;inline-asm&quot;</code> feature.</p> </li> <li> <p>[breaking-change] Some variants of the <code>Exception</code> enumeration are no longer available on <code>thumbv6m-none-eabi</code>. See API docs for details.</p> </li> <li> <p>[breaking-change] Several of the variants of the <code>Exception</code> enumeration have been renamed to match the CMSIS specification.</p> </li> <li> <p>[breaking-change] fixed typo in <code>shcrs</code> field of <code>scb::RegisterBlock</code>; it was previously named <code>shpcrs</code>.</p> </li> <li> <p>[breaking-change] removed several fields from <code>scb::RegisterBlock</code> on ARMv6-M. These registers are not available on that sub-architecture.</p> </li> <li> <p>[breaking-change] changed the type of <code>scb::RegisterBlock.shpr</code> from <code>RW&lt;u8&gt;</code> to <code>RW&lt;u32&gt;</code> on ARMv6-M. These registers are word accessible only on that sub-architecture.</p> </li> <li> <p>[breaking-change] renamed the <code>mmar</code> field of <code>scb::RegisterBlock</code> to <code>mmfar</code> to match the CMSIS name.</p> </li> <li> <p>[breaking-change] removed the <code>iabr</code> field from <code>scb::RegisterBlock</code> on ARMv6-M. This register is not available on that sub-architecture.</p> </li> <li> <p>[breaking-change] removed several fields from <code>cpuid::RegisterBlock</code> on ARMv6-M. These registers are not available on that sub-architecture.</p> </li> <li> <p>[breaking-change] The <code>Mutex.new</code> constructor is not a <code>const fn</code> by default. To make it a <code>const fn</code> you have to opt into the <code>&quot;const-fn&quot;</code> feature, which was added in v0.5.1, and switch to a nightly compiler.</p> </li> </ul> <h3>Removed</h3> <ul> <li>[breaking-change] The <code>exception</code> module has been removed. A replacement for <code>Exception::active</code> can be found in <code>SCB::vect_active</code>. A modified version <code>exception::Exception</code> can be found in the <code>peripheral::scb</code> module.</li> </ul> <h2>[v0.4.3] - 2018-01-25</h2> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/rust-embedded/cortex-m/commit/a448e9156e2cb1e556e5441fd65426952ef4b927"><code>a448e91</code></a> v0.5.0</li> <li><a href="https://github.com/rust-embedded/cortex-m/commit/e3217ad94d6c941796c2d7ee8735e7b250a69387"><code>e3217ad</code></a> Merge <a href="https://github-redirect.dependabot.com/rust-embedded/cortex-m/issues/88">#88</a></li> <li><a href="https://github.com/rust-embedded/cortex-m/commit/05bbc3b815703a0654d2e37966547e392f856161"><code>05bbc3b</code></a> always list all the peripherals in <code>Peripherals</code></li> <li><a href="https://github.com/rust-embedded/cortex-m/commit/550f94902fc1f84241c200b5af02a2cc369a56d1"><code>550f949</code></a> fix build for ARMv7E-M + &quot;inline-asm&quot;</li> <li><a href="https://github.com/rust-embedded/cortex-m/commit/7d51707b5f1b19c148ec4c21decd83abcdf7b2ca"><code>7d51707</code></a> simplify #[cfg]s</li> <li><a href="https://github.com/rust-embedded/cortex-m/commit/2cd6092848cfa35ab64fce7ccf87e52402fc41e6"><code>2cd6092</code></a> ARMv6-M: remove fields that are not available from cpuid::RegisterBlock</li> <li><a href="https://github.com/rust-embedded/cortex-m/commit/17bd0c8e88e1bbd036f940df80e8d047a46025e1"><code>17bd0c8</code></a> fix x86_64 tests</li> <li><a href="https://github.com/rust-embedded/cortex-m/commit/c290aa4ee89951a0ea503b129f6c5bd3d47a663d"><code>c290aa4</code></a> ARMv6-M: remove fields that are not available from NVIC and SCB</li> <li><a href="https://github.com/rust-embedded/cortex-m/commit/716398ce542798aff238abc6a978d3b64a1c0dd4"><code>716398c</code></a> fix build on ARMv6-M</li> <li><a href="https://github.com/rust-embedded/cortex-m/commit/1d6864377202bc64e522deeb5dd044e593d83ebb"><code>1d68643</code></a> fix build on ARMv7E-M</li> <li>Additional commits viewable in <a href="https://github.com/rust-embedded/cortex-m/compare/c-m-sh-v0.3.5...v0.5.0">compare view</a></li> </ul> </details> <br /> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Henrik Tjäder <henrik@tjaders.com>
-rw-r--r--CHANGELOG.md1
-rw-r--r--Cargo.toml2
-rw-r--r--examples/binds.rs12
-rw-r--r--examples/cancel-reschedule.rs8
-rw-r--r--examples/capacity.rs4
-rw-r--r--examples/cfg-whole-task.rs3
-rw-r--r--examples/common.rs6
-rw-r--r--examples/complex.rs53
-rw-r--r--examples/destructure.rs4
-rw-r--r--examples/extern_binds.rs11
-rw-r--r--examples/extern_spawn.rs2
-rw-r--r--examples/generics.rs9
-rw-r--r--examples/hardware.rs12
-rw-r--r--examples/idle-wfi.rs4
-rw-r--r--examples/idle.rs4
-rw-r--r--examples/init.rs2
-rw-r--r--examples/locals.rs6
-rw-r--r--examples/lock-free.rs4
-rw-r--r--examples/lock.rs10
-rw-r--r--examples/message.rs6
-rw-r--r--examples/message_passing.rs2
-rw-r--r--examples/multilock.rs2
-rw-r--r--examples/only-shared-access.rs4
-rw-r--r--examples/periodic-at.rs2
-rw-r--r--examples/periodic-at2.rs4
-rw-r--r--examples/periodic.rs2
-rw-r--r--examples/pool.rs4
-rw-r--r--examples/preempt.rs10
-rw-r--r--examples/ramfunc.rs2
-rw-r--r--examples/resource-user-struct.rs4
-rw-r--r--examples/schedule.rs8
-rw-r--r--examples/shared.rs2
-rw-r--r--examples/spawn.rs4
-rw-r--r--examples/static.rs2
-rw-r--r--examples/task.rs10
35 files changed, 113 insertions, 112 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78a72538..612b8076 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
### Changed
+- Updated dev-dependency cortex-m-semihosting to v0.5
- CI: Updated to setup-python@v4
- CI: Updated to checkout@v3
- Tuned redirect message for rtic.rs/meeting
diff --git a/Cargo.toml b/Cargo.toml
index 2cd3fe1f..4dbc2431 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,7 @@ version_check = "0.9"
[dev-dependencies]
lm3s6965 = "0.1.3"
-cortex-m-semihosting = "0.3.3"
+cortex-m-semihosting = "0.5.0"
systick-monotonic = "1.0.0"
[dev-dependencies.panic-semihosting]
diff --git a/examples/binds.rs b/examples/binds.rs
index 56565cbe..601f245a 100644
--- a/examples/binds.rs
+++ b/examples/binds.rs
@@ -23,21 +23,22 @@ mod app {
fn init(_: init::Context) -> (Shared, Local, init::Monotonics) {
rtic::pend(Interrupt::UART0);
- hprintln!("init").unwrap();
+ hprintln!("init");
(Shared {}, Local {}, init::Monotonics())
}
#[idle]
fn idle(_: idle::Context) -> ! {
- hprintln!("idle").unwrap();
+ hprintln!("idle");
rtic::pend(Interrupt::UART0);
- debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
-
loop {
+ // Exit moved after nop to ensure that rtic::pend gets
+ // to run before exiting
cortex_m::asm::nop();
+ debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
}
@@ -49,7 +50,6 @@ mod app {
"foo called {} time{}",
*cx.local.times,
if *cx.local.times > 1 { "s" } else { "" }
- )
- .unwrap();
+ );
}
}
diff --git a/examples/cancel-reschedule.rs b/examples/cancel-reschedule.rs
index a38a9c4e..7ab437f2 100644
--- a/examples/cancel-reschedule.rs
+++ b/examples/cancel-reschedule.rs
@@ -28,7 +28,7 @@ mod app {
// Initialize the monotonic (SysTick rate in QEMU is 12 MHz)
let mono = Systick::new(systick, 12_000_000);
- hprintln!("init").ok();
+ hprintln!("init");
// Schedule `foo` to run 1 second in the future
foo::spawn_after(1.secs()).unwrap();
@@ -42,7 +42,7 @@ mod app {
#[task]
fn foo(_: foo::Context) {
- hprintln!("foo").ok();
+ hprintln!("foo");
// Schedule `bar` to run 2 seconds in the future (1 second after foo runs)
let spawn_handle = baz::spawn_after(2.secs()).unwrap();
@@ -51,7 +51,7 @@ mod app {
#[task]
fn bar(_: bar::Context, baz_handle: baz::SpawnHandle, do_reschedule: bool) {
- hprintln!("bar").ok();
+ hprintln!("bar");
if do_reschedule {
// Reschedule baz 2 seconds from now, instead of the original 1 second
@@ -67,7 +67,7 @@ mod app {
#[task]
fn baz(_: baz::Context) {
- hprintln!("baz").ok();
+ hprintln!("baz");
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
}
diff --git a/examples/capacity.rs b/examples/capacity.rs
index a6172698..e625249a 100644
--- a/examples/capacity.rs
+++ b/examples/capacity.rs
@@ -37,12 +37,12 @@ mod app {
#[task(capacity = 4)]
fn foo(_: foo::Context, x: u32) {
- hprintln!("foo({})", x).unwrap();
+ hprintln!("foo({})", x);
}
#[task]
fn bar(_: bar::Context) {
- hprintln!("bar").unwrap();
+ hprintln!("bar");
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
diff --git a/examples/cfg-whole-task.rs b/examples/cfg-whole-task.rs
index f41866db..90fb9ccc 100644
--- a/examples/cfg-whole-task.rs
+++ b/examples/cfg-whole-task.rs
@@ -88,7 +88,6 @@ mod app {
"foo has been called {} time{}",
n,
if n == 1 { "" } else { "s" }
- )
- .ok();
+ );
}
}
diff --git a/examples/common.rs b/examples/common.rs
index 1fe671e6..7dcc5421 100644
--- a/examples/common.rs
+++ b/examples/common.rs
@@ -73,7 +73,7 @@ mod app {
// This task is only spawned once in `init`, hence this task will run
// only once
- hprintln!("foo").ok();
+ hprintln!("foo");
}
// Software task, also not bound to a hardware interrupt
@@ -81,7 +81,7 @@ mod app {
// The resources `s1` and `s2` are shared between all other tasks.
#[task(shared = [s1, s2], local = [l2])]
fn bar(_: bar::Context) {
- hprintln!("bar").ok();
+ hprintln!("bar");
// Run `bar` once per second
bar::spawn_after(1.secs()).unwrap();
@@ -97,6 +97,6 @@ mod app {
// Note that RTIC does NOT clear the interrupt flag, this is up to the
// user
- hprintln!("UART0 interrupt!").ok();
+ hprintln!("UART0 interrupt!");
}
}
diff --git a/examples/complex.rs b/examples/complex.rs
index e5cf6dbe..2be71d22 100644
--- a/examples/complex.rs
+++ b/examples/complex.rs
@@ -25,7 +25,7 @@ mod app {
#[init]
fn init(_: init::Context) -> (Shared, Local, init::Monotonics) {
- hprintln!("init").unwrap();
+ hprintln!("init");
(
Shared {
@@ -40,31 +40,31 @@ mod app {
#[idle(shared = [s2, s3])]
fn idle(mut cx: idle::Context) -> ! {
- hprintln!("idle p0 started").ok();
+ hprintln!("idle p0 started");
rtic::pend(Interrupt::GPIOC);
cx.shared.s3.lock(|s| {
- hprintln!("idle enter lock s3 {}", s).ok();
- hprintln!("idle pend t0").ok();
+ hprintln!("idle enter lock s3 {}", s);
+ hprintln!("idle pend t0");
rtic::pend(Interrupt::GPIOA); // t0 p2, with shared ceiling 3
- hprintln!("idle pend t1").ok();
+ hprintln!("idle pend t1");
rtic::pend(Interrupt::GPIOB); // t1 p3, with shared ceiling 3
- hprintln!("idle pend t2").ok();
+ hprintln!("idle pend t2");
rtic::pend(Interrupt::GPIOC); // t2 p4, no sharing
- hprintln!("idle still in lock s3 {}", s).ok();
+ hprintln!("idle still in lock s3 {}", s);
});
- hprintln!("\nback in idle").ok();
+ hprintln!("\nback in idle");
cx.shared.s2.lock(|s| {
- hprintln!("enter lock s2 {}", s).ok();
- hprintln!("idle pend t0").ok();
+ hprintln!("enter lock s2 {}", s);
+ hprintln!("idle pend t0");
rtic::pend(Interrupt::GPIOA); // t0 p2, with shared ceiling 2
- hprintln!("idle pend t1").ok();
+ hprintln!("idle pend t1");
rtic::pend(Interrupt::GPIOB); // t1 p3, no sharing
- hprintln!("idle pend t2").ok();
+ hprintln!("idle pend t2");
rtic::pend(Interrupt::GPIOC); // t2 p4, no sharing
- hprintln!("idle still in lock s2 {}", s).ok();
+ hprintln!("idle still in lock s2 {}", s);
});
- hprintln!("\nidle exit").ok();
+ hprintln!("\nidle exit");
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
@@ -82,9 +82,8 @@ mod app {
"t0 p2 called {} time{}",
*cx.local.times,
if *cx.local.times > 1 { "s" } else { "" }
- )
- .ok();
- hprintln!("t0 p2 exit").ok();
+ );
+ hprintln!("t0 p2 exit");
}
#[task(binds = GPIOB, priority = 3, local = [times: u32 = 0], shared = [s3, s4])]
@@ -96,19 +95,18 @@ mod app {
"t1 p3 called {} time{}",
*cx.local.times,
if *cx.local.times > 1 { "s" } else { "" }
- )
- .ok();
+ );
cx.shared.s4.lock(|s| {
- hprintln!("t1 enter lock s4 {}", s).ok();
- hprintln!("t1 pend t0").ok();
+ hprintln!("t1 enter lock s4 {}", s);
+ hprintln!("t1 pend t0");
rtic::pend(Interrupt::GPIOA); // t0 p2, with shared ceiling 2
- hprintln!("t1 pend t2").ok();
+ hprintln!("t1 pend t2");
rtic::pend(Interrupt::GPIOC); // t2 p4, no sharing
- hprintln!("t1 still in lock s4 {}", s).ok();
+ hprintln!("t1 still in lock s4 {}", s);
});
- hprintln!("t1 p3 exit").ok();
+ hprintln!("t1 p3 exit");
}
#[task(binds = GPIOC, priority = 4, local = [times: u32 = 0], shared = [s4])]
@@ -120,13 +118,12 @@ mod app {
"t2 p4 called {} time{}",
*cx.local.times,
if *cx.local.times > 1 { "s" } else { "" }
- )
- .unwrap();
+ );
cx.shared.s4.lock(|s| {
- hprintln!("enter lock s4 {}", s).ok();
+ hprintln!("enter lock s4 {}", s);
*s += 1;
});
- hprintln!("t3 p4 exit").ok();
+ hprintln!("t3 p4 exit");
}
}
diff --git a/examples/destructure.rs b/examples/destructure.rs
index 6019c225..fd577a6c 100644
--- a/examples/destructure.rs
+++ b/examples/destructure.rs
@@ -42,7 +42,7 @@ mod app {
let b = cx.shared.b;
let c = cx.shared.c;
- hprintln!("foo: a = {}, b = {}, c = {}", a, b, c).unwrap();
+ hprintln!("foo: a = {}, b = {}, c = {}", a, b, c);
}
// De-structure-ing syntax
@@ -50,6 +50,6 @@ mod app {
fn bar(cx: bar::Context) {
let bar::SharedResources { a, b, c } = cx.shared;
- hprintln!("bar: a = {}, b = {}, c = {}", a, b, c).unwrap();
+ hprintln!("bar: a = {}, b = {}, c = {}", a, b, c);
}
}
diff --git a/examples/extern_binds.rs b/examples/extern_binds.rs
index 4dc6633c..c2186cb7 100644
--- a/examples/extern_binds.rs
+++ b/examples/extern_binds.rs
@@ -10,7 +10,7 @@ use panic_semihosting as _;
// Free function implementing the interrupt bound task `foo`.
fn foo(_: app::foo::Context) {
- hprintln!("foo called").ok();
+ hprintln!("foo called");
}
#[rtic::app(device = lm3s6965)]
@@ -29,21 +29,22 @@ mod app {
fn init(_: init::Context) -> (Shared, Local, init::Monotonics) {
rtic::pend(Interrupt::UART0);
- hprintln!("init").unwrap();
+ hprintln!("init");
(Shared {}, Local {}, init::Monotonics())
}
#[idle]
fn idle(_: idle::Context) -> ! {
- hprintln!("idle").unwrap();
+ hprintln!("idle");
rtic::pend(Interrupt::UART0);
- debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
-
loop {
cortex_m::asm::nop();
+ // Exit moved after nop to ensure that rtic::pend gets
+ // to run before exiting
+ debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
}
diff --git a/examples/extern_spawn.rs b/examples/extern_spawn.rs
index 7f9b5a5f..2eec2dbc 100644
--- a/examples/extern_spawn.rs
+++ b/examples/extern_spawn.rs
@@ -10,7 +10,7 @@ use panic_semihosting as _;
// Free function implementing the spawnable task `foo`.
fn foo(_c: app::foo::Context, x: i32, y: u32) {
- hprintln!("foo {}, {}", x, y).unwrap();
+ hprintln!("foo {}, {}", x, y);
if x == 2 {
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
diff --git a/examples/generics.rs b/examples/generics.rs
index 72b861ba..6243d562 100644
--- a/examples/generics.rs
+++ b/examples/generics.rs
@@ -32,19 +32,22 @@ mod app {
#[task(binds = UART0, shared = [shared], local = [state: u32 = 0])]
fn uart0(c: uart0::Context) {
- hprintln!("UART0(STATE = {})", *c.local.state).unwrap();
+ hprintln!("UART0(STATE = {})", *c.local.state);
// second argument has type `shared::shared`
super::advance(c.local.state, c.shared.shared);
rtic::pend(Interrupt::UART1);
+ // Exit moved after nop to ensure that rtic::pend gets
+ // to run before exiting
+ cortex_m::asm::nop();
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
#[task(binds = UART1, priority = 2, shared = [shared], local = [state: u32 = 0])]
fn uart1(c: uart1::Context) {
- hprintln!("UART1(STATE = {})", *c.local.state).unwrap();
+ hprintln!("UART1(STATE = {})", *c.local.state);
// second argument has type `shared::shared`
super::advance(c.local.state, c.shared.shared);
@@ -61,5 +64,5 @@ fn advance(state: &mut u32, mut shared: impl Mutex<T = u32>) {
(old, *shared)
});
- hprintln!("shared: {} -> {}", old, new).unwrap();
+ hprintln!("shared: {} -> {}", old, new);
}
diff --git a/examples/hardware.rs b/examples/hardware.rs
index 60632247..590bf6ab 100644
--- a/examples/hardware.rs
+++ b/examples/hardware.rs
@@ -24,7 +24,7 @@ mod app {
// `init` returns because interrupts are disabled
rtic::pend(Interrupt::UART0); // equivalent to NVIC::pend
- hprintln!("init").unwrap();
+ hprintln!("init");
(Shared {}, Local {}, init::Monotonics())
}
@@ -33,14 +33,15 @@ mod app {
fn idle(_: idle::Context) -> ! {
// interrupts are enabled again; the `UART0` handler runs at this point
- hprintln!("idle").unwrap();
+ hprintln!("idle");
rtic::pend(Interrupt::UART0);
- debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
-
loop {
+ // Exit moved after nop to ensure that rtic::pend gets
+ // to run before exiting
cortex_m::asm::nop();
+ debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
}
@@ -53,7 +54,6 @@ mod app {
"UART0 called {} time{}",
*cx.local.times,
if *cx.local.times > 1 { "s" } else { "" }
- )
- .unwrap();
+ );
}
}
diff --git a/examples/idle-wfi.rs b/examples/idle-wfi.rs
index 4a8a8dee..42fd7b49 100644
--- a/examples/idle-wfi.rs
+++ b/examples/idle-wfi.rs
@@ -19,7 +19,7 @@ mod app {
#[init]
fn init(mut cx: init::Context) -> (Shared, Local, init::Monotonics) {
- hprintln!("init").unwrap();
+ hprintln!("init");
// Set the ARM SLEEPONEXIT bit to go to sleep after handling interrupts
// See https://developer.arm.com/docs/100737/0100/power-management/sleep-mode/sleep-on-exit-bit
@@ -33,7 +33,7 @@ mod app {
// Locals in idle have lifetime 'static
let _x: &'static mut u32 = cx.local.x;
- hprintln!("idle").unwrap();
+ hprintln!("idle");
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
diff --git a/examples/idle.rs b/examples/idle.rs
index 55d6b153..ad04fd68 100644
--- a/examples/idle.rs
+++ b/examples/idle.rs
@@ -19,7 +19,7 @@ mod app {
#[init]
fn init(_: init::Context) -> (Shared, Local, init::Monotonics) {
- hprintln!("init").unwrap();
+ hprintln!("init");
(Shared {}, Local {}, init::Monotonics())
}
@@ -29,7 +29,7 @@ mod app {
// Locals in idle have lifetime 'static
let _x: &'static mut u32 = cx.local.x;
- hprintln!("idle").unwrap();
+ hprintln!("idle");
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
diff --git a/examples/init.rs b/examples/init.rs
index b8a5bc5b..7a101496 100644
--- a/examples/init.rs
+++ b/examples/init.rs
@@ -32,7 +32,7 @@ mod app {
// to indicate that this is a critical seciton
let _cs_token: bare_metal::CriticalSection = cx.cs;
- hprintln!("init").unwrap();
+ hprintln!("init");
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
diff --git a/examples/locals.rs b/examples/locals.rs
index aa5d0fee..18897753 100644
--- a/examples/locals.rs
+++ b/examples/locals.rs
@@ -45,7 +45,7 @@ mod app {
let local_to_idle = cx.local.local_to_idle;
*local_to_idle += 1;
- hprintln!("idle: local_to_idle = {}", local_to_idle).unwrap();
+ hprintln!("idle: local_to_idle = {}", local_to_idle);
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
@@ -69,7 +69,7 @@ mod app {
// error: no `local_to_bar` field in `foo::LocalResources`
// cx.local.local_to_bar += 1;
- hprintln!("foo: local_to_foo = {}", local_to_foo).unwrap();
+ hprintln!("foo: local_to_foo = {}", local_to_foo);
}
// `local_to_bar` can only be accessed from this context
@@ -81,6 +81,6 @@ mod app {
// error: no `local_to_foo` field in `bar::LocalResources`
// cx.local.local_to_foo += 1;
- hprintln!("bar: local_to_bar = {}", local_to_bar).unwrap();
+ hprintln!("bar: local_to_bar = {}", local_to_bar);
}
}
diff --git a/examples/lock-free.rs b/examples/lock-free.rs
index ea6ff1bf..32853e44 100644
--- a/examples/lock-free.rs
+++ b/examples/lock-free.rs
@@ -33,7 +33,7 @@ mod app {
*c.shared.counter += 1; // <- no lock API required
let counter = *c.shared.counter;
- hprintln!(" foo = {}", counter).unwrap();
+ hprintln!(" foo = {}", counter);
}
#[task(shared = [counter])] // <- same priority
@@ -42,7 +42,7 @@ mod app {
*c.shared.counter += 1; // <- no lock API required
let counter = *c.shared.counter;
- hprintln!(" bar = {}", counter).unwrap();
+ hprintln!(" bar = {}", counter);
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
diff --git a/examples/lock.rs b/examples/lock.rs
index f1a16968..16f3b338 100644
--- a/examples/lock.rs
+++ b/examples/lock.rs
@@ -29,7 +29,7 @@ mod app {
// when omitted priority is assumed to be `1`
#[task(shared = [shared])]
fn foo(mut c: foo::Context) {
- hprintln!("A").unwrap();
+ hprintln!("A");
// the lower priority task requires a critical section to access the data
c.shared.shared.lock(|shared| {
@@ -39,7 +39,7 @@ mod app {
// bar will *not* run right now due to the critical section
bar::spawn().unwrap();
- hprintln!("B - shared = {}", *shared).unwrap();
+ hprintln!("B - shared = {}", *shared);
// baz does not contend for `shared` so it's allowed to run now
baz::spawn().unwrap();
@@ -47,7 +47,7 @@ mod app {
// critical section is over: bar can now start
- hprintln!("E").unwrap();
+ hprintln!("E");
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
@@ -61,11 +61,11 @@ mod app {
*shared
});
- hprintln!("D - shared = {}", shared).unwrap();
+ hprintln!("D - shared = {}", shared);
}
#[task(priority = 3)]
fn baz(_: baz::Context) {
- hprintln!("C").unwrap();
+ hprintln!("C");
}
}
diff --git a/examples/message.rs b/examples/message.rs
index 76c5675a..a5c89199 100644
--- a/examples/message.rs
+++ b/examples/message.rs
@@ -26,7 +26,7 @@ mod app {
#[task(local = [count: u32 = 0])]
fn foo(cx: foo::Context) {
- hprintln!("foo").unwrap();
+ hprintln!("foo");
bar::spawn(*cx.local.count).unwrap();
*cx.local.count += 1;
@@ -34,14 +34,14 @@ mod app {
#[task]
fn bar(_: bar::Context, x: u32) {
- hprintln!("bar({})", x).unwrap();
+ hprintln!("bar({})", x);
baz::spawn(x + 1, x + 2).unwrap();
}
#[task]
fn baz(_: baz::Context, x: u32, y: u32) {
- hprintln!("baz({}, {})", x, y).unwrap();
+ hprintln!("baz({}, {})", x, y);
if x + y > 4 {
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
diff --git a/examples/message_passing.rs b/examples/message_passing.rs
index ffa95371..13e3b98d 100644
--- a/examples/message_passing.rs
+++ b/examples/message_passing.rs
@@ -29,7 +29,7 @@ mod app {
#[task(capacity = 3)]
fn foo(_c: foo::Context, x: i32, y: u32) {
- hprintln!("foo {}, {}", x, y).unwrap();
+ hprintln!("foo {}, {}", x, y);
if x == 2 {
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
diff --git a/examples/multilock.rs b/examples/multilock.rs
index d99bae69..83df8d7d 100644
--- a/examples/multilock.rs
+++ b/examples/multilock.rs
@@ -48,7 +48,7 @@ mod app {
*s2 += 1;
*s3 += 1;
- hprintln!("Multiple locks, s1: {}, s2: {}, s3: {}", *s1, *s2, *s3).unwrap();
+ hprintln!("Multiple locks, s1: {}, s2: {}, s3: {}", *s1, *s2, *s3);
});
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
diff --git a/examples/only-shared-access.rs b/examples/only-shared-access.rs
index 8b0a77ef..c9826d09 100644
--- a/examples/only-shared-access.rs
+++ b/examples/only-shared-access.rs
@@ -30,13 +30,13 @@ mod app {
#[task(shared = [&key])]
fn foo(cx: foo::Context) {
let key: &u32 = cx.shared.key;
- hprintln!("foo(key = {:#x})", key).unwrap();
+ hprintln!("foo(key = {:#x})", key);
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
#[task(priority = 2, shared = [&key])]
fn bar(cx: bar::Context) {
- hprintln!("bar(key = {:#x})", cx.shared.key).unwrap();
+ hprintln!("bar(key = {:#x})", cx.shared.key);
}
}
diff --git a/examples/periodic-at.rs b/examples/periodic-at.rs
index f9fd995f..11162102 100644
--- a/examples/periodic-at.rs
+++ b/examples/periodic-at.rs
@@ -35,7 +35,7 @@ mod app {
#[task(local = [cnt: u32 = 0])]
fn foo(cx: foo::Context, instant: fugit::TimerInstantU64<100>) {
- hprintln!("foo {:?}", instant).ok();
+ hprintln!("foo {:?}", instant);
*cx.local.cnt += 1;
if *cx.local.cnt == 4 {
diff --git a/examples/periodic-at2.rs b/examples/periodic-at2.rs
index 879f709c..35ebb52f 100644
--- a/examples/periodic-at2.rs
+++ b/examples/periodic-at2.rs
@@ -36,7 +36,7 @@ mod app {
// Using the explicit type of the timer implementation
#[task(local = [cnt: u32 = 0])]
fn foo(cx: foo::Context, instant: fugit::TimerInstantU64<100>) {
- hprintln!("foo {:?}", instant).ok();
+ hprintln!("foo {:?}", instant);
*cx.local.cnt += 1;
if *cx.local.cnt == 4 {
@@ -52,7 +52,7 @@ mod app {
// This remains agnostic to the timer implementation
#[task(local = [cnt: u32 = 0])]
fn bar(_cx: bar::Context, instant: <MyMono as rtic_monotonic::Monotonic>::Instant) {
- hprintln!("bar {:?}", instant).ok();
+ hprintln!("bar {:?}", instant);
// Spawn a new message with 1s offset to spawned time
let next_instant = instant + 1.secs();
diff --git a/examples/periodic.rs b/examples/periodic.rs
index 40c69257..5d66735c 100644
--- a/examples/periodic.rs
+++ b/examples/periodic.rs
@@ -35,7 +35,7 @@ mod app {
#[task(local = [cnt: u32 = 0])]
fn foo(cx: foo::Context) {
- hprintln!("foo").ok();
+ hprintln!("foo");
*cx.local.cnt += 1;
if *cx.local.cnt == 4 {
diff --git a/examples/pool.rs b/examples/pool.rs
index d59bd916..5014e216 100644
--- a/examples/pool.rs
+++ b/examples/pool.rs
@@ -56,7 +56,7 @@ mod app {
#[task]
fn foo(_: foo::Context, x: Box<P>) {
- hprintln!("foo({:?})", x.as_ptr()).unwrap();
+ hprintln!("foo({:?})", x.as_ptr());
// explicitly return the block to the pool
drop(x);
@@ -66,7 +66,7 @@ mod app {
#[task(priority = 2)]
fn bar(_: bar::Context, x: Box<P>) {
- hprintln!("bar({:?})", x.as_ptr()).unwrap();
+ hprintln!("bar({:?})", x.as_ptr());
// this is done automatically so we can omit the call to `drop`
// drop(x);
diff --git a/examples/preempt.rs b/examples/preempt.rs
index d0c8cc7d..3c7f2429 100644
--- a/examples/preempt.rs
+++ b/examples/preempt.rs
@@ -25,21 +25,21 @@ mod app {
#[task(priority = 1)]
fn foo(_: foo::Context) {
- hprintln!("foo - start").unwrap();
+ hprintln!("foo - start");
baz::spawn().unwrap();
- hprintln!("foo - end").unwrap();
+ hprintln!("foo - end");
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
#[task(priority = 2)]
fn bar(_: bar::Context) {
- hprintln!(" bar").unwrap();
+ hprintln!(" bar");
}
#[task(priority = 2)]
fn baz(_: baz::Context) {
- hprintln!(" baz - start").unwrap();
+ hprintln!(" baz - start");
bar::spawn().unwrap();
- hprintln!(" baz - end").unwrap();
+ hprintln!(" baz - end");
}
}
diff --git a/examples/ramfunc.rs b/examples/ramfunc.rs
index b3b8012c..049af18f 100644
--- a/examples/ramfunc.rs
+++ b/examples/ramfunc.rs
@@ -33,7 +33,7 @@ mod app {
#[inline(never)]
#[task]
fn foo(_: foo::Context) {
- hprintln!("foo").unwrap();
+ hprintln!("foo");
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
diff --git a/examples/resource-user-struct.rs b/examples/resource-user-struct.rs
index ae1918d0..39a5b16c 100644
--- a/examples/resource-user-struct.rs
+++ b/examples/resource-user-struct.rs
@@ -55,7 +55,7 @@ mod app {
*shared
});
- hprintln!("UART0: shared = {}", shared).unwrap();
+ hprintln!("UART0: shared = {}", shared);
}
// `shared` can be accessed from this context
@@ -66,6 +66,6 @@ mod app {
*shared
});
- hprintln!("UART1: shared = {}", shared).unwrap();
+ hprintln!("UART1: shared = {}", shared);
}
}
diff --git a/examples/schedule.rs b/examples/schedule.rs
index 5bad5a30..58e73dad 100644
--- a/examples/schedule.rs
+++ b/examples/schedule.rs
@@ -28,7 +28,7 @@ mod app {
// Initialize the monotonic (SysTick rate in QEMU is 12 MHz)
let mono = Systick::new(systick, 12_000_000);
- hprintln!("init").ok();
+ hprintln!("init");
// Schedule `foo` to run 1 second in the future
foo::spawn_after(1.secs()).unwrap();
@@ -42,7 +42,7 @@ mod app {
#[task]
fn foo(_: foo::Context) {
- hprintln!("foo").ok();
+ hprintln!("foo");
// Schedule `bar` to run 2 seconds in the future (1 second after foo runs)
bar::spawn_after(1.secs()).unwrap();
@@ -50,7 +50,7 @@ mod app {
#[task]
fn bar(_: bar::Context) {
- hprintln!("bar").ok();
+ hprintln!("bar");
// Schedule `baz` to run 1 seconds from now, but with a specific time instant.
baz::spawn_at(monotonics::now() + 1.secs()).unwrap();
@@ -58,7 +58,7 @@ mod app {
#[task]
fn baz(_: baz::Context) {
- hprintln!("baz").ok();
+ hprintln!("baz");
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
}
diff --git a/examples/shared.rs b/examples/shared.rs
index d87dca52..58d64e41 100644
--- a/examples/shared.rs
+++ b/examples/shared.rs
@@ -34,7 +34,7 @@ mod app {
fn idle(mut c: idle::Context) -> ! {
loop {
if let Some(byte) = c.shared.c.lock(|c| c.dequeue()) {
- hprintln!("received message: {}", byte).unwrap();
+ hprintln!("received message: {}", byte);
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
} else {
diff --git a/examples/spawn.rs b/examples/spawn.rs
index 2db1ab8a..75b7f85f 100644
--- a/examples/spawn.rs
+++ b/examples/spawn.rs
@@ -19,7 +19,7 @@ mod app {
#[init]
fn init(_: init::Context) -> (Shared, Local, init::Monotonics) {
- hprintln!("init").unwrap();
+ hprintln!("init");
foo::spawn().unwrap();
(Shared {}, Local {}, init::Monotonics())
@@ -27,7 +27,7 @@ mod app {
#[task]
fn foo(_: foo::Context) {
- hprintln!("foo").unwrap();
+ hprintln!("foo");
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
diff --git a/examples/static.rs b/examples/static.rs
index c9aa6046..abeb9c52 100644
--- a/examples/static.rs
+++ b/examples/static.rs
@@ -37,7 +37,7 @@ mod app {
loop {
// Lock-free access to the same underlying queue!
if let Some(data) = c.local.c.dequeue() {
- hprintln!("received message: {}", data).unwrap();
+ hprintln!("received message: {}", data);
// Run foo until data
if data == 3 {
diff --git a/examples/task.rs b/examples/task.rs
index 2c53aa23..d24fca62 100644
--- a/examples/task.rs
+++ b/examples/task.rs
@@ -26,31 +26,31 @@ mod app {
#[task]
fn foo(_: foo::Context) {
- hprintln!("foo - start").unwrap();
+ hprintln!("foo - start");
// spawns `bar` onto the task scheduler
// `foo` and `bar` have the same priority so `bar` will not run until
// after `foo` terminates
bar::spawn().unwrap();
- hprintln!("foo - middle").unwrap();
+ hprintln!("foo - middle");
// spawns `baz` onto the task scheduler
// `baz` has higher priority than `foo` so it immediately preempts `foo`
baz::spawn().unwrap();
- hprintln!("foo - end").unwrap();
+ hprintln!("foo - end");
}
#[task]
fn bar(_: bar::Context) {
- hprintln!("bar").unwrap();
+ hprintln!("bar");
debug::exit(debug::EXIT_SUCCESS); // Exit QEMU simulator
}
#[task(priority = 2)]
fn baz(_: baz::Context) {
- hprintln!("baz").unwrap();
+ hprintln!("baz");
}
}