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

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

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/demo-stm32h7/app-h743.toml b/demo-stm32h7/app-h743.toml
@@ -88,6 +88,10 @@ start = true
 33 = 0b0000_0010        # I2C2 event
 34 = 0b0000_0010        # I2C2 error
 
+[tasks.i2c_driver.task-slots]
+gpio_driver = "gpio_driver"
+rcc_driver = "rcc_driver"
+
 #
 # SPI interrupts:
 #   spi1 = 35

diff --git a/demo-stm32h7/app-h7b3.toml b/demo-stm32h7/app-h7b3.toml
@@ -88,6 +88,10 @@ start = true
 95 = 0b0000_1000        # I2C4 event
 96 = 0b0000_1000        # I2C4 error
 
+[tasks.i2c_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-i2c-server/src/main.rs b/drv/stm32h7-i2c-server/src/main.rs
@@ -21,8 +21,8 @@ use fixedmap::*;
 use ringbuf::*;
 use userlib::*;
 
-declare_task!(RCC, rcc_driver);
-declare_task!(GPIO, gpio_driver);
+task_slot!(RCC, rcc_driver);
+task_slot!(GPIO, gpio_driver);
 
 fn lookup_controller<'a>(
     controllers: &'a [I2cController],
@@ -160,7 +160,7 @@ fn reset_if_needed(
         }
     }
 
-    let gpio = get_task_id(GPIO);
+    let gpio = GPIO.get_task_id();
     let gpio = Gpio::from(gpio);
 
     // First, bounce our I2C controller
@@ -601,7 +601,7 @@ fn main() -> ! {
 }
 
 fn turn_on_i2c(controllers: &[I2cController]) {
-    let rcc_driver = Rcc::from(get_task_id(RCC));
+    let rcc_driver = Rcc::from(RCC.get_task_id());
 
     for controller in controllers {
         controller.enable(&rcc_driver);
@@ -629,7 +629,7 @@ fn configure_port(
         return;
     }
 
-    let gpio = get_task_id(GPIO);
+    let gpio = GPIO.get_task_id();
     let gpio = Gpio::from(gpio);
 
     //
@@ -668,7 +668,7 @@ fn configure_pins(
     pins: &[I2cPin],
     map: &mut PortMap,
 ) {
-    let gpio = get_task_id(GPIO);
+    let gpio = GPIO.get_task_id();
     let gpio = Gpio::from(gpio);
 
     for pin in pins {
@@ -706,7 +706,7 @@ fn configure_muxes(
     map: &mut PortMap,
     ctrl: &I2cControl,
 ) {
-    let gpio = get_task_id(GPIO);
+    let gpio = GPIO.get_task_id();
     let gpio = Gpio::from(gpio);
 
     for mux in muxes {

diff --git a/gemini-bu/app.toml b/gemini-bu/app.toml
@@ -92,6 +92,10 @@ start = true
 95 = 0b0000_1000        # I2C4 event
 96 = 0b0000_1000        # I2C4 error
 
+[tasks.i2c_driver.task-slots]
+gpio_driver = "gpio_driver"
+rcc_driver = "rcc_driver"
+
 [tasks.spd]
 path = "../task-spd"
 name = "task-spd"

diff --git a/gimlet/app.toml b/gimlet/app.toml
@@ -104,6 +104,10 @@ start = true
 95 = 0b0000_1000        # I2C4 event
 96 = 0b0000_1000        # I2C4 error
 
+[tasks.i2c_driver.task-slots]
+gpio_driver = "gpio_driver"
+rcc_driver = "rcc_driver"
+
 [tasks.spd]
 path = "../task-spd"
 name = "task-spd"

diff --git a/gimletlet/app.toml b/gimletlet/app.toml
@@ -90,6 +90,10 @@ start = true
 95 = 0b0000_1000        # I2C4 event
 96 = 0b0000_1000        # I2C4 error
 
+[tasks.i2c_driver.task-slots]
+gpio_driver = "gpio_driver"
+rcc_driver = "rcc_driver"
+
 [tasks.spd]
 path = "../task-spd"
 name = "task-spd"