aboutsummaryrefslogtreecommitdiff
path: root/ui/single
diff options
context:
space:
mode:
authorPer Lindgren <per.lindgren@ltu.se>2020-10-23 10:35:56 +0200
committerPer Lindgren <per.lindgren@ltu.se>2020-10-23 23:58:09 +0200
commit1c244a995d54332649c1643aa0a3178f169406e4 (patch)
treeef7676e7439ccf9407fcde998a654d9700f20524 /ui/single
parent86699039e99229049ee3c739eaf860acc70a1bf7 (diff)
move dispatchers to app argument
Diffstat (limited to 'ui/single')
-rw-r--r--ui/single/extern-interrupt-not-enough.stderr2
-rw-r--r--ui/single/extern-interrupt-used.rs2
-rw-r--r--ui/single/extern-interrupt-used.stderr2
-rw-r--r--ui/single/locals-cfg.rs6
4 files changed, 4 insertions, 8 deletions
diff --git a/ui/single/extern-interrupt-not-enough.stderr b/ui/single/extern-interrupt-not-enough.stderr
index 73ce7ad..14f8fe9 100644
--- a/ui/single/extern-interrupt-not-enough.stderr
+++ b/ui/single/extern-interrupt-not-enough.stderr
@@ -1,4 +1,4 @@
-error: not enough `extern` interrupts to dispatch all software tasks (need: 1; given: 0)
+error: not enough interrupts to dispatch all software tasks (need: 1; given: 0)
--> $DIR/extern-interrupt-not-enough.rs:6:8
|
6 | fn a(_: a::Context) {}
diff --git a/ui/single/extern-interrupt-used.rs b/ui/single/extern-interrupt-used.rs
index 89c2378..2ba3168 100644
--- a/ui/single/extern-interrupt-used.rs
+++ b/ui/single/extern-interrupt-used.rs
@@ -1,6 +1,6 @@
#![no_main]
-#[rtic::app(device = lm3s6965)]
+#[rtic::app(device = lm3s6965, dispatchers = [UART0])]
mod app {
#[task(binds = UART0)]
fn a(_: a::Context) {}
diff --git a/ui/single/extern-interrupt-used.stderr b/ui/single/extern-interrupt-used.stderr
index fb0ff5b..b4d8d16 100644
--- a/ui/single/extern-interrupt-used.stderr
+++ b/ui/single/extern-interrupt-used.stderr
@@ -1,4 +1,4 @@
-error: `extern` interrupts can't be used as hardware tasks
+error: dispatcher interrupts can't be used as hardware tasks
--> $DIR/extern-interrupt-used.rs:5:20
|
5 | #[task(binds = UART0)]
diff --git a/ui/single/locals-cfg.rs b/ui/single/locals-cfg.rs
index 45a7a91..3bfdaa1 100644
--- a/ui/single/locals-cfg.rs
+++ b/ui/single/locals-cfg.rs
@@ -1,7 +1,7 @@
#![no_main]
use panic_halt as _;
-#[rtic::app(device = lm3s6965)]
+#[rtic::app(device = lm3s6965, dispatchers = [SSI0])]
mod app {
#[init]
fn init(_: init::Context) -> init::LateResources {
@@ -46,8 +46,4 @@ mod app {
FOO;
}
-
- extern "C" {
- fn UART1();
- }
}