diff options
32 files changed, 200 insertions, 205 deletions
diff --git a/zephyr/emul/emul_bb_retimer.c b/zephyr/emul/emul_bb_retimer.c index 0536f19de6..8028c53c0f 100644 --- a/zephyr/emul/emul_bb_retimer.c +++ b/zephyr/emul/emul_bb_retimer.c @@ -3,22 +3,21 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT intel_jhl8040r - -#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL -#include <zephyr/logging/log.h> -LOG_MODULE_REGISTER(emul_bb_retimer); +#include "driver/retimer/bb_retimer.h" +#include "emul/emul_bb_retimer.h" +#include "emul/emul_common_i2c.h" +#include "emul/emul_stub_device.h" #include <zephyr/device.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> +#include <zephyr/logging/log.h> -#include "emul/emul_common_i2c.h" -#include "emul/emul_bb_retimer.h" -#include "emul/emul_stub_device.h" +#define DT_DRV_COMPAT intel_jhl8040r -#include "driver/retimer/bb_retimer.h" +#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL +LOG_MODULE_REGISTER(emul_bb_retimer); /** Run-time data used by the emulator */ struct bb_emul_data { diff --git a/zephyr/emul/emul_bma255.c b/zephyr/emul/emul_bma255.c index a57c8fbdbb..c563937561 100644 --- a/zephyr/emul/emul_bma255.c +++ b/zephyr/emul/emul_bma255.c @@ -3,22 +3,21 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT zephyr_bma255 - -#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL -#include <zephyr/logging/log.h> -LOG_MODULE_REGISTER(emul_bma255); +#include "driver/accel_bma2x2.h" +#include "emul/emul_bma255.h" +#include "emul/emul_common_i2c.h" +#include "emul/emul_stub_device.h" #include <zephyr/device.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> +#include <zephyr/logging/log.h> -#include "emul/emul_common_i2c.h" -#include "emul/emul_bma255.h" +#define DT_DRV_COMPAT zephyr_bma255 -#include "driver/accel_bma2x2.h" -#include "emul/emul_stub_device.h" +#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL +LOG_MODULE_REGISTER(emul_bma255); /** Run-time data used by the emulator */ struct bma_emul_data { diff --git a/zephyr/emul/emul_bmi.c b/zephyr/emul/emul_bmi.c index fe46428f01..99a06ec00c 100644 --- a/zephyr/emul/emul_bmi.c +++ b/zephyr/emul/emul_bmi.c @@ -3,25 +3,24 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT zephyr_bmi - -#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL -#include <zephyr/logging/log.h> -LOG_MODULE_REGISTER(emul_bmi); +#include "driver/accelgyro_bmi160.h" +#include "driver/accelgyro_bmi260.h" +#include "driver/accelgyro_bmi_common.h" +#include "emul/emul_bmi.h" +#include "emul/emul_common_i2c.h" +#include "emul/emul_stub_device.h" #include <zephyr/device.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> +#include <zephyr/logging/log.h> #include <zephyr/sys/__assert.h> -#include "emul/emul_common_i2c.h" -#include "emul/emul_bmi.h" -#include "emul/emul_stub_device.h" +#define DT_DRV_COMPAT zephyr_bmi -#include "driver/accelgyro_bmi160.h" -#include "driver/accelgyro_bmi260.h" -#include "driver/accelgyro_bmi_common.h" +#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL +LOG_MODULE_REGISTER(emul_bmi); /** Run-time data used by the emulator */ struct bmi_emul_data { diff --git a/zephyr/emul/emul_bmi160.c b/zephyr/emul/emul_bmi160.c index c1d6b58a8f..1b1991a24d 100644 --- a/zephyr/emul/emul_bmi160.c +++ b/zephyr/emul/emul_bmi160.c @@ -3,21 +3,20 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT zephyr_bmi - -#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL -#include <zephyr/logging/log.h> -LOG_MODULE_REGISTER(emul_bmi160); +#include "driver/accelgyro_bmi160.h" +#include "driver/accelgyro_bmi_common.h" +#include "emul/emul_bmi.h" #include <zephyr/device.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> +#include <zephyr/logging/log.h> -#include "emul/emul_bmi.h" +#define DT_DRV_COMPAT zephyr_bmi -#include "driver/accelgyro_bmi160.h" -#include "driver/accelgyro_bmi_common.h" +#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL +LOG_MODULE_REGISTER(emul_bmi160); /** Mask reserved bits in each register of BMI160 */ static const uint8_t bmi_emul_160_rsvd_mask[] = { diff --git a/zephyr/emul/emul_bmi260.c b/zephyr/emul/emul_bmi260.c index 5892a9ae96..2c93e1c2ea 100644 --- a/zephyr/emul/emul_bmi260.c +++ b/zephyr/emul/emul_bmi260.c @@ -3,21 +3,20 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT zephyr_bmi - -#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL -#include <zephyr/logging/log.h> -LOG_MODULE_REGISTER(emul_bmi260); +#include "driver/accelgyro_bmi260.h" +#include "driver/accelgyro_bmi_common.h" +#include "emul/emul_bmi.h" #include <zephyr/device.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> +#include <zephyr/logging/log.h> -#include "emul/emul_bmi.h" +#define DT_DRV_COMPAT zephyr_bmi -#include "driver/accelgyro_bmi260.h" -#include "driver/accelgyro_bmi_common.h" +#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL +LOG_MODULE_REGISTER(emul_bmi260); /** Mask reserved bits in each register of BMI260 */ static const uint8_t bmi_emul_260_rsvd_mask[] = { diff --git a/zephyr/emul/emul_clock_control.c b/zephyr/emul/emul_clock_control.c index 561298a705..e4223a5b43 100644 --- a/zephyr/emul/emul_clock_control.c +++ b/zephyr/emul/emul_clock_control.c @@ -3,16 +3,16 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT cros_clock_control_emul +#include "common.h" +#include "emul/emul_clock_control.h" #include <zephyr/device.h> #include <zephyr/drivers/clock_control.h> #include <zephyr/kernel.h> +#include <zephyr/logging/log.h> -#include "common.h" -#include "emul/emul_clock_control.h" +#define DT_DRV_COMPAT cros_clock_control_emul -#include <zephyr/logging/log.h> LOG_MODULE_REGISTER(clock_control_emul, CONFIG_CLOCK_CONTROL_EMUL_LOG_LEVEL); /** Data needed to maintain the current emulator state */ diff --git a/zephyr/emul/emul_common_i2c.c b/zephyr/emul/emul_common_i2c.c index 70bc962c5f..3af150ddfc 100644 --- a/zephyr/emul/emul_common_i2c.c +++ b/zephyr/emul/emul_common_i2c.c @@ -3,16 +3,16 @@ * found in the LICENSE file. */ -#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL -#include <zephyr/logging/log.h> -LOG_MODULE_REGISTER(emul_common_i2c); +#include "emul/emul_common_i2c.h" #include <zephyr/device.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> +#include <zephyr/logging/log.h> -#include "emul/emul_common_i2c.h" +#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL +LOG_MODULE_REGISTER(emul_common_i2c); /** Check description in emul_common_i2c.h */ int i2c_common_emul_lock_data(struct i2c_common_emul_data *common_data, diff --git a/zephyr/emul/emul_flash.c b/zephyr/emul/emul_flash.c index 0efc690fd4..936ee5470c 100644 --- a/zephyr/emul/emul_flash.c +++ b/zephyr/emul/emul_flash.c @@ -3,19 +3,19 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT cros_ec_flash_emul - -#include <zephyr/drivers/flash.h> -#include <zephyr/logging/log.h> -LOG_MODULE_REGISTER(emul_flash); +#include "drivers/cros_flash.h" +#include "ec_commands.h" +#include "flash.h" #include <zephyr/device.h> #include <zephyr/drivers/emul.h> -#include <ec_commands.h> -#include <drivers/cros_flash.h> +#include <zephyr/drivers/flash.h> +#include <zephyr/logging/log.h> #include <zephyr/sys/__assert.h> -#include "flash.h" +#define DT_DRV_COMPAT cros_ec_flash_emul + +LOG_MODULE_REGISTER(emul_flash); struct flash_emul_data { const struct device *flash_dev; diff --git a/zephyr/emul/emul_isl923x.c b/zephyr/emul/emul_isl923x.c index 1ecb9e79f9..d46f1131d4 100644 --- a/zephyr/emul/emul_isl923x.c +++ b/zephyr/emul/emul_isl923x.c @@ -3,25 +3,26 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT cros_isl923x_emul - -#include <zephyr/device.h> -#include <zephyr/drivers/i2c.h> -#include <zephyr/drivers/i2c_emul.h> -#include <zephyr/drivers/emul.h> -#include <errno.h> -#include <zephyr/sys/__assert.h> -#include <zephyr/ztest.h> - #include "driver/charger/isl923x.h" #include "driver/charger/isl923x_public.h" #include "emul/emul_common_i2c.h" #include "emul/emul_isl923x.h" #include "emul/emul_smart_battery.h" -#include "i2c.h" #include "emul/emul_stub_device.h" +#include "i2c.h" +#include <errno.h> + +#include <zephyr/device.h> +#include <zephyr/drivers/emul.h> +#include <zephyr/drivers/i2c.h> +#include <zephyr/drivers/i2c_emul.h> #include <zephyr/logging/log.h> +#include <zephyr/sys/__assert.h> +#include <zephyr/ztest.h> + +#define DT_DRV_COMPAT cros_isl923x_emul + LOG_MODULE_REGISTER(isl923x_emul, CONFIG_ISL923X_EMUL_LOG_LEVEL); /** Mask used for the charge current register */ diff --git a/zephyr/emul/emul_kb_raw.c b/zephyr/emul/emul_kb_raw.c index 1fdd93d1a0..2e8cdbdd7d 100644 --- a/zephyr/emul/emul_kb_raw.c +++ b/zephyr/emul/emul_kb_raw.c @@ -3,16 +3,17 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT cros_ec_kb_raw_emul - -#include <zephyr/logging/log.h> -LOG_MODULE_REGISTER(emul_kb_raw); - #include <zephyr/device.h> #include <zephyr/drivers/emul.h> +#include <zephyr/logging/log.h> + #include <drivers/cros_kb_raw.h> #include <keyboard_raw.h> +#define DT_DRV_COMPAT cros_ec_kb_raw_emul + +LOG_MODULE_REGISTER(emul_kb_raw); + struct kb_raw_emul_data { int active_column; int *matrix; diff --git a/zephyr/emul/emul_lis2dw12.c b/zephyr/emul/emul_lis2dw12.c index bdc4b50358..547e74912c 100644 --- a/zephyr/emul/emul_lis2dw12.c +++ b/zephyr/emul/emul_lis2dw12.c @@ -3,22 +3,23 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT cros_lis2dw12_emul +#include "driver/accel_lis2dw12.h" +#include "emul/emul_common_i2c.h" +#include "emul/emul_lis2dw12.h" +#include "emul/emul_stub_device.h" +#include "i2c.h" + +#include <errno.h> #include <zephyr/device.h> +#include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> -#include <zephyr/drivers/emul.h> -#include <errno.h> +#include <zephyr/logging/log.h> #include <zephyr/sys/__assert.h> -#include "driver/accel_lis2dw12.h" -#include "emul/emul_common_i2c.h" -#include "emul/emul_lis2dw12.h" -#include "i2c.h" -#include "emul/emul_stub_device.h" +#define DT_DRV_COMPAT cros_lis2dw12_emul -#include <zephyr/logging/log.h> LOG_MODULE_REGISTER(lis2dw12_emul, CONFIG_LIS2DW12_EMUL_LOG_LEVEL); struct lis2dw12_emul_data { diff --git a/zephyr/emul/emul_ln9310.c b/zephyr/emul/emul_ln9310.c index bd6d41bce3..9d6a0197a0 100644 --- a/zephyr/emul/emul_ln9310.c +++ b/zephyr/emul/emul_ln9310.c @@ -3,9 +3,15 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT cros_ln9310_emul +#include "driver/ln9310.h" +#include "emul/emul_common_i2c.h" +#include "emul/emul_ln9310.h" +#include "emul/emul_stub_device.h" +#include "hooks.h" +#include "i2c.h" #include <errno.h> + #include <zephyr/device.h> #include <zephyr/devicetree/gpio.h> #include <zephyr/drivers/emul.h> @@ -13,16 +19,11 @@ #include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> +#include <zephyr/logging/log.h> #include <zephyr/sys/__assert.h> -#include "driver/ln9310.h" -#include "emul/emul_common_i2c.h" -#include "emul/emul_ln9310.h" -#include "hooks.h" -#include "i2c.h" -#include "emul/emul_stub_device.h" +#define DT_DRV_COMPAT cros_ln9310_emul -#include <zephyr/logging/log.h> LOG_MODULE_REGISTER(ln9310_emul, CONFIG_LN9310_EMUL_LOG_LEVEL); enum functional_mode { diff --git a/zephyr/emul/emul_pct2075.c b/zephyr/emul/emul_pct2075.c index f820fbd30a..cfd172b6dc 100644 --- a/zephyr/emul/emul_pct2075.c +++ b/zephyr/emul/emul_pct2075.c @@ -3,14 +3,14 @@ * found in the LICENSE file. */ -#include <zephyr/device.h> - #include "driver/temp_sensor/pct2075.h" #include "emul/emul_common_i2c.h" -#include "emul/emul_stub_device.h" #include "emul/emul_pct2075.h" +#include "emul/emul_stub_device.h" #include "util.h" +#include <zephyr/device.h> + /* NOTE: The emulator doesn't support OS pin */ #define DT_DRV_COMPAT nxp_pct2075 diff --git a/zephyr/emul/emul_pi3usb9201.c b/zephyr/emul/emul_pi3usb9201.c index 8073313d69..a722fc3039 100644 --- a/zephyr/emul/emul_pi3usb9201.c +++ b/zephyr/emul/emul_pi3usb9201.c @@ -3,18 +3,18 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT pericom_pi3usb9201 +#include "emul/emul_common_i2c.h" +#include "emul/emul_pi3usb9201.h" +#include "emul/emul_stub_device.h" #include <zephyr/device.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> +#include <zephyr/logging/log.h> -#include "emul/emul_pi3usb9201.h" -#include "emul/emul_stub_device.h" -#include "emul/emul_common_i2c.h" +#define DT_DRV_COMPAT pericom_pi3usb9201 -#include <zephyr/logging/log.h> LOG_MODULE_REGISTER(emul_pi3usb9201, LOG_LEVEL_DBG); #define EMUL_REG_COUNT (PI3USB9201_REG_HOST_STS + 1) diff --git a/zephyr/emul/emul_rt9490.c b/zephyr/emul/emul_rt9490.c index bc156b7085..1775bc9235 100644 --- a/zephyr/emul/emul_rt9490.c +++ b/zephyr/emul/emul_rt9490.c @@ -3,14 +3,14 @@ * found in the LICENSE file. */ -#include <zephyr/device.h> - #include "driver/charger/rt9490.h" #include "emul/emul_common_i2c.h" #include "emul/emul_rt9490.h" #include "emul/emul_stub_device.h" #include "util.h" +#include <zephyr/device.h> + #define DT_DRV_COMPAT zephyr_rt9490_emul #define RT9490_REG_MAX 255 diff --git a/zephyr/emul/emul_rtc.c b/zephyr/emul/emul_rtc.c index 0bd2ef0828..845f0e8d78 100644 --- a/zephyr/emul/emul_rtc.c +++ b/zephyr/emul/emul_rtc.c @@ -5,18 +5,18 @@ /* This is not a chip emulator, it's a fake driver. */ -#define DT_DRV_COMPAT cros_ec_rtc_emul - -#include <zephyr/logging/log.h> -LOG_MODULE_REGISTER(emul_rtc); +#include "drivers/cros_rtc.h" +#include "ec_commands.h" +#include "flash.h" #include <zephyr/device.h> #include <zephyr/drivers/emul.h> -#include <ec_commands.h> -#include <drivers/cros_rtc.h> +#include <zephyr/logging/log.h> #include <zephyr/sys/__assert.h> -#include "flash.h" +#define DT_DRV_COMPAT cros_ec_rtc_emul + +LOG_MODULE_REGISTER(emul_rtc); struct cros_rtc_emul_data { const struct device *rtc_dev; diff --git a/zephyr/emul/emul_smart_battery.c b/zephyr/emul/emul_smart_battery.c index c064f093bf..7ad4ba41bc 100644 --- a/zephyr/emul/emul_smart_battery.c +++ b/zephyr/emul/emul_smart_battery.c @@ -3,24 +3,23 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT zephyr_smart_battery - -#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL -#include <zephyr/logging/log.h> -LOG_MODULE_REGISTER(smart_battery); +#include "battery_smart.h" +#include "crc8.h" +#include "emul/emul_common_i2c.h" +#include "emul/emul_smart_battery.h" +#include "emul/emul_stub_device.h" #include <zephyr/device.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> +#include <zephyr/logging/log.h> #include <zephyr/ztest.h> -#include "emul/emul_common_i2c.h" -#include "emul/emul_smart_battery.h" +#define DT_DRV_COMPAT zephyr_smart_battery -#include "crc8.h" -#include "battery_smart.h" -#include "emul/emul_stub_device.h" +#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL +LOG_MODULE_REGISTER(smart_battery); /** Run-time data used by the emulator */ struct sbat_emul_data { diff --git a/zephyr/emul/emul_sn5s330.c b/zephyr/emul/emul_sn5s330.c index 6a520ed195..96342abf70 100644 --- a/zephyr/emul/emul_sn5s330.c +++ b/zephyr/emul/emul_sn5s330.c @@ -3,25 +3,26 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT cros_sn5s330_emul - -#include <zephyr/device.h> -#include <zephyr/drivers/i2c.h> -#include <zephyr/drivers/i2c_emul.h> -#include <zephyr/drivers/emul.h> -#include <errno.h> -#include <zephyr/sys/__assert.h> -#include <zephyr/devicetree/gpio.h> -#include <zephyr/drivers/gpio/gpio_emul.h> - #include "driver/ppc/sn5s330.h" #include "driver/ppc/sn5s330_public.h" #include "emul/emul_common_i2c.h" #include "emul/emul_sn5s330.h" -#include "i2c.h" #include "emul/emul_stub_device.h" +#include "i2c.h" +#include <errno.h> + +#include <zephyr/device.h> +#include <zephyr/devicetree/gpio.h> +#include <zephyr/drivers/emul.h> +#include <zephyr/drivers/gpio/gpio_emul.h> +#include <zephyr/drivers/i2c.h> +#include <zephyr/drivers/i2c_emul.h> #include <zephyr/logging/log.h> +#include <zephyr/sys/__assert.h> + +#define DT_DRV_COMPAT cros_sn5s330_emul + LOG_MODULE_REGISTER(sn5s330_emul, CONFIG_SN5S330_EMUL_LOG_LEVEL); struct sn5s330_emul_data { diff --git a/zephyr/emul/emul_syv682x.c b/zephyr/emul/emul_syv682x.c index 8fb4bfc928..68c1a84e15 100644 --- a/zephyr/emul/emul_syv682x.c +++ b/zephyr/emul/emul_syv682x.c @@ -3,25 +3,26 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT zephyr_syv682x_emul +#include "emul/emul_common_i2c.h" +#include "emul/emul_stub_device.h" +#include "emul/emul_syv682x.h" + +#include <stdint.h> +#include <string.h> #include <zephyr/device.h> #include <zephyr/devicetree/gpio.h> -#include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/drivers/emul.h> +#include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> -#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL #include <zephyr/logging/log.h> -LOG_MODULE_REGISTER(syv682x); -#include <stdint.h> -#include <string.h> #include <zephyr/ztest.h> -#include "emul/emul_common_i2c.h" -#include "emul/emul_syv682x.h" -#include "emul/emul_stub_device.h" +#define DT_DRV_COMPAT zephyr_syv682x_emul +#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL +LOG_MODULE_REGISTER(syv682x); #define EMUL_REG_COUNT (SYV682X_CONTROL_4_REG + 1) #define EMUL_REG_IS_VALID(reg) (reg >= 0 && reg < EMUL_REG_COUNT) diff --git a/zephyr/emul/emul_tcs3400.c b/zephyr/emul/emul_tcs3400.c index e87deebc35..a9cbc2a1dc 100644 --- a/zephyr/emul/emul_tcs3400.c +++ b/zephyr/emul/emul_tcs3400.c @@ -3,23 +3,22 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT zephyr_tcs3400 - -#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL -#include <zephyr/logging/log.h> -LOG_MODULE_REGISTER(emul_tcs); +#include "driver/als_tcs3400.h" +#include "emul/emul_common_i2c.h" +#include "emul/emul_stub_device.h" +#include "emul/emul_tcs3400.h" #include <zephyr/device.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> +#include <zephyr/logging/log.h> #include <zephyr/ztest.h> -#include "emul/emul_common_i2c.h" -#include "emul/emul_tcs3400.h" -#include "emul/emul_stub_device.h" +#define DT_DRV_COMPAT zephyr_tcs3400 -#include "driver/als_tcs3400.h" +#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL +LOG_MODULE_REGISTER(emul_tcs); /** Run-time data used by the emulator */ struct tcs_emul_data { diff --git a/zephyr/emul/emul_tusb1064.c b/zephyr/emul/emul_tusb1064.c index 4396cc5fc5..866493bc32 100644 --- a/zephyr/emul/emul_tusb1064.c +++ b/zephyr/emul/emul_tusb1064.c @@ -3,13 +3,13 @@ * found in the LICENSE file. */ -#include <zephyr/device.h> - #include "driver/usb_mux/tusb1064.h" #include "emul/emul_common_i2c.h" #include "emul/emul_stub_device.h" #include "util.h" +#include <zephyr/device.h> + #define DT_DRV_COMPAT zephyr_tusb1064_emul #define TUSB1064_REG_MAX 255 diff --git a/zephyr/emul/i2c_mock.c b/zephyr/emul/i2c_mock.c index 8601c87ee7..c906e76c13 100644 --- a/zephyr/emul/i2c_mock.c +++ b/zephyr/emul/i2c_mock.c @@ -3,13 +3,13 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT cros_i2c_mock +#include "emul/emul_common_i2c.h" +#include "emul/emul_stub_device.h" #include <zephyr/device.h> #include <zephyr/logging/log.h> -#include "emul/emul_common_i2c.h" -#include "emul/emul_stub_device.h" +#define DT_DRV_COMPAT cros_i2c_mock LOG_MODULE_REGISTER(i2c_mock, CONFIG_I2C_MOCK_LOG_LEVEL); diff --git a/zephyr/emul/pwm_mock.c b/zephyr/emul/pwm_mock.c index 0d32155d8f..26f7891cb8 100644 --- a/zephyr/emul/pwm_mock.c +++ b/zephyr/emul/pwm_mock.c @@ -3,14 +3,14 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT cros_pwm_mock +#include "pwm_mock.h" #include <zephyr/device.h> #include <zephyr/devicetree.h> -#include <zephyr/kernel.h> #include <zephyr/drivers/pwm.h> +#include <zephyr/kernel.h> -#include "pwm_mock.h" +#define DT_DRV_COMPAT cros_pwm_mock #define CYCLES_PER_SEC 1000000 diff --git a/zephyr/emul/tcpc/emul_anx7447.c b/zephyr/emul/tcpc/emul_anx7447.c index 6a351a4182..9514afdeed 100644 --- a/zephyr/emul/tcpc/emul_anx7447.c +++ b/zephyr/emul/tcpc/emul_anx7447.c @@ -8,18 +8,17 @@ #include <zephyr/logging/log.h> LOG_MODULE_REGISTER(anx7447_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); +#include "emul/emul_common_i2c.h" +#include "emul/emul_stub_device.h" +#include "emul/tcpc/emul_tcpci.h" +#include "tcpm/tcpci.h" + #include <zephyr/device.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> #include <zephyr/ztest.h> -#include "tcpm/tcpci.h" -#include "emul/emul_stub_device.h" - -#include "emul/emul_common_i2c.h" -#include "emul/tcpc/emul_tcpci.h" - /** * @brief Function called for each byte of read message from anx7447 emulator * diff --git a/zephyr/emul/tcpc/emul_ps8xxx.c b/zephyr/emul/tcpc/emul_ps8xxx.c index 57cc2c85f5..d54d0b7c3e 100644 --- a/zephyr/emul/tcpc/emul_ps8xxx.c +++ b/zephyr/emul/tcpc/emul_ps8xxx.c @@ -8,21 +8,19 @@ #include <zephyr/logging/log.h> LOG_MODULE_REGISTER(ps8xxx_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); +#include "driver/tcpm/ps8xxx.h" +#include "emul/emul_common_i2c.h" +#include "emul/emul_stub_device.h" +#include "emul/tcpc/emul_ps8xxx.h" +#include "emul/tcpc/emul_tcpci.h" +#include "tcpm/tcpci.h" + #include <zephyr/device.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> #include <zephyr/ztest.h> -#include "tcpm/tcpci.h" - -#include "emul/emul_common_i2c.h" -#include "emul/tcpc/emul_ps8xxx.h" -#include "emul/tcpc/emul_tcpci.h" -#include "emul/emul_stub_device.h" - -#include "driver/tcpm/ps8xxx.h" - #define PS8XXX_REG_MUX_IN_HPD_ASSERTION MUX_IN_HPD_ASSERTION_REG /** Run-time data used by the emulator */ diff --git a/zephyr/emul/tcpc/emul_tcpci.c b/zephyr/emul/tcpc/emul_tcpci.c index aa4e508489..fa6caea4ca 100644 --- a/zephyr/emul/tcpc/emul_tcpci.c +++ b/zephyr/emul/tcpc/emul_tcpci.c @@ -6,19 +6,18 @@ #include <zephyr/logging/log.h> LOG_MODULE_REGISTER(tcpci_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); +#include "emul/emul_common_i2c.h" +#include "emul/tcpc/emul_tcpci.h" +#include "tcpm/tcpci.h" + #include <zephyr/device.h> #include <zephyr/drivers/emul.h> +#include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> -#include <zephyr/drivers/gpio/gpio_emul.h> #include <zephyr/sys/byteorder.h> #include <zephyr/ztest.h> -#include "tcpm/tcpci.h" - -#include "emul/emul_common_i2c.h" -#include "emul/tcpc/emul_tcpci.h" - /** * @brief Returns number of bytes in specific register * diff --git a/zephyr/emul/tcpc/emul_tcpci_generic.c b/zephyr/emul/tcpc/emul_tcpci_generic.c index 204e040ede..795459a45c 100644 --- a/zephyr/emul/tcpc/emul_tcpci_generic.c +++ b/zephyr/emul/tcpc/emul_tcpci_generic.c @@ -8,18 +8,17 @@ #include <zephyr/logging/log.h> LOG_MODULE_REGISTER(tcpci_generic_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); +#include "emul/emul_common_i2c.h" +#include "emul/emul_stub_device.h" +#include "emul/tcpc/emul_tcpci.h" +#include "tcpm/tcpci.h" + #include <zephyr/device.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> #include <zephyr/ztest.h> -#include "tcpm/tcpci.h" -#include "emul/emul_stub_device.h" - -#include "emul/emul_common_i2c.h" -#include "emul/tcpc/emul_tcpci.h" - /** * @brief Function called for each byte of read message from TCPCI emulator * diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_common.c b/zephyr/emul/tcpc/emul_tcpci_partner_common.c index 22a9ddb91e..e9fd9ad9ef 100644 --- a/zephyr/emul/tcpc/emul_tcpci_partner_common.c +++ b/zephyr/emul/tcpc/emul_tcpci_partner_common.c @@ -6,17 +6,18 @@ #include <zephyr/logging/log.h> LOG_MODULE_REGISTER(tcpci_partner, CONFIG_TCPCI_EMUL_LOG_LEVEL); -#include <stdlib.h> -#include <zephyr/sys/byteorder.h> -#include <zephyr/kernel.h> -#include <zephyr/ztest.h> - #include "common.h" -#include "emul/tcpc/emul_tcpci_partner_common.h" #include "emul/tcpc/emul_tcpci.h" +#include "emul/tcpc/emul_tcpci_partner_common.h" #include "usb_pd.h" #include "util.h" +#include <stdlib.h> + +#include <zephyr/kernel.h> +#include <zephyr/sys/byteorder.h> +#include <zephyr/ztest.h> + /** Length of PDO, RDO and BIST request object in SOP message in bytes */ #define TCPCI_MSG_DO_LEN 4 /** Length of header in SOP message in bytes */ diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_drp.c b/zephyr/emul/tcpc/emul_tcpci_partner_drp.c index 277957282d..82a7b045b3 100644 --- a/zephyr/emul/tcpc/emul_tcpci_partner_drp.c +++ b/zephyr/emul/tcpc/emul_tcpci_partner_drp.c @@ -6,9 +6,6 @@ #include <zephyr/logging/log.h> LOG_MODULE_REGISTER(tcpci_drp_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); -#include <zephyr/sys/byteorder.h> -#include <zephyr/kernel.h> - #include "common.h" #include "emul/tcpc/emul_tcpci.h" #include "emul/tcpc/emul_tcpci_partner_common.h" @@ -18,6 +15,9 @@ LOG_MODULE_REGISTER(tcpci_drp_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); #include "tcpm/tcpci.h" #include "usb_pd.h" +#include <zephyr/kernel.h> +#include <zephyr/sys/byteorder.h> + /** * @brief Handle SOP messages as TCPCI dual role device * diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_faulty_ext.c b/zephyr/emul/tcpc/emul_tcpci_partner_faulty_ext.c index fc4cd06b82..c5de54f562 100644 --- a/zephyr/emul/tcpc/emul_tcpci_partner_faulty_ext.c +++ b/zephyr/emul/tcpc/emul_tcpci_partner_faulty_ext.c @@ -6,15 +6,15 @@ #include <zephyr/logging/log.h> LOG_MODULE_REGISTER(tcpci_faulty_ext, CONFIG_TCPCI_EMUL_LOG_LEVEL); -#include <zephyr/sys/byteorder.h> -#include <zephyr/kernel.h> - #include "common.h" #include "emul/tcpc/emul_tcpci.h" #include "emul/tcpc/emul_tcpci_partner_common.h" #include "emul/tcpc/emul_tcpci_partner_faulty_ext.h" #include "usb_pd.h" +#include <zephyr/kernel.h> +#include <zephyr/sys/byteorder.h> + /** * @brief Reduce number of times to repeat action. If count reaches zero, action * is removed from queue. diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_snk.c b/zephyr/emul/tcpc/emul_tcpci_partner_snk.c index 8d0fe1fa1e..d9ff23762a 100644 --- a/zephyr/emul/tcpc/emul_tcpci_partner_snk.c +++ b/zephyr/emul/tcpc/emul_tcpci_partner_snk.c @@ -6,15 +6,15 @@ #include <zephyr/logging/log.h> LOG_MODULE_REGISTER(tcpci_snk_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); -#include <zephyr/sys/byteorder.h> -#include <zephyr/kernel.h> - #include "common.h" #include "emul/tcpc/emul_tcpci.h" #include "emul/tcpc/emul_tcpci_partner_common.h" #include "emul/tcpc/emul_tcpci_partner_snk.h" #include "usb_pd.h" +#include <zephyr/kernel.h> +#include <zephyr/sys/byteorder.h> + /** Length of PDO, RDO and BIST request object in SOP message in bytes */ #define TCPCI_MSG_DO_LEN 4 /** Length of header in SOP message in bytes */ diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_src.c b/zephyr/emul/tcpc/emul_tcpci_partner_src.c index c81d69c25f..b823926dd3 100644 --- a/zephyr/emul/tcpc/emul_tcpci_partner_src.c +++ b/zephyr/emul/tcpc/emul_tcpci_partner_src.c @@ -6,15 +6,15 @@ #include <zephyr/logging/log.h> LOG_MODULE_REGISTER(tcpci_src_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL); -#include <zephyr/sys/byteorder.h> -#include <zephyr/kernel.h> - #include "common.h" +#include "emul/tcpc/emul_tcpci.h" #include "emul/tcpc/emul_tcpci_partner_common.h" #include "emul/tcpc/emul_tcpci_partner_src.h" -#include "emul/tcpc/emul_tcpci.h" #include "usb_pd.h" +#include <zephyr/kernel.h> +#include <zephyr/sys/byteorder.h> + /** * @brief Start source capability timer. Capability message will be send after * @p time. |