drv/lpc55-gpio: convert to task_slot!

rumpuslabs · Oct 19, 2021 · e4bc27f · e4bc27f
1 parent 6d23606
commit e4bc27f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/drv/lpc55-gpio/src/main.rs b/drv/lpc55-gpio/src/main.rs
@@ -43,7 +43,7 @@ use drv_lpc55_syscon_api::*;
 use hl;
 use userlib::{FromPrimitive, *};
 
-declare_task!(SYSCON, syscon_driver);
+task_slot!(SYSCON, syscon_driver);
 
 #[repr(u32)]
 enum ResponseCode {
@@ -181,7 +181,7 @@ fn gpio_port_pin_validate(pin: u32) -> Result<(usize, usize), ResponseCode> {
 }
 
 fn turn_on_gpio_clocks() {
-    let syscon = Syscon::from(get_task_id(SYSCON));
+    let syscon = Syscon::from(SYSCON.get_task_id());
 
     syscon.enable_clock(Peripheral::Iocon);
     syscon.leave_reset(Peripheral::Iocon);

diff --git a/gemini-bu-rot/app.toml b/gemini-bu-rot/app.toml
@@ -92,6 +92,9 @@ requires = {flash = 16384, ram = 1024}
 uses = ["gpio", "iocon"]
 start = true
 
+[tasks.gpio_driver.task-slots]
+syscon_driver = "syscon_driver"
+
 [tasks.user_leds]
 path = "../drv/user-leds"
 name = "drv-user-leds"

diff --git a/gimlet-rot/app.toml b/gimlet-rot/app.toml
@@ -75,6 +75,9 @@ requires = {flash = 16384, ram = 1024}
 uses = ["gpio", "iocon"]
 start = true
 
+[tasks.gpio_driver.task-slots]
+syscon_driver = "syscon_driver"
+
 [tasks.usart_driver]
 path = "../drv/lpc55-usart"
 name = "drv-lpc55-usart"

diff --git a/lpc55/app.toml b/lpc55/app.toml
@@ -108,6 +108,9 @@ uses = ["gpio", "iocon"]
 start = true
 stacksize = 1000
 
+[tasks.gpio_driver.task-slots]
+syscon_driver = "syscon_driver"
+
 [tasks.user_leds]
 path = "../drv/user-leds"
 name = "drv-user-leds"