From 1ed0e63ca532fe14adca4d2f0102178e24423cd1 Mon Sep 17 00:00:00 2001 From: Jacob Dahl <37091262+dakejahl@users.noreply.github.com> Date: Sat, 31 Oct 2026 09:42:43 -0800 Subject: [PATCH] refactor(platform): out-line the I2CSPIDriverBase constructor to save flash (#29544) The constructor was defined in the header, so each of the ~75 I2C/SPI drivers expanded the ScheduledWorkItem and I2CSPIInstance initialisation into its own constructor. Moving the body to i2c_spi_buses.cpp leaves one call per driver. px4_fmu-v6x_default: 1932520 -> 1930616 bytes of text, -1904 B. Assisted-by: Claude:claude-fable-5-1 Co-authored-by: Balduin --- platforms/common/i2c_spi_buses.cpp | 6 ++++++ .../common/include/px4_platform_common/i2c_spi_buses.h | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/platforms/common/i2c_spi_buses.cpp b/platforms/common/i2c_spi_buses.cpp index 15e7a850b57..9dd00d5c3e0 100644 --- a/platforms/common/i2c_spi_buses.cpp +++ b/platforms/common/i2c_spi_buses.cpp @@ -653,6 +653,12 @@ static void initializer_trampoline(void *argument) data->instance = data->instantiate(data->config, data->runtime_instance); } +I2CSPIDriverBase::I2CSPIDriverBase(const I2CSPIDriverConfig &config) + : ScheduledWorkItem(config.module_name, config.wq_config), + I2CSPIInstance(config) +{ +} + int I2CSPIDriverBase::module_start(const BusCLIArguments &cli, BusInstanceIterator &iterator, void(*print_usage)(), instantiate_method instantiate) { diff --git a/platforms/common/include/px4_platform_common/i2c_spi_buses.h b/platforms/common/include/px4_platform_common/i2c_spi_buses.h index 83234b13ff8..4b9b5e30ba9 100644 --- a/platforms/common/include/px4_platform_common/i2c_spi_buses.h +++ b/platforms/common/include/px4_platform_common/i2c_spi_buses.h @@ -272,9 +272,7 @@ private: class I2CSPIDriverBase : public px4::ScheduledWorkItem, public I2CSPIInstance { public: - I2CSPIDriverBase(const I2CSPIDriverConfig &config) - : ScheduledWorkItem(config.module_name, config.wq_config), - I2CSPIInstance(config) {} + I2CSPIDriverBase(const I2CSPIDriverConfig &config); static int module_stop(BusInstanceIterator &iterator); static int module_status(BusInstanceIterator &iterator);