diff options
Diffstat (limited to 'zephyr/shim/src/motionsense_sensors.c')
| -rw-r--r-- | zephyr/shim/src/motionsense_sensors.c | 242 |
1 files changed, 115 insertions, 127 deletions
diff --git a/zephyr/shim/src/motionsense_sensors.c b/zephyr/shim/src/motionsense_sensors.c index f0b76adf33..8d886192ac 100644 --- a/zephyr/shim/src/motionsense_sensors.c +++ b/zephyr/shim/src/motionsense_sensors.c @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -13,11 +13,11 @@ LOG_MODULE_REGISTER(shim_cros_motionsense_sensors); -#define SENSOR_MUTEX_NODE DT_PATH(motionsense_mutex) -#define SENSOR_MUTEX_NAME(id) DT_CAT(MUTEX_, id) +#define SENSOR_MUTEX_NODE DT_PATH(motionsense_mutex) +#define SENSOR_MUTEX_NAME(id) DT_CAT(MUTEX_, id) #if DT_NODE_EXISTS(SENSOR_MUTEX_NODE) -#define DECLARE_SENSOR_MUTEX(id) K_MUTEX_DEFINE(SENSOR_MUTEX_NAME(id)); +#define DECLARE_SENSOR_MUTEX(id) K_MUTEX_DEFINE(SENSOR_MUTEX_NAME(id)); /* * Declare mutex for @@ -28,18 +28,12 @@ LOG_MODULE_REGISTER(shim_cros_motionsense_sensors); DT_FOREACH_CHILD(SENSOR_MUTEX_NODE, DECLARE_SENSOR_MUTEX) #endif /* DT_NODE_EXISTS(SENSOR_MUTEX_NODE) */ -#define MAT_ITEM(i, id) FLOAT_TO_FP((int32_t)(DT_PROP_BY_IDX(id, mat33, i))) -#define DECLARE_SENSOR_ROT_REF(id) \ - const mat33_fp_t SENSOR_ROT_STD_REF_NAME(id) = { \ - { \ - FOR_EACH_FIXED_ARG(MAT_ITEM, (,), id, 0, 1, 2) \ - }, \ - { \ - FOR_EACH_FIXED_ARG(MAT_ITEM, (,), id, 3, 4, 5) \ - }, \ - { \ - FOR_EACH_FIXED_ARG(MAT_ITEM, (,), id, 6, 7, 8) \ - }, \ +#define MAT_ITEM(i, id) FLOAT_TO_FP((int32_t)(DT_PROP_BY_IDX(id, mat33, i))) +#define DECLARE_SENSOR_ROT_REF(id) \ + const mat33_fp_t SENSOR_ROT_STD_REF_NAME(id) = { \ + { FOR_EACH_FIXED_ARG(MAT_ITEM, (, ), id, 0, 1, 2) }, \ + { FOR_EACH_FIXED_ARG(MAT_ITEM, (, ), id, 3, 4, 5) }, \ + { FOR_EACH_FIXED_ARG(MAT_ITEM, (, ), id, 6, 7, 8) }, \ }; /* @@ -59,12 +53,12 @@ DT_FOREACH_CHILD(SENSOR_ROT_REF_NODE, DECLARE_SENSOR_ROT_REF) * * A driver data can be shared among the motion sensors. */ -#define SENSOR_DATA_NAME(id) DT_CAT(SENSOR_DAT_, id) -#define SENSOR_DATA_NODE DT_PATH(motionsense_sensor_data) +#define SENSOR_DATA_NAME(id) DT_CAT(SENSOR_DAT_, id) +#define SENSOR_DATA_NODE DT_PATH(motionsense_sensor_data) -#define SENSOR_DATA(inst, compat, create_data_macro) \ - create_data_macro(DT_INST(inst, compat), \ - SENSOR_DATA_NAME(DT_INST(inst, compat))) +#define SENSOR_DATA(inst, compat, create_data_macro) \ + create_data_macro(DT_INST(inst, compat), \ + SENSOR_DATA_NAME(DT_INST(inst, compat))) /* * CREATE_SENSOR_DATA is a helper macro that gets @@ -93,17 +87,17 @@ DT_FOREACH_CHILD(SENSOR_ROT_REF_NODE, DECLARE_SENSOR_ROT_REF) * CREATE_SENSOR_DATA(cros_ec_drvdata_tcs3400_clear, \ * CREATE_SENSOR_DATA_TCS3400_CLEAR) */ -#define CREATE_SENSOR_DATA(compat, create_data_macro) \ - LISTIFY(DT_NUM_INST_STATUS_OKAY(compat), SENSOR_DATA, (), \ - compat, create_data_macro) +#define CREATE_SENSOR_DATA(compat, create_data_macro) \ + LISTIFY(DT_NUM_INST_STATUS_OKAY(compat), SENSOR_DATA, (), compat, \ + create_data_macro) /* * sensor_drv_list.inc is included three times in this file. This is the first * time and it is for creating sensor driver-specific data. So we ignore * CREATE_MOTION_SENSOR() that creates motion sensor at this time. */ -#define CREATE_MOTION_SENSOR(s_compat, s_chip, s_type, s_drv, \ - s_min_freq, s_max_freq) +#define CREATE_MOTION_SENSOR(s_compat, s_chip, s_type, s_drv, s_min_freq, \ + s_max_freq) /* * Here, we declare all sensor driver data. How to create the data is @@ -119,33 +113,31 @@ DT_FOREACH_CHILD(SENSOR_ROT_REF_NODE, DECLARE_SENSOR_ROT_REF) * See motionsense-sensor-base.yaml and cros-ec,motionsense-mutex.yaml * for DT example and details. */ -#define SENSOR_MUTEX(id) \ - IF_ENABLED(DT_NODE_HAS_PROP(id, mutex), \ - (.mutex = &SENSOR_MUTEX_NAME(DT_PHANDLE(id, mutex)),)) +#define SENSOR_MUTEX(id) \ + IF_ENABLED(DT_NODE_HAS_PROP(id, mutex), \ + (.mutex = &SENSOR_MUTEX_NAME(DT_PHANDLE(id, mutex)), )) /* * Set the interrupt pin which is referred by the phandle. */ -#define SENSOR_INT_SIGNAL(id) \ - IF_ENABLED(DT_NODE_HAS_PROP(id, int_signal), \ - (.int_signal = GPIO_SIGNAL(DT_PHANDLE(id, int_signal)),)) +#define SENSOR_INT_SIGNAL(id) \ + IF_ENABLED(DT_NODE_HAS_PROP(id, int_signal), \ + (.int_signal = GPIO_SIGNAL(DT_PHANDLE(id, int_signal)), )) /* * Set flags based on values defined in the node. */ -#define SENSOR_FLAGS(id) \ - .flags = 0 \ - IF_ENABLED(DT_NODE_HAS_PROP(id, int_signal), \ - (|MOTIONSENSE_FLAG_INT_SIGNAL)) \ - , +#define SENSOR_FLAGS(id) \ + .flags = 0 IF_ENABLED(DT_NODE_HAS_PROP(id, int_signal), \ + (| MOTIONSENSE_FLAG_INT_SIGNAL)), /* * Get I2C port number which is referred by phandle. * See motionsense-sensor-base.yaml for DT example and details. */ -#define SENSOR_I2C_PORT(id) \ - IF_ENABLED(DT_NODE_HAS_PROP(id, port), \ - (.port = I2C_PORT(DT_PHANDLE(id, port)),)) +#define SENSOR_I2C_PORT(id) \ + IF_ENABLED(DT_NODE_HAS_PROP(id, port), \ + (.port = I2C_PORT(DT_PHANDLE(id, port)), )) /* * Get I2C or SPI address. @@ -161,75 +153,74 @@ DT_FOREACH_CHILD(SENSOR_ROT_REF_NODE, DECLARE_SENSOR_ROT_REF) * See motionsense-sensor-base.yaml and cros-ec,motionsense-rotation-ref.yaml * for DT example and details. */ -#define SENSOR_ROT_STD_REF(id) \ - IF_ENABLED(DT_NODE_HAS_PROP(id, rot_standard_ref), \ - (.rot_standard_ref = \ - &SENSOR_ROT_STD_REF_NAME(DT_PHANDLE(id, rot_standard_ref)),)) +#define SENSOR_ROT_STD_REF(id) \ + IF_ENABLED(DT_NODE_HAS_PROP(id, rot_standard_ref), \ + (.rot_standard_ref = &SENSOR_ROT_STD_REF_NAME( \ + DT_PHANDLE(id, rot_standard_ref)), )) /* * Get the address of driver-specific data which is referred by phandle. * See motionsense-sensor-base.yaml for DT example and details. */ -#define SENSOR_DRV_DATA(id) \ - IF_ENABLED(DT_NODE_HAS_PROP(id, drv_data), \ - (.drv_data = &SENSOR_DATA_NAME(DT_PHANDLE(id, drv_data)),)) +#define SENSOR_DRV_DATA(id) \ + IF_ENABLED(DT_NODE_HAS_PROP(id, drv_data), \ + (.drv_data = \ + &SENSOR_DATA_NAME(DT_PHANDLE(id, drv_data)), )) /* * Get odr and ec_rate for the motion sensor. * See motionsense-sensor-base.yaml and cros-ec,motionsense-sensor-config.yaml * for DT example and details. */ -#define SET_CONFIG_EC(cfg_id, cfg_suffix) \ - [SENSOR_CONFIG_##cfg_suffix] = { \ - IF_ENABLED(DT_NODE_HAS_PROP(cfg_id, odr), \ - (.odr = DT_PROP(cfg_id, odr),)) \ - IF_ENABLED(DT_NODE_HAS_PROP(cfg_id, ec_rate), \ - (.ec_rate = DT_PROP(cfg_id, ec_rate),)) \ +#define SET_CONFIG_EC(cfg_id, cfg_suffix) \ + [SENSOR_CONFIG_##cfg_suffix] = { \ + IF_ENABLED(DT_NODE_HAS_PROP(cfg_id, odr), \ + (.odr = DT_PROP(cfg_id, odr), )) \ + IF_ENABLED(DT_NODE_HAS_PROP(cfg_id, ec_rate), \ + (.ec_rate = DT_PROP(cfg_id, ec_rate), )) \ } /* Get configs */ -#define CREATE_SENSOR_CONFIG(cfgs_id) \ - .config = { \ - IF_ENABLED(DT_NODE_EXISTS(DT_CHILD(cfgs_id, ap)), \ - (SET_CONFIG_EC(DT_CHILD(cfgs_id, ap), AP),)) \ - IF_ENABLED(DT_NODE_EXISTS(DT_CHILD(cfgs_id, ec_s0)), \ - (SET_CONFIG_EC(DT_CHILD(cfgs_id, ec_s0), EC_S0),)) \ - IF_ENABLED(DT_NODE_EXISTS(DT_CHILD(cfgs_id, ec_s3)), \ - (SET_CONFIG_EC(DT_CHILD(cfgs_id, ec_s3), EC_S3),)) \ - IF_ENABLED(DT_NODE_EXISTS(DT_CHILD(cfgs_id, ec_s5)), \ - (SET_CONFIG_EC(DT_CHILD(cfgs_id, ec_s5), EC_S5),)) \ +#define CREATE_SENSOR_CONFIG(cfgs_id) \ + .config = { \ + IF_ENABLED(DT_NODE_EXISTS(DT_CHILD(cfgs_id, ap)), \ + (SET_CONFIG_EC(DT_CHILD(cfgs_id, ap), AP), )) \ + IF_ENABLED(DT_NODE_EXISTS(DT_CHILD(cfgs_id, ec_s0)), \ + (SET_CONFIG_EC(DT_CHILD(cfgs_id, ec_s0), \ + EC_S0), )) \ + IF_ENABLED(DT_NODE_EXISTS( \ + DT_CHILD(cfgs_id, ec_s3)), \ + (SET_CONFIG_EC(DT_CHILD(cfgs_id, \ + ec_s3), \ + EC_S3), )) \ + IF_ENABLED(DT_NODE_EXISTS(DT_CHILD( \ + cfgs_id, ec_s5)), \ + (SET_CONFIG_EC( \ + DT_CHILD(cfgs_id, \ + ec_s5), \ + EC_S5), )) \ } -#define SENSOR_CONFIG(id) \ - IF_ENABLED(DT_NODE_EXISTS(DT_CHILD(id, configs)), \ - (CREATE_SENSOR_CONFIG(DT_CHILD(id, configs)),)) +#define SENSOR_CONFIG(id) \ + IF_ENABLED(DT_NODE_EXISTS(DT_CHILD(id, configs)), \ + (CREATE_SENSOR_CONFIG(DT_CHILD(id, configs)), )) /* Get and assign the basic information for a motion sensor */ -#define SENSOR_BASIC_INFO(id) \ - .name = DT_LABEL(id), \ - .active_mask = DT_STRING_TOKEN(id, active_mask), \ - .location = DT_STRING_TOKEN(id, location), \ - .default_range = DT_PROP(id, default_range), \ - SENSOR_I2C_SPI_ADDR_FLAGS(id) \ - SENSOR_MUTEX(id) \ - SENSOR_I2C_PORT(id) \ - SENSOR_ROT_STD_REF(id) \ - SENSOR_DRV_DATA(id) \ - SENSOR_CONFIG(id) \ - SENSOR_INT_SIGNAL(id) \ - SENSOR_FLAGS(id) +#define SENSOR_BASIC_INFO(id) \ + .name = DT_NODE_FULL_NAME(id), \ + .active_mask = DT_STRING_TOKEN(id, active_mask), \ + .location = DT_STRING_TOKEN(id, location), \ + .default_range = DT_PROP(id, default_range), \ + SENSOR_I2C_SPI_ADDR_FLAGS(id) SENSOR_MUTEX(id) SENSOR_I2C_PORT(id) \ + SENSOR_ROT_STD_REF(id) SENSOR_DRV_DATA(id) SENSOR_CONFIG(id) \ + SENSOR_INT_SIGNAL(id) SENSOR_FLAGS(id) /* Create motion sensor node with node ID */ -#define DO_MK_SENSOR_ENTRY( \ - id, s_chip, s_type, s_drv, s_min_freq, s_max_freq) \ - [SENSOR_ID(id)] = { \ - SENSOR_BASIC_INFO(id) \ - .chip = s_chip, \ - .type = s_type, \ - .drv = &s_drv, \ - .min_frequency = s_min_freq, \ - .max_frequency = s_max_freq \ - }, +#define DO_MK_SENSOR_ENTRY(id, s_chip, s_type, s_drv, s_min_freq, s_max_freq) \ + [SENSOR_ID(id)] = { SENSOR_BASIC_INFO(id).chip = s_chip, \ + .type = s_type, .drv = &s_drv, \ + .min_frequency = s_min_freq, \ + .max_frequency = s_max_freq }, /* Construct an entry iff the alternate_for property is missing. */ #define MK_SENSOR_ENTRY(inst, s_compat, s_chip, s_type, s_drv, s_min_freq, \ @@ -289,9 +280,9 @@ DT_FOREACH_CHILD(SENSOR_ROT_REF_NODE, DECLARE_SENSOR_ROT_REF) * MOTIONSENSE_TYPE_LIGHT_RGB, tcs3400_rgb_drv, 0, 0) * ----------------------------------------------- */ -#define CREATE_MOTION_SENSOR(s_compat, s_chip, s_type, s_drv, \ - s_min_freq, s_max_freq) \ - LISTIFY(DT_NUM_INST_STATUS_OKAY(s_compat), MK_SENSOR_ENTRY, (),\ +#define CREATE_MOTION_SENSOR(s_compat, s_chip, s_type, s_drv, s_min_freq, \ + s_max_freq) \ + LISTIFY(DT_NUM_INST_STATUS_OKAY(s_compat), MK_SENSOR_ENTRY, (), \ s_compat, s_chip, s_type, s_drv, s_min_freq, s_max_freq) /* @@ -309,10 +300,10 @@ struct motion_sensor_t motion_sensors[] = { * of alternate sensors that will be used at runtime. */ #undef CREATE_MOTION_SENSOR -#define CREATE_MOTION_SENSOR(s_compat, s_chip, s_type, s_drv, s_min_freq, \ - s_max_freq) \ - LISTIFY(DT_NUM_INST_STATUS_OKAY(s_compat), MK_SENSOR_ALT_ENTRY, (),\ - s_compat, s_chip, s_type, s_drv, s_min_freq, s_max_freq) +#define CREATE_MOTION_SENSOR(s_compat, s_chip, s_type, s_drv, s_min_freq, \ + s_max_freq) \ + LISTIFY(DT_NUM_INST_STATUS_OKAY(s_compat), MK_SENSOR_ALT_ENTRY, (), \ + s_compat, s_chip, s_type, s_drv, s_min_freq, s_max_freq) /* * The list of alternate motion sensors that may be used at runtime to replace @@ -356,12 +347,11 @@ const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); * }; */ #if DT_NODE_HAS_PROP(SENSOR_INFO_NODE, als_sensors) -#define ALS_SENSOR_ENTRY_WITH_COMMA(i, id) \ +#define ALS_SENSOR_ENTRY_WITH_COMMA(i, id) \ &motion_sensors[SENSOR_ID(DT_PHANDLE_BY_IDX(id, als_sensors, i))], -const struct motion_sensor_t *motion_als_sensors[] = { - LISTIFY(DT_PROP_LEN(SENSOR_INFO_NODE, als_sensors), - ALS_SENSOR_ENTRY_WITH_COMMA, (), SENSOR_INFO_NODE) -}; +const struct motion_sensor_t *motion_als_sensors[] = { LISTIFY( + DT_PROP_LEN(SENSOR_INFO_NODE, als_sensors), ALS_SENSOR_ENTRY_WITH_COMMA, + (), SENSOR_INFO_NODE) }; BUILD_ASSERT(ARRAY_SIZE(motion_als_sensors) == ALS_COUNT); #endif @@ -378,28 +368,27 @@ BUILD_ASSERT(ARRAY_SIZE(motion_als_sensors) == ALS_COUNT); * }; */ #if DT_NODE_HAS_PROP(SENSOR_INFO_NODE, sensor_irqs) -#define SENSOR_GPIO_ENABLE_INTERRUPT(i, id) \ - gpio_enable_dt_interrupt( \ +#define SENSOR_GPIO_ENABLE_INTERRUPT(i, id) \ + gpio_enable_dt_interrupt( \ GPIO_INT_FROM_NODE(DT_PHANDLE_BY_IDX(id, sensor_irqs, i))); -static void sensor_enable_irqs(void) -{ +static void sensor_enable_irqs(void){ LISTIFY(DT_PROP_LEN(SENSOR_INFO_NODE, sensor_irqs), - SENSOR_GPIO_ENABLE_INTERRUPT, (), SENSOR_INFO_NODE) -} -DECLARE_HOOK(HOOK_INIT, sensor_enable_irqs, HOOK_PRIO_DEFAULT); + SENSOR_GPIO_ENABLE_INTERRUPT, (), SENSOR_INFO_NODE) +} DECLARE_HOOK(HOOK_INIT, sensor_enable_irqs, HOOK_PRIO_DEFAULT); #endif /* Handle the alternative motion sensors */ -#define CHECK_SSFC_AND_ENABLE_ALT_SENSOR(id) \ - do { \ - if (cros_cbi_ssfc_check_match(CBI_SSFC_VALUE_ID( \ - DT_PHANDLE(id, alternate_ssfc_indicator)))) { \ - LOG_INF("Replacing \"%s\" for \"%s\" based on SSFC", \ - motion_sensors[SENSOR_ID(DT_PHANDLE(id, \ - alternate_for))].name, \ - motion_sensors_alt[SENSOR_ID(id)].name); \ - ENABLE_ALT_MOTION_SENSOR(id); \ - } \ +#define CHECK_SSFC_AND_ENABLE_ALT_SENSOR(id) \ + do { \ + if (cros_cbi_ssfc_check_match(CBI_SSFC_VALUE_ID( \ + DT_PHANDLE(id, alternate_ssfc_indicator)))) { \ + LOG_INF("Replacing \"%s\" for \"%s\" based on SSFC", \ + motion_sensors[SENSOR_ID(DT_PHANDLE( \ + id, alternate_for))] \ + .name, \ + motion_sensors_alt[SENSOR_ID(id)].name); \ + ENABLE_ALT_MOTION_SENSOR(id); \ + } \ } while (0) #define ALT_SENSOR_CHECK_SSFC_ID(id) \ @@ -428,8 +417,7 @@ int motion_sense_probe(enum sensor_alt_id alt_idx) return res; } -void motion_sensors_check_ssfc(void) -{ +void motion_sensors_check_ssfc(void){ DT_FOREACH_CHILD(SENSOR_ALT_NODE, ALT_SENSOR_CHECK_SSFC_ID) } #endif /* DT_NODE_EXISTS(SENSOR_ALT_NODE) */ @@ -440,13 +428,13 @@ void motion_sensors_check_ssfc(void) #define DEF_MOTION_ISR_NAME(id) \ DEF_MOTION_ISR_NAME_ENUM_WITH_SUFFIX(DEF_MOTION_ISR_NAME_ENUM(id)) -#define DEF_MOTION_ISR(id) \ -void DEF_MOTION_ISR_NAME(id)(enum gpio_signal signal) \ -{ \ - __ASSERT(motion_sensors[SENSOR_ID(id)].drv->interrupt, \ - "No interrupt handler for signal: %x", signal); \ - motion_sensors[SENSOR_ID(id)].drv->interrupt(signal); \ -} +#define DEF_MOTION_ISR(id) \ + void DEF_MOTION_ISR_NAME(id)(enum gpio_signal signal) \ + { \ + __ASSERT(motion_sensors[SENSOR_ID(id)].drv->interrupt, \ + "No interrupt handler for signal: %x", signal); \ + motion_sensors[SENSOR_ID(id)].drv->interrupt(signal); \ + } #define DEF_MOTION_CHECK_ISR(id) \ COND_CODE_1(DT_NODE_HAS_PROP(id, int_signal), (DEF_MOTION_ISR(id)), ()) |