drv/lpc55-spi-server: convert to task_slot!

rumpuslabs · Oct 19, 2021 · b5595c2 · b5595c2
1 parent 8701387
commit b5595c2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/drv/lpc55-spi-server/src/main.rs b/drv/lpc55-spi-server/src/main.rs
@@ -26,8 +26,8 @@ use drv_lpc55_syscon_api::{Peripheral, Syscon};
 use lpc55_pac as device;
 use userlib::*;
 
-declare_task!(SYSCON, syscon_driver);
-declare_task!(GPIO, gpio_driver);
+task_slot!(SYSCON, syscon_driver);
+task_slot!(GPIO, gpio_driver);
 
 #[repr(u32)]
 enum ResponseCode {
@@ -68,7 +68,7 @@ impl From<ResponseCode> for u32 {
 
 #[export_name = "main"]
 fn main() -> ! {
-    let syscon = Syscon::from(get_task_id(SYSCON));
+    let syscon = Syscon::from(SYSCON.get_task_id());
 
     // Turn the actual peripheral on so that we can interact with it.
     turn_on_flexcomm(&syscon);
@@ -267,7 +267,7 @@ fn muck_with_gpios(syscon: &Syscon) {
     syscon.enable_clock(Peripheral::Iocon);
     syscon.leave_reset(Peripheral::Iocon);
 
-    let gpio_driver = get_task_id(GPIO);
+    let gpio_driver = GPIO.get_task_id();
     let iocon = Gpio::from(gpio_driver);
 
     // This is quite the array!

diff --git a/gemini-bu-rot/app.toml b/gemini-bu-rot/app.toml
@@ -134,6 +134,10 @@ start = true
 interrupts = {59 = 1}
 stacksize = 1000
 
+[tasks.spi0_driver.task-slots]
+gpio_driver = "gpio_driver"
+syscon_driver = "syscon_driver"
+
 [tasks.ping]
 path = "../task-ping"
 name = "task-ping"

diff --git a/gimlet-rot/app.toml b/gimlet-rot/app.toml
@@ -97,6 +97,10 @@ start = true
 interrupts = {59 = 1}
 stacksize = 1000
 
+[tasks.spi_driver.task-slots]
+gpio_driver = "gpio_driver"
+syscon_driver = "syscon_driver"
+
 [peripherals.syscon]
 address = 0x40000000
 size = 4096

diff --git a/lpc55/app.toml b/lpc55/app.toml
@@ -165,6 +165,10 @@ start = true
 interrupts = {59 = 1}
 stacksize = 1000
 
+[tasks.spi_driver.task-slots]
+gpio_driver = "gpio_driver"
+syscon_driver = "syscon_driver"
+
 [tasks.ping]
 path = "../task-ping"
 name = "task-ping"