adapt to changes in cortex-m-srp

Author: Jorge Aparicio

.gdbinit

@@ -4,5 +4,6 @@ monitor arm semihosting enable
 # monitor tpiu config internal itm.fifo uart off 8000000
 # monitor itm port 0 on
 load
-tbreak start
+tbreak cortex_m_rt::reset_handler
+monitor reset halt
 continue

Cargo.toml

@@ -4,9 +4,9 @@ name = "cortex-m-quickstart"
 version = "0.0.0"
 
 [dependencies]
-cortex-m = "0.2.1"
+cortex-m = "0.2.2"
 cortex-m-rt = { git = "https://github.com/japaric/cortex-m-rt" }
-cortex-m-srp = { git = "https://github.com/japaric/cortex-m-srp" }
+cortex-m-srp = { git = "https://github.com/japaric/cortex-m-srp", branch = "next" }
 {{name}} = "*"
 
 [features]

examples/blinky.rs

@@ -1,23 +1,21 @@
 //! Prints "Hello, world!" on the OpenOCD console using semihosting
 
+#![feature(used)]
 #![no_std]
 
 #[macro_use]
 extern crate cortex_m;
 extern crate cortex_m_rt;
 extern crate {{name}};
 
-use cortex_m::exception;
 use {{name}}::interrupt;
 
 fn main() {
     hprintln!("Hello, world!");
 }
 
-#[no_mangle]
-pub static _INTERRUPTS: interrupt::Handlers =
+#[allow(dead_code)]
+#[used]
+#[link_section = ".rodata.interrupts"]
+static INTERRUPTS: interrupt::Handlers =
     interrupt::Handlers { ..interrupt::DEFAULT_HANDLERS };
-
-#[no_mangle]
-pub static _EXCEPTIONS: exception::Handlers =
-    exception::Handlers { ..exception::DEFAULT_HANDLERS };

examples/hello.rs

@@ -5,28 +5,29 @@
 //!
 //! [`itmdump`]: https://docs.rs/itm/0.1.1/itm/
 
+#![feature(used)]
 #![no_std]
 
 #[macro_use]
 extern crate cortex_m;
 extern crate cortex_m_rt;
 extern crate {{name}};
 
-use cortex_m::{exception, peripheral};
+use cortex_m::peripheral;
 use {{name}}::interrupt;
 
 fn main() {
-    cortex_m::interrupt::free(|cs| {
-                                  let itm = peripheral::ITM.borrow(&cs);
+    cortex_m::interrupt::free(
+        |cs| {
+            let itm = peripheral::ITM.borrow(&cs);
 
-                                  iprintln!(&itm.stim[0], "Hello, world!");
-                              });
+            iprintln!(&itm.stim[0], "Hello, world!");
+        },
+    );
 }
 
-#[no_mangle]
-pub static _INTERRUPTS: interrupt::Handlers =
+#[allow(dead_code)]
+#[used]
+#[link_section = ".rodata.interrupts"]
+static INTERRUPTS: interrupt::Handlers =
     interrupt::Handlers { ..interrupt::DEFAULT_HANDLERS };
-
-#[no_mangle]
-pub static _EXCEPTIONS: exception::Handlers =
-    exception::Handlers { ..exception::DEFAULT_HANDLERS };

examples/itm.rs

@@ -1,20 +1,17 @@
 //! Minimal application
 
+#![feature(used)]
 #![no_std]
 
-extern crate cortex_m;
 extern crate cortex_m_rt;
 extern crate {{name}};
 
-use cortex_m::exception;
 use {{name}}::interrupt;
 
 fn main() {}
 
-#[no_mangle]
-pub static _INTERRUPTS: interrupt::Handlers =
+#[allow(dead_code)]
+#[used]
+#[link_section = ".rodata.interrupts"]
+static INTERRUPTS: interrupt::Handlers =
     interrupt::Handlers { ..interrupt::DEFAULT_HANDLERS };
-
-#[no_mangle]
-pub static _EXCEPTIONS: exception::Handlers =
-    exception::Handlers { ..exception::DEFAULT_HANDLERS };

examples/minimal.rs

@@ -0,0 +1,57 @@
+#![feature(const_fn)]
+#![feature(used)]
+#![no_std]
+
+#[macro_use]
+extern crate cortex_m;
+extern crate cortex_m_rt;
+#[macro_use]
+extern crate cortex_m_srp as rtfm;
+extern crate {{name}};
+
+use rtfm::{C2, C4, C16, P0, P1, P3, Resource};
+use {{name}}::interrupt::{Exti0Irq, Exti1Irq};
+
+static R1: Resource<(), C4> = Resource::new(());
+static R2: Resource<(), C2> = Resource::new(());
+
+fn init(_ceil: C16) {}
+
+fn idle(_prio: P0) {
+    hprintln!("IDLE");
+
+    rtfm::request(j1);
+}
+
+tasks!({{name}}, {
+    j1: (Exti0Irq, P1),
+    j2: (Exti1Irq, P3),
+});
+
+fn j1(_task: Exti0Irq, prio: P1) {
+    hprintln!("J1: enter");
+    R2.lock(
+        &prio, |_, _| {
+            rtfm::request(j2);
+            hprintln!("J1: after requesting J2");
+            R1.lock(
+                &prio, |_, _| {
+                    hprintln!("J1(R1): before requesting J2");
+                    rtfm::request(j2);
+                    hprintln!("J1(R1): after requesting J2");
+                }
+            );
+        }
+    );
+    hprintln!("J1: exit");
+}
+
+fn j2(_task: Exti1Irq, prio: P3) {
+    hprintln!("J2: enter");
+    R1.lock(
+        &prio, |_, _| {
+            hprintln!("J2(R1)");
+        }
+    );
+    hprintln!("J2: exit");
+}