From a2792182952c953aab2c442bb02ac1f2e4986e67 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sun, 4 Nov 2018 19:57:39 +0100
Subject: use new cortex_m_semihosting::hprintln macro

---
 examples/singleton.rs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'examples/singleton.rs')

diff --git a/examples/singleton.rs b/examples/singleton.rs
index 888a5a6..79815e8 100644
--- a/examples/singleton.rs
+++ b/examples/singleton.rs
@@ -8,20 +8,10 @@
 extern crate panic_semihosting;
 
 use alloc_singleton::stable::pool::{Box, Pool};
-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();
-        }
-    };
-}
-
 #[app(device = lm3s6965)]
 const APP: () = {
     #[Singleton(Send)]
@@ -48,7 +38,7 @@ const APP: () = {
 
     #[task(resources = [P])]
     fn foo(x: Box<M>) {
-        println!("foo({})", x);
+        hprintln!("foo({})", x).unwrap();
 
         resources.P.lock(|p| p.dealloc(x));
 
@@ -57,7 +47,7 @@ const APP: () = {
 
     #[task(priority = 2, resources = [P])]
     fn bar(x: Box<M>) {
-        println!("bar({})", x);
+        hprintln!("bar({})", x).unwrap();
 
         resources.P.dealloc(x);
     }
-- 
cgit v1.2.3