Merge remote-tracking branch 'origin/master' into james/enhance-stack

Author: jamesmunns

Cargo.lock

@@ -132,14 +132,14 @@ notifications = ["i2c1-irq", "i2c2-irq", "i2c3-irq", "i2c4-irq"]
 [tasks.packrat]
 name = "task-packrat"
 priority = 1
-stacksize = 1512
+stacksize = 1712
 start = true
 task-slots = ["jefe"]
 features = ["cosmo", "ereport"]
 notifications = ["task-faulted"]
 
 [tasks.rng_driver]
-features = ["h753", "ereport"]
+features = ["h753", "packrat"]
 name = "drv-stm32h7-rng"
 priority = 6
 uses = ["rng"]
@@ -258,7 +258,7 @@ features = ["stm32h753", "usart6", "baud_rate_3M", "hardware_flow_control", "vla
 uses = ["usart6", "dbgmcu"]
 interrupts = {"usart6.irq" = "usart-irq"}
 priority = 9
-max-sizes = {flash = 74000, ram = 65536}
+max-sizes = {flash = 76000, ram = 65536}
 stacksize = 7664
 start = true
 task-slots = ["sys", { cpu_seq = "cosmo_seq" }, "hf", "control_plane_agent", "net", "packrat", "i2c_driver", { spi_driver = "spi2_driver" }, "sprot", "auxflash"]

app/cosmo/base.toml

@@ -125,7 +125,7 @@ notifications = ["i2c1-irq", "jefe-state-change"]
 [tasks.packrat]
 name = "task-packrat"
 priority = 1
-stacksize = 1512
+stacksize = 1616
 start = true
 task-slots = ["jefe"]
 features = ["gimlet", "ereport"]
@@ -199,7 +199,7 @@ task-slots = ["sys"]
 notifications = ["hash-irq"]
 
 [tasks.rng_driver]
-features = ["h753", "ereport"]
+features = ["h753", "packrat"]
 name = "drv-stm32h7-rng"
 priority = 6
 uses = ["rng"]
@@ -243,7 +243,7 @@ features = ["stm32h753", "uart7", "baud_rate_3M", "hardware_flow_control", "vlan
 uses = ["uart7", "dbgmcu"]
 interrupts = {"uart7.irq" = "usart-irq"}
 priority = 8
-max-sizes = {flash = 72000, ram = 65536}
+max-sizes = {flash = 75000, ram = 65536}
 stacksize = 7312
 start = true
 task-slots = ["sys", { cpu_seq = "gimlet_seq" }, "hf", "control_plane_agent", "net", "packrat", "i2c_driver", { spi_driver = "spi2_driver" }, "sprot"]

app/gimlet/base.toml

@@ -206,7 +206,7 @@ features = ["vlan"]
 notifications = ["socket"]
 
 [tasks.rng_driver]
-features = ["h753", "ereport"]
+features = ["h753", "packrat"]
 task-slots = ["sys", "user_leds", "packrat"]
 
 # VLAN configuration

app/gimletlet/app.toml

@@ -11,7 +11,7 @@ interrupts = {"uart8.irq" = "usart-irq"}
 
 # Ereport stuff
 [tasks.packrat]
-stacksize = 1512
+stacksize = 1616
 task-slots = ["jefe"]
 features = ["ereport"]
 notifications = ["task-faulted"]
@@ -29,7 +29,7 @@ features = ["vlan"]
 notifications = ["socket"]
 
 [tasks.rng_driver]
-features = ["h753", "ereport"]
+features = ["h753", "packrat"]
 name = "drv-stm32h7-rng"
 priority = 6
 uses = ["rng"]

app/grapefruit/standalone.toml

@@ -91,7 +91,7 @@ pin = 11
 owner = {name = "sequencer", notification = "psu_pwr_ok_5"}
 
 [tasks.rng_driver]
-features = ["h753", "ereport"]
+features = ["h753", "packrat"]
 name = "drv-stm32h7-rng"
 priority = 6
 uses = ["rng"]

app/observer/base.toml

@@ -94,7 +94,7 @@ owner = {name = "sequencer", notification = "psu_pwr_ok_6"}
 
 
 [tasks.rng_driver]
-features = ["h753", "ereport"]
+features = ["h753", "packrat"]
 name = "drv-stm32h7-rng"
 priority = 6
 uses = ["rng"]

app/psc/base.toml

@@ -56,7 +56,7 @@ pin = 3
 owner = {name = "sprot", notification = "rot_irq"}
 
 [tasks.rng_driver]
-features = ["h753", "ereport"]
+features = ["h753", "packrat"]
 name = "drv-stm32h7-rng"
 priority = 6
 uses = ["rng"]

app/sidecar/base.toml

@@ -1386,31 +1386,14 @@ impl ConfigGenerator {
             for (rail, (device, index)) in &all {
                 let raw_bank = index.unwrap_or(0);
 
-                // ----
-                // First accessor, returns `(I2cDevice, u8)`
-
-                // if we update this code to be more clever than just
-                // to-lowercase'ing the rail names, you might need to go update
-                // the mapping in `control-plane-agent`!
-                write!(
-                    &mut self.output,
-                    r##"
-        #[allow(dead_code)]
-        pub fn {}(task: TaskId) -> (I2cDevice, u8) {{"##,
-                    rail.to_lowercase(),
-                )?;
-
-                let out = self.generate_device(device, 16);
-                writeln!(&mut self.output, "({out}, {raw_bank})\n        }}")?;
-
                 // ---
-                // Second accessor, returns `(I2cDevice, Option<u8>)`
+                // Accessor, returns `(I2cDevice, Option<u8>)`
 
                 write!(
                     &mut self.output,
                     r##"
         #[allow(dead_code)]
-        pub fn {}_with_opt_page_idx(task: TaskId)"##,
+        pub fn {}(task: TaskId)"##,
                     rail.to_lowercase(),
                 )?;
                 write!(&mut self.output, " -> (I2cDevice, Option<u8>) {{")?;

build/i2c/src/lib.rs

@@ -195,7 +195,7 @@ fn main() -> ! {
         use drv_i2c_devices::bmr491::{Bmr491, ExternalInputVoltageProtection};
 
         let dev = i2c_config::devices::bmr491_u80(I2C.get_task_id());
-        let driver = Bmr491::new(&dev, 0);
+        let driver = Bmr491::new(&dev);
 
         // Cosmo provides external undervoltage protection that kicks in at a
         // lower voltage than we'd like to tolerate, so, request additional