From 9195038c87703fc94b6e99f6de593886d51c2b19 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Wed, 10 Jul 2019 22:42:44 +0200
Subject: implement RFC #212

---
 heterogeneous/examples/x-init-2.rs | 16 ++++++++--------
 heterogeneous/examples/x-init.rs   | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'heterogeneous/examples')

diff --git a/heterogeneous/examples/x-init-2.rs b/heterogeneous/examples/x-init-2.rs
index b9c3919..033753c 100644
--- a/heterogeneous/examples/x-init-2.rs
+++ b/heterogeneous/examples/x-init-2.rs
@@ -9,30 +9,30 @@ use panic_halt as _;
 
 #[rtfm::app(cores = 2, device = heterogeneous)]
 const APP: () = {
-    extern "C" {
+    struct Resources {
         // owned by core #1 but initialized by core #0
-        static mut X: u32;
+        x: u32,
 
         // owned by core #0 but initialized by core #1
-        static mut Y: u32;
+        y: u32,
     }
 
-    #[init(core = 0, late = [X])]
+    #[init(core = 0, late = [x])]
     fn a(_: a::Context) -> a::LateResources {
-        a::LateResources { X: 0 }
+        a::LateResources { x: 0 }
     }
 
-    #[idle(core = 0, resources = [Y])]
+    #[idle(core = 0, resources = [y])]
     fn b(_: b::Context) -> ! {
         loop {}
     }
 
     #[init(core = 1)]
     fn c(_: c::Context) -> c::LateResources {
-        c::LateResources { Y: 0 }
+        c::LateResources { y: 0 }
     }
 
-    #[idle(core = 1, resources = [X])]
+    #[idle(core = 1, resources = [x])]
     fn d(_: d::Context) -> ! {
         loop {}
     }
diff --git a/heterogeneous/examples/x-init.rs b/heterogeneous/examples/x-init.rs
index 53e7380..4183713 100644
--- a/heterogeneous/examples/x-init.rs
+++ b/heterogeneous/examples/x-init.rs
@@ -9,18 +9,18 @@ use panic_halt as _;
 
 #[rtfm::app(cores = 2, device = heterogeneous)]
 const APP: () = {
-    extern "C" {
-        static mut X: u32;
-        static mut Y: u32;
+    struct Resources {
+        x: u32,
+        y: u32,
     }
 
-    #[init(core = 0, late = [X])]
+    #[init(core = 0, late = [x])]
     fn a(_: a::Context) -> a::LateResources {
-        a::LateResources { X: 0 }
+        a::LateResources { x: 0 }
     }
 
     #[init(core = 1)]
     fn b(_: b::Context) -> b::LateResources {
-        b::LateResources { Y: 0 }
+        b::LateResources { y: 0 }
     }
 };
-- 
cgit v1.2.3