drv/stm32h7-gpio: convert to task_slot!

rumpuslabs · Oct 19, 2021 · c161c66 · c161c66
1 parent a520c8c
commit c161c66
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 2 deletions.
diff --git a/demo-stm32h7/app-h743.toml b/demo-stm32h7/app-h743.toml
@@ -62,6 +62,9 @@ requires = {flash = 8192, ram = 1024}
 uses = ["gpios1", "gpios2", "gpios3"]
 start = true
 
+[tasks.gpio_driver.task-slots]
+rcc_driver = "rcc_driver"
+
 [tasks.usart_driver]
 path = "../drv/stm32h7-usart"
 name = "drv-stm32h7-usart"

diff --git a/demo-stm32h7/app-h7b3.toml b/demo-stm32h7/app-h7b3.toml
@@ -62,6 +62,9 @@ requires = {flash = 8192, ram = 1024}
 uses = ["gpios1", "gpios2", "gpios3"]
 start = true
 
+[tasks.gpio_driver.task-slots]
+rcc_driver = "rcc_driver"
+
 [tasks.usart_driver]
 path = "../drv/stm32h7-usart"
 name = "drv-stm32h7-usart"

diff --git a/drv/stm32h7-gpio/src/main.rs b/drv/stm32h7-gpio/src/main.rs
@@ -137,7 +137,7 @@ impl From<ResponseCode> for u32 {
     }
 }
 
-declare_task!(RCC, rcc_driver);
+task_slot!(RCC, rcc_driver);
 
 #[export_name = "main"]
 fn main() -> ! {
@@ -285,7 +285,7 @@ fn main() -> ! {
 }
 
 fn turn_on_all_gpios() {
-    let rcc_driver = Rcc::from(get_task_id(RCC));
+    let rcc_driver = Rcc::from(RCC.get_task_id());
 
     for port in 0..11 {
         let pnum = Peripheral::GpioA as u32 + port; // see bits in AHB4ENR

diff --git a/gemini-bu/app.toml b/gemini-bu/app.toml
@@ -62,6 +62,9 @@ requires = {flash = 8192, ram = 1024}
 uses = ["gpios1", "gpios2", "gpios3"]
 start = true
 
+[tasks.gpio_driver.task-slots]
+rcc_driver = "rcc_driver"
+
 [tasks.usart_driver]
 path = "../drv/stm32h7-usart"
 name = "drv-stm32h7-usart"

diff --git a/gimlet/app.toml b/gimlet/app.toml
@@ -62,6 +62,9 @@ requires = {flash = 8192, ram = 1024}
 uses = ["gpios1", "gpios2", "gpios3"]
 start = true
 
+[tasks.gpio_driver.task-slots]
+rcc_driver = "rcc_driver"
+
 [tasks.spi4_driver]
 path = "../drv/stm32h7-spi-server"
 name = "drv-stm32h7-spi-server"

diff --git a/gimletlet/app.toml b/gimletlet/app.toml
@@ -62,6 +62,9 @@ requires = {flash = 8192, ram = 1024}
 uses = ["gpios1", "gpios2", "gpios3"]
 start = true
 
+[tasks.gpio_driver.task-slots]
+rcc_driver = "rcc_driver"
+
 [tasks.usart_driver]
 path = "../drv/stm32h7-usart"
 name = "drv-stm32h7-usart"