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

rumpuslabs · Oct 19, 2021 · 87528fc · 87528fc
1 parent 1e21045
commit 87528fc
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/demo-stm32h7/app-h743.toml b/demo-stm32h7/app-h743.toml
@@ -112,6 +112,10 @@ start = true
 interrupts = {51 = 1}
 stacksize = 1000
 
+[tasks.spi_driver.task-slots]
+gpio_driver = "gpio_driver"
+rcc_driver = "rcc_driver"
+
 [tasks.user_leds]
 path = "../drv/user-leds"
 name = "drv-user-leds"

diff --git a/drv/stm32h7-spi-server/src/main.rs b/drv/stm32h7-spi-server/src/main.rs
@@ -16,8 +16,8 @@ use drv_stm32h7_gpio_api as gpio_api;
 use drv_stm32h7_rcc_api as rcc_api;
 use drv_stm32h7_spi as spi_core;
 
-declare_task!(RCC, rcc_driver);
-declare_task!(GPIO, gpio_driver);
+task_slot!(RCC, rcc_driver);
+task_slot!(GPIO, gpio_driver);
 
 #[derive(Copy, Clone, PartialEq)]
 enum Trace {
@@ -42,7 +42,7 @@ struct LockState {
 fn main() -> ! {
     check_server_config();
 
-    let rcc_driver = rcc_api::Rcc::from(get_task_id(RCC));
+    let rcc_driver = rcc_api::Rcc::from(RCC.get_task_id());
 
     let registers = unsafe { &*CONFIG.registers };
 
@@ -61,7 +61,7 @@ fn main() -> ! {
         device::spi1::cfg2::SSOM_A::ASSERTED,
     );
 
-    let gpio_driver = gpio_api::Gpio::from(get_task_id(GPIO));
+    let gpio_driver = gpio_api::Gpio::from(GPIO.get_task_id());
 
     // Configure all devices' CS pins to be deasserted (set).
     // We leave them in GPIO output mode from this point forward.

diff --git a/gemini-bu/app.toml b/gemini-bu/app.toml
@@ -134,6 +134,10 @@ start = true
 interrupts = {36 = 1}
 stacksize = 1000
 
+[tasks.spi2_driver.task-slots]
+gpio_driver = "gpio_driver"
+rcc_driver = "rcc_driver"
+
 [tasks.spi4_driver]
 path = "../drv/stm32h7-spi-server"
 name = "drv-stm32h7-spi-server"
@@ -145,6 +149,10 @@ start = true
 interrupts = {84 = 1}
 stacksize = 1000
 
+[tasks.spi4_driver.task-slots]
+gpio_driver = "gpio_driver"
+rcc_driver = "rcc_driver"
+
 [tasks.user_leds]
 path = "../drv/user-leds"
 name = "drv-user-leds"

diff --git a/gimlet/app.toml b/gimlet/app.toml
@@ -76,6 +76,10 @@ start = true
 interrupts = {84 = 1}
 stacksize = 1000
 
+[tasks.spi4_driver.task-slots]
+gpio_driver = "gpio_driver"
+rcc_driver = "rcc_driver"
+
 [tasks.spi2_driver]
 path = "../drv/stm32h7-spi-server"
 name = "drv-stm32h7-spi-server"
@@ -87,6 +91,10 @@ start = true
 interrupts = {36 = 1}
 stacksize = 1000
 
+[tasks.spi2_driver.task-slots]
+gpio_driver = "gpio_driver"
+rcc_driver = "rcc_driver"
+
 [tasks.i2c_driver]
 path = "../drv/stm32h7-i2c-server"
 name = "drv-stm32h7-i2c-server"

diff --git a/gimletlet/app.toml b/gimletlet/app.toml
@@ -132,6 +132,10 @@ start = true
 interrupts = {84 = 1}
 stacksize = 1000
 
+[tasks.spi_driver.task-slots]
+gpio_driver = "gpio_driver"
+rcc_driver = "rcc_driver"
+
 [tasks.user_leds]
 path = "../drv/user-leds"
 name = "drv-user-leds"