drv/lpc55-rng: convert to task_slot!

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

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/drv/lpc55-i2c/src/main.rs b/drv/lpc55-i2c/src/main.rs
@@ -22,13 +22,8 @@ use drv_lpc55_syscon_api::{Peripheral, Syscon};
 use lpc55_pac as device;
 use userlib::*;
 
-declare_task!(SYSCON, syscon_driver);
-
-#[cfg(not(feature = "standalone"))]
-const GPIO: Task = Task::gpio_driver;
-
-#[cfg(feature = "standalone")]
-const GPIO: Task = Task::anonymous;
+task_slot!(SYSCON, syscon_driver);
+task_slot!(GPIO, gpio_driver);
 
 #[derive(FromPrimitive)]
 enum Op {
@@ -57,7 +52,7 @@ struct Transmit {
 
 #[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);
@@ -149,7 +144,7 @@ fn muck_with_gpios(syscon: &Syscon) {
     // The existing peripheral API makes doing this via messages
     // maddening so just muck with IOCON manually for now
 
-    let gpio_driver = get_task_id(GPIO);
+    let gpio_driver = GPIO.get_task_id();
     let iocon = Gpio::from(gpio_driver);
 
     iocon

diff --git a/drv/lpc55-rng/src/main.rs b/drv/lpc55-rng/src/main.rs
@@ -29,7 +29,7 @@ use zerocopy::AsBytes;
 
 use lpc55_pac as device;
 
-declare_task!(SYSCON, syscon_driver);
+task_slot!(SYSCON, syscon_driver);
 
 #[repr(u32)]
 enum ResponseCode {
@@ -45,7 +45,7 @@ impl From<ResponseCode> for u32 {
 
 #[export_name = "main"]
 fn main() -> ! {
-    let syscon = get_task_id(SYSCON);
+    let syscon = SYSCON.get_task_id();
     let syscon = Syscon::from(syscon);
 
     syscon.enable_clock(Peripheral::Rng);

diff --git a/gemini-bu-rot/app.toml b/gemini-bu-rot/app.toml
@@ -120,6 +120,9 @@ requires = {flash = 16384, ram = 1024}
 uses = ["rng", "pmc"]
 start = true
 
+[tasks.rng_driver.task-slots]
+syscon_driver = "syscon_driver"
+
 [tasks.spi0_driver]
 path = "../drv/lpc55-spi-server"
 name = "drv-lpc55-spi-server"

diff --git a/lpc55/app.toml b/lpc55/app.toml
@@ -139,6 +139,10 @@ uses = ["flexcomm4"]
 start = true
 stacksize = 1000
 
+[tasks.i2c_driver.task-slots]
+gpio_driver = "gpio_driver"
+syscon_driver = "syscon_driver"
+
 [tasks.rng_driver]
 path = "../drv/lpc55-rng"
 name = "drv-lpc55-rng"
@@ -148,6 +152,9 @@ uses = ["rng", "pmc"]
 start = true
 stacksize = 1000
 
+[tasks.rng_driver.task-slots]
+syscon_driver = "syscon_driver"
+
 [tasks.spi_driver]
 path = "../drv/lpc55-spi-server"
 name = "drv-lpc55-spi-server"