WIP flip to gimlet PI14

oxidecomputer · Mar 28, 2024 · 8eadfde · 8eadfde
1 parent d18a4d2
commit 8eadfde
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/app/demo-stm32h7-nucleo/app-h753.toml b/app/demo-stm32h7-nucleo/app-h753.toml
@@ -25,21 +25,11 @@ request_reset = ["hiffy"]
 
 [tasks.sys]
 name = "drv-stm32xx-sys"
-features = ["h753", "exti"]
+features = ["h753"]
 priority = 1
-uses = ["rcc", "gpios", "system_flash", "syscfg", "exti"]
+uses = ["rcc", "gpios", "system_flash"]
 start = true
 task-slots = ["jefe"]
-notifications = ["exti-wildcard-irq"]
-
-[tasks.sys.interrupts]
-"exti.exti0" = "exti-wildcard-irq"
-"exti.exti1" = "exti-wildcard-irq"
-"exti.exti2" = "exti-wildcard-irq"
-"exti.exti3" = "exti-wildcard-irq"
-"exti.exti4" = "exti-wildcard-irq"
-"exti.exti9_5" = "exti-wildcard-irq"
-"exti.exti15_10" = "exti-wildcard-irq"
 
 [tasks.i2c_driver]
 name = "drv-stm32xx-i2c-server"

diff --git a/app/gimlet/base.toml b/app/gimlet/base.toml
@@ -50,12 +50,21 @@ notifications = ["eth-irq", "mdio-timer-irq", "wake-timer", "jefe-state-change"]
 
 [tasks.sys]
 name = "drv-stm32xx-sys"
-features = ["h753"]
+features = ["h753", "exti"]
 priority = 1
-max-sizes = {flash = 2048, ram = 2048}
-uses = ["rcc", "gpios", "system_flash"]
+uses = ["rcc", "gpios", "system_flash", "syscfg", "exti"]
 start = true
 task-slots = ["jefe"]
+notifications = ["exti-wildcard-irq"]
+
+[tasks.sys.interrupts]
+"exti.exti0" = "exti-wildcard-irq"
+"exti.exti1" = "exti-wildcard-irq"
+"exti.exti2" = "exti-wildcard-irq"
+"exti.exti3" = "exti-wildcard-irq"
+"exti.exti4" = "exti-wildcard-irq"
+"exti.exti9_5" = "exti-wildcard-irq"
+"exti.exti15_10" = "exti-wildcard-irq"
 
 [tasks.spi2_driver]
 name = "drv-stm32h7-spi-server"
@@ -128,7 +137,7 @@ max-sizes = {flash = 65536, ram = 16384 }
 stacksize = 2800
 start = true
 task-slots = ["i2c_driver", "sensor", "gimlet_seq"]
-notifications = ["timer"]
+notifications = ["timer", "external_badness"]
 
 [tasks.hiffy]
 name = "task-hiffy"

diff --git a/drv/stm32xx-sys/src/main.rs b/drv/stm32xx-sys/src/main.rs
@@ -885,16 +885,16 @@ mod generated {
         None,
         None,
         None,
-        // 13
+        None,
+        // 14 - HACK HACK! This is PI14 on Gimlet for power system debugging
         Some((
-            Port::C,
+            Port::I,
             TaskId::for_index_and_gen(
-                hubris_num_tasks::Task::hiffy as usize,
+                hubris_num_tasks::Task::power as usize,
                 userlib::Generation::ZERO,
             ),
-            1 << 24,
+            1 << 1,
         )),
         None,
-        None,
     ];
 }