diff options
author | Abe Levkoy <alevkoy@chromium.org> | 2022-08-02 13:10:20 -0600 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-08-03 20:07:24 +0000 |
commit | 9d346066594745ad1ce465890f60b5db0e6615a1 (patch) | |
tree | 1c0c28d83c89dd9267d47f7d3a8b2532b5234c99 /zephyr | |
parent | e372db6463482ff5a9da7957c9b411a35cd3b33f (diff) | |
download | chrome-ec-9d346066594745ad1ce465890f60b5db0e6615a1.tar.gz |
zephyr: emul: Use EMUL_DT_INST_DEFINE
Update the emulators to use EMUL_DT_INST_DEFINE and EMUL_DT_GET instead
of EMUL_DEFINE and EMUL_REG_NAME, because the latter have been removed
upstream.
BUG=b:224588313
TEST=zmake testall
BRANCH=none
Cq-Depend: chromium:3806745
Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Change-Id: If358bd2bcfe9b99df0a671e2542a94deb5fad8f3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3805535
Reviewed-by: Fabio Baltieri <fabiobaltieri@google.com>
Diffstat (limited to 'zephyr')
-rw-r--r-- | zephyr/emul/emul_bb_retimer.c | 4 | ||||
-rw-r--r-- | zephyr/emul/emul_bma255.c | 22 | ||||
-rw-r--r-- | zephyr/emul/emul_bmi.c | 21 | ||||
-rw-r--r-- | zephyr/emul/emul_isl923x.c | 4 | ||||
-rw-r--r-- | zephyr/emul/emul_lis2dw12.c | 5 | ||||
-rw-r--r-- | zephyr/emul/emul_ln9310.c | 4 | ||||
-rw-r--r-- | zephyr/emul/emul_pi3usb9201.c | 6 | ||||
-rw-r--r-- | zephyr/emul/emul_smart_battery.c | 22 | ||||
-rw-r--r-- | zephyr/emul/emul_sn5s330.c | 8 | ||||
-rw-r--r-- | zephyr/emul/emul_syv682x.c | 4 | ||||
-rw-r--r-- | zephyr/emul/emul_tcs3400.c | 22 | ||||
-rw-r--r-- | zephyr/emul/i2c_mock.c | 18 | ||||
-rw-r--r-- | zephyr/emul/tcpc/emul_ps8xxx.c | 2 | ||||
-rw-r--r-- | zephyr/emul/tcpc/emul_tcpci_generic.c | 2 | ||||
-rw-r--r-- | zephyr/include/emul/tcpc/emul_tcpci.h | 2 |
15 files changed, 72 insertions, 74 deletions
diff --git a/zephyr/emul/emul_bb_retimer.c b/zephyr/emul/emul_bb_retimer.c index 7587dc656f..fdd9a08af5 100644 --- a/zephyr/emul/emul_bb_retimer.c +++ b/zephyr/emul/emul_bb_retimer.c @@ -334,8 +334,8 @@ static int bb_emul_init(const struct emul *emul, const struct device *parent) .data = &bb_emul_data_##n.common, \ .addr = DT_INST_REG_ADDR(n), \ }; \ - EMUL_DEFINE(bb_emul_init, DT_DRV_INST(n), &bb_emul_cfg_##n, \ - &bb_emul_data_##n, &i2c_common_emul_api) + EMUL_DT_INST_DEFINE(n, bb_emul_init, &bb_emul_data_##n, \ + &bb_emul_cfg_##n, &i2c_common_emul_api) DT_INST_FOREACH_STATUS_OKAY(BB_RETIMER_EMUL) diff --git a/zephyr/emul/emul_bma255.c b/zephyr/emul/emul_bma255.c index 70b120c167..b1b69a86ec 100644 --- a/zephyr/emul/emul_bma255.c +++ b/zephyr/emul/emul_bma255.c @@ -973,7 +973,7 @@ static int bma_emul_init(const struct emul *emul, const struct device *parent) return 0; } -#define BMA255_EMUL(n) \ +#define BMA255_EMUL(n) \ static struct bma_emul_data bma_emul_data_##n = { \ .nvm_x = DT_INST_PROP(n, nvm_off_x), \ .nvm_y = DT_INST_PROP(n, nvm_off_y), \ @@ -1002,16 +1002,16 @@ static int bma_emul_init(const struct emul *emul, const struct device *parent) .finish_read = NULL, \ .access_reg = bma_emul_access_reg, \ }, \ - }; \ - \ - static const struct i2c_common_emul_cfg bma_emul_cfg_##n = { \ - .i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))), \ - .dev_label = DT_INST_LABEL(n), \ - .data = &bma_emul_data_##n.common, \ - .addr = DT_INST_REG_ADDR(n), \ - }; \ - EMUL_DEFINE(bma_emul_init, DT_DRV_INST(n), &bma_emul_cfg_##n, \ - &bma_emul_data_##n, &i2c_common_emul_api) + }; \ + \ + static const struct i2c_common_emul_cfg bma_emul_cfg_##n = { \ + .i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))), \ + .dev_label = DT_INST_LABEL(n), \ + .data = &bma_emul_data_##n.common, \ + .addr = DT_INST_REG_ADDR(n), \ + }; \ + EMUL_DT_INST_DEFINE(n, bma_emul_init, &bma_emul_data_##n, \ + &bma_emul_cfg_##n, &i2c_common_emul_api) DT_INST_FOREACH_STATUS_OKAY(BMA255_EMUL) diff --git a/zephyr/emul/emul_bmi.c b/zephyr/emul/emul_bmi.c index b72c729b80..a87984ba7b 100644 --- a/zephyr/emul/emul_bmi.c +++ b/zephyr/emul/emul_bmi.c @@ -1059,7 +1059,7 @@ static int bmi_emul_init(const struct emul *emul, const struct device *parent) return 0; } -#define BMI_EMUL(n) \ +#define BMI_EMUL(n) \ static struct bmi_emul_data bmi_emul_data_##n = { \ .error_on_ro_write = DT_INST_PROP(n, error_on_ro_write),\ .error_on_wo_read = DT_INST_PROP(n, error_on_wo_read), \ @@ -1077,16 +1077,15 @@ static int bmi_emul_init(const struct emul *emul, const struct device *parent) .finish_read = NULL, \ .access_reg = NULL, \ }, \ - }; \ - \ - static const struct i2c_common_emul_cfg bmi_emul_cfg_##n = { \ - .i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))), \ - .dev_label = DT_INST_LABEL(n), \ - .data = &bmi_emul_data_##n.common, \ - .addr = DT_INST_REG_ADDR(n), \ - }; \ - EMUL_DEFINE(bmi_emul_init, DT_DRV_INST(n), &bmi_emul_cfg_##n, \ - &bmi_emul_data_##n, &i2c_common_emul_api) + }; \ + static const struct i2c_common_emul_cfg bmi_emul_cfg_##n = { \ + .i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))), \ + .dev_label = DT_INST_LABEL(n), \ + .data = &bmi_emul_data_##n.common, \ + .addr = DT_INST_REG_ADDR(n), \ + }; \ + EMUL_DT_INST_DEFINE(n, bmi_emul_init, &bmi_emul_data_##n, \ + &bmi_emul_cfg_##n, &i2c_common_emul_api) DT_INST_FOREACH_STATUS_OKAY(BMI_EMUL) diff --git a/zephyr/emul/emul_isl923x.c b/zephyr/emul/emul_isl923x.c index 9853d57ab1..2a0a903dc1 100644 --- a/zephyr/emul/emul_isl923x.c +++ b/zephyr/emul/emul_isl923x.c @@ -443,8 +443,8 @@ static int emul_isl923x_init(const struct emul *emul, .addr = DT_INST_REG_ADDR(n), \ }, \ }; \ - EMUL_DEFINE(emul_isl923x_init, DT_DRV_INST(n), &isl923x_emul_cfg_##n, \ - &isl923x_emul_data_##n, &i2c_common_emul_api) + EMUL_DT_INST_DEFINE(n, emul_isl923x_init, &isl923x_emul_data_##n, \ + &isl923x_emul_cfg_##n, &i2c_common_emul_api) DT_INST_FOREACH_STATUS_OKAY(INIT_ISL923X) diff --git a/zephyr/emul/emul_lis2dw12.c b/zephyr/emul/emul_lis2dw12.c index 8ada7845bf..148d2f095b 100644 --- a/zephyr/emul/emul_lis2dw12.c +++ b/zephyr/emul/emul_lis2dw12.c @@ -297,9 +297,8 @@ void lis2dw12_emul_clear_accel_reading(const struct emul *emul) .addr = DT_INST_REG_ADDR(n), \ }, \ }; \ - EMUL_DEFINE(emul_lis2dw12_init, DT_DRV_INST(n), \ - &lis2dw12_emul_cfg_##n, &lis2dw12_emul_data_##n, \ - &i2c_common_emul_api) + EMUL_DT_INST_DEFINE(n, emul_lis2dw12_init, &lis2dw12_emul_data_##n, \ + &lis2dw12_emul_cfg_##n, &i2c_common_emul_api) DT_INST_FOREACH_STATUS_OKAY(INIT_LIS2DW12) DT_INST_FOREACH_STATUS_OKAY(EMUL_STUB_DEVICE); diff --git a/zephyr/emul/emul_ln9310.c b/zephyr/emul/emul_ln9310.c index 7903d0fe3f..ba1e2d440b 100644 --- a/zephyr/emul/emul_ln9310.c +++ b/zephyr/emul/emul_ln9310.c @@ -508,8 +508,8 @@ static int emul_ln9310_init(const struct emul *emul, .dev_label = DT_INST_LABEL(n), \ .addr = DT_INST_REG_ADDR(n), \ }; \ - EMUL_DEFINE(emul_ln9310_init, DT_DRV_INST(n), &ln9310_emul_cfg_##n, \ - &ln9310_emul_data_##n, &i2c_common_emul_api) + EMUL_DT_INST_DEFINE(n, emul_ln9310_init, &ln9310_emul_data_##n, \ + &ln9310_emul_cfg_##n, &i2c_common_emul_api) DT_INST_FOREACH_STATUS_OKAY(INIT_LN9310) DT_INST_FOREACH_STATUS_OKAY(EMUL_STUB_DEVICE); diff --git a/zephyr/emul/emul_pi3usb9201.c b/zephyr/emul/emul_pi3usb9201.c index 01fdf0b986..685086f896 100644 --- a/zephyr/emul/emul_pi3usb9201.c +++ b/zephyr/emul/emul_pi3usb9201.c @@ -178,9 +178,9 @@ static int pi3usb9201_emul_init(const struct emul *emul, .data = &pi3usb9201_emul_data_##n, \ .addr = DT_INST_REG_ADDR(n), \ }; \ - EMUL_DEFINE(pi3usb9201_emul_init, DT_DRV_INST(n), \ - &pi3usb9201_emul_cfg_##n, &pi3usb9201_emul_data_##n, \ - &pi3usb9201_emul_api) + EMUL_DT_INST_DEFINE(n, pi3usb9201_emul_init, \ + &pi3usb9201_emul_data_##n, \ + &pi3usb9201_emul_cfg_##n, &pi3usb9201_emul_api) DT_INST_FOREACH_STATUS_OKAY(PI3USB9201_EMUL) diff --git a/zephyr/emul/emul_smart_battery.c b/zephyr/emul/emul_smart_battery.c index 41d22c4924..4efdbb43b9 100644 --- a/zephyr/emul/emul_smart_battery.c +++ b/zephyr/emul/emul_smart_battery.c @@ -796,7 +796,7 @@ static int sbat_emul_init(const struct emul *emul, const struct device *parent) return 0; } -#define SMART_BATTERY_EMUL(n) \ +#define SMART_BATTERY_EMUL(n) \ static struct sbat_emul_data sbat_emul_data_##n = { \ .bat = { \ .mf_access = DT_INST_PROP(n, mf_access), \ @@ -864,16 +864,16 @@ static int sbat_emul_init(const struct emul *emul, const struct device *parent) .finish_read = NULL, \ .access_reg = sbat_emul_access_reg, \ }, \ - }; \ - \ - static const struct i2c_common_emul_cfg sbat_emul_cfg_##n = { \ - .i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))), \ - .dev_label = DT_INST_LABEL(n), \ - .data = &sbat_emul_data_##n.common, \ - .addr = DT_INST_REG_ADDR(n), \ - }; \ - EMUL_DEFINE(sbat_emul_init, DT_DRV_INST(n), &sbat_emul_cfg_##n, \ - &sbat_emul_data_##n, &i2c_common_emul_api) + }; \ + \ + static const struct i2c_common_emul_cfg sbat_emul_cfg_##n = { \ + .i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))), \ + .dev_label = DT_INST_LABEL(n), \ + .data = &sbat_emul_data_##n.common, \ + .addr = DT_INST_REG_ADDR(n), \ + }; \ + EMUL_DT_INST_DEFINE(n, sbat_emul_init, &sbat_emul_data_##n, \ + &sbat_emul_cfg_##n, &i2c_common_emul_api) DT_INST_FOREACH_STATUS_OKAY(SMART_BATTERY_EMUL) diff --git a/zephyr/emul/emul_sn5s330.c b/zephyr/emul/emul_sn5s330.c index 2877ed8573..c6e2fea84f 100644 --- a/zephyr/emul/emul_sn5s330.c +++ b/zephyr/emul/emul_sn5s330.c @@ -336,14 +336,14 @@ static int emul_sn5s330_init(const struct emul *emul, #define SN5S330_GET_GPIO_INT_PIN(n) DT_GPIO_PIN(DT_INST_PROP(n, int_pin), gpios) #define INIT_SN5S330(n) \ - static struct sn5s330_emul_data sn5s330_emul_data_##n = { \ + static struct sn5s330_emul_data sn5s330_emul_data_##n = { \ .common = { \ .write_byte = sn5s330_emul_write_byte, \ .read_byte = sn5s330_emul_read_byte, \ }, \ .gpio_int_port = SN5S330_GET_GPIO_INT_PORT(n), \ .gpio_int_pin = SN5S330_GET_GPIO_INT_PIN(n), \ - }; \ + }; \ static struct sn5s330_emul_cfg sn5s330_emul_cfg_##n = { \ .common = { \ .i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))), \ @@ -351,8 +351,8 @@ static int emul_sn5s330_init(const struct emul *emul, .addr = DT_INST_REG_ADDR(n), \ }, \ }; \ - EMUL_DEFINE(emul_sn5s330_init, DT_DRV_INST(n), &sn5s330_emul_cfg_##n, \ - &sn5s330_emul_data_##n, &i2c_common_emul_api) + EMUL_DT_INST_DEFINE(n, emul_sn5s330_init, &sn5s330_emul_data_##n, \ + &sn5s330_emul_cfg_##n, &i2c_common_emul_api) DT_INST_FOREACH_STATUS_OKAY(INIT_SN5S330) DT_INST_FOREACH_STATUS_OKAY(EMUL_STUB_DEVICE); diff --git a/zephyr/emul/emul_syv682x.c b/zephyr/emul/emul_syv682x.c index a0c1020cc3..5ce82dfb24 100644 --- a/zephyr/emul/emul_syv682x.c +++ b/zephyr/emul/emul_syv682x.c @@ -273,8 +273,8 @@ static int syv682x_emul_init(const struct emul *emul, .addr = DT_INST_REG_ADDR(n), \ }, \ }; \ - EMUL_DEFINE(syv682x_emul_init, DT_DRV_INST(n), &syv682x_emul_cfg_##n, \ - &syv682x_emul_data_##n, &i2c_common_emul_api) + EMUL_DT_INST_DEFINE(n, syv682x_emul_init, &syv682x_emul_data_##n, \ + &syv682x_emul_cfg_##n, &i2c_common_emul_api) DT_INST_FOREACH_STATUS_OKAY(SYV682X_EMUL) diff --git a/zephyr/emul/emul_tcs3400.c b/zephyr/emul/emul_tcs3400.c index 385dfb78c4..34f6954f85 100644 --- a/zephyr/emul/emul_tcs3400.c +++ b/zephyr/emul/emul_tcs3400.c @@ -592,7 +592,7 @@ static int tcs_emul_init(const struct emul *emul, const struct device *parent) return 0; } -#define TCS3400_EMUL(n) \ +#define TCS3400_EMUL(n) \ static struct tcs_emul_data tcs_emul_data_##n = { \ .revision = DT_INST_PROP(n, revision), \ .id = DT_STRING_TOKEN(DT_DRV_INST(n), device_id), \ @@ -614,16 +614,16 @@ static int tcs_emul_init(const struct emul *emul, const struct device *parent) .finish_read = NULL, \ .access_reg = NULL, \ }, \ - }; \ - \ - static const struct i2c_common_emul_cfg tcs_emul_cfg_##n = { \ - .i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))), \ - .dev_label = DT_INST_LABEL(n), \ - .data = &tcs_emul_data_##n.common, \ - .addr = DT_INST_REG_ADDR(n), \ - }; \ - EMUL_DEFINE(tcs_emul_init, DT_DRV_INST(n), &tcs_emul_cfg_##n, \ - &tcs_emul_data_##n, &i2c_common_emul_api) + }; \ + \ + static const struct i2c_common_emul_cfg tcs_emul_cfg_##n = { \ + .i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))), \ + .dev_label = DT_INST_LABEL(n), \ + .data = &tcs_emul_data_##n.common, \ + .addr = DT_INST_REG_ADDR(n), \ + }; \ + EMUL_DT_INST_DEFINE(n, tcs_emul_init, &tcs_emul_data_##n, \ + &tcs_emul_cfg_##n, &i2c_common_emul_api) DT_INST_FOREACH_STATUS_OKAY(TCS3400_EMUL) diff --git a/zephyr/emul/i2c_mock.c b/zephyr/emul/i2c_mock.c index d4b257731c..d471aa0b92 100644 --- a/zephyr/emul/i2c_mock.c +++ b/zephyr/emul/i2c_mock.c @@ -56,15 +56,15 @@ static int i2c_mock_init(const struct emul *emul, const struct device *parent) return 0; } -#define INIT_I2C_MOCK(n) \ - static const struct i2c_common_emul_cfg i2c_mock_cfg_##n = { \ - .i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))), \ - .dev_label = DT_INST_LABEL(n), \ - .addr = DT_INST_REG_ADDR(n), \ - }; \ - static struct i2c_common_emul_data i2c_mock_data_##n; \ - EMUL_DEFINE(i2c_mock_init, DT_DRV_INST(n), &i2c_mock_cfg_##n, \ - &i2c_mock_data_##n, &i2c_common_emul_api) +#define INIT_I2C_MOCK(n) \ + static const struct i2c_common_emul_cfg i2c_mock_cfg_##n = { \ + .i2c_label = DT_LABEL(DT_BUS(DT_DRV_INST(n))), \ + .dev_label = DT_INST_LABEL(n), \ + .addr = DT_INST_REG_ADDR(n), \ + }; \ + static struct i2c_common_emul_data i2c_mock_data_##n; \ + EMUL_DT_INST_DEFINE(n, i2c_mock_init, &i2c_mock_data_##n, \ + &i2c_mock_cfg_##n, &i2c_common_emul_api) DT_INST_FOREACH_STATUS_OKAY(INIT_I2C_MOCK) diff --git a/zephyr/emul/tcpc/emul_ps8xxx.c b/zephyr/emul/tcpc/emul_ps8xxx.c index df76afe2c3..8b15967e90 100644 --- a/zephyr/emul/tcpc/emul_ps8xxx.c +++ b/zephyr/emul/tcpc/emul_ps8xxx.c @@ -662,7 +662,7 @@ DT_INST_FOREACH_STATUS_OKAY(PS8XXX_EMUL) #ifdef CONFIG_ZTEST_NEW_API #define PS8XXX_EMUL_RESET_RULE_BEFORE(n) \ - ps8xxx_emul_tcpc_reset(&EMUL_REG_NAME(DT_DRV_INST(n))); + ps8xxx_emul_tcpc_reset(EMUL_DT_GET(DT_DRV_INST(n))); static void ps8xxx_emul_reset_rule_before(const struct ztest_unit_test *test, void *data) { diff --git a/zephyr/emul/tcpc/emul_tcpci_generic.c b/zephyr/emul/tcpc/emul_tcpci_generic.c index 0cc75fdf5b..f851cc9978 100644 --- a/zephyr/emul/tcpc/emul_tcpci_generic.c +++ b/zephyr/emul/tcpc/emul_tcpci_generic.c @@ -160,7 +160,7 @@ DT_INST_FOREACH_STATUS_OKAY(TCPCI_GENERIC_EMUL) #ifdef CONFIG_ZTEST_NEW_API #define TCPCI_GENERIC_EMUL_RESET_RULE_BEFORE(n) \ - tcpci_generic_emul_reset(&EMUL_REG_NAME(DT_DRV_INST(n))); + tcpci_generic_emul_reset(EMUL_DT_GET(DT_DRV_INST(n))); static void tcpci_generic_emul_reset_rule_before(const struct ztest_unit_test *test, void *data) diff --git a/zephyr/include/emul/tcpc/emul_tcpci.h b/zephyr/include/emul/tcpc/emul_tcpci.h index 9d1fa0dabc..6964fa84d7 100644 --- a/zephyr/include/emul/tcpc/emul_tcpci.h +++ b/zephyr/include/emul/tcpc/emul_tcpci.h @@ -124,7 +124,7 @@ struct tcpc_emul_data { .addr = DT_INST_REG_ADDR(n), \ }, \ }; \ - EMUL_DEFINE(init, DT_DRV_INST(n), cfg_ptr, &tcpc_emul_data_##n, bus_api) + EMUL_DT_INST_DEFINE(n, init, &tcpc_emul_data_##n, cfg_ptr, bus_api) /** Response from TCPCI specific device operations */ enum tcpci_emul_ops_resp { |