aboutsummaryrefslogtreecommitdiff
path: root/examples/baseline.rs
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-11-04 18:58:45 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-11-04 18:58:45 +0000
commit8a27efeaeb5483dc12370add4b3786bdd20a4973 (patch)
tree00e10c34cc22f80aee45c51d945e31c237c74eeb /examples/baseline.rs
parent16d473a9b6827aa7ffa9ce92e4e532eff9a091d2 (diff)
parenta2792182952c953aab2c442bb02ac1f2e4986e67 (diff)
Merge #99
99: impl Mutex on all shared resources r=japaric a=japaric document how to write generic code that operates on resources Co-authored-by: Jorge Aparicio <jorge@japaric.io>
Diffstat (limited to 'examples/baseline.rs')
-rw-r--r--examples/baseline.rs18
1 files changed, 4 insertions, 14 deletions
diff --git a/examples/baseline.rs b/examples/baseline.rs
index 73ef4c9..fdf3683 100644
--- a/examples/baseline.rs
+++ b/examples/baseline.rs
@@ -7,26 +7,16 @@
extern crate panic_semihosting;
-use cortex_m_semihosting::debug;
+use cortex_m_semihosting::{debug, hprintln};
use lm3s6965::Interrupt;
use rtfm::app;
-macro_rules! println {
- ($($tt:tt)*) => {
- if let Ok(mut stdout) = cortex_m_semihosting::hio::hstdout() {
- use core::fmt::Write;
-
- writeln!(stdout, $($tt)*).ok();
- }
- };
-}
-
// NOTE: does NOT properly work on QEMU
#[app(device = lm3s6965)]
const APP: () = {
#[init(spawn = [foo])]
fn init() {
- println!("init(baseline = {:?})", start);
+ hprintln!("init(baseline = {:?})", start).unwrap();
// `foo` inherits the baseline of `init`: `Instant(0)`
spawn.foo().unwrap();
@@ -36,7 +26,7 @@ const APP: () = {
fn foo() {
static mut ONCE: bool = true;
- println!("foo(baseline = {:?})", scheduled);
+ hprintln!("foo(baseline = {:?})", scheduled).unwrap();
if *ONCE {
*ONCE = false;
@@ -49,7 +39,7 @@ const APP: () = {
#[interrupt(spawn = [foo])]
fn UART0() {
- println!("UART0(baseline = {:?})", start);
+ hprintln!("UART0(baseline = {:?})", start).unwrap();
// `foo` inherits the baseline of `UART0`: its `start` time
spawn.foo().unwrap();