diff options
Diffstat (limited to 'app/drivers/kscan')
| -rw-r--r-- | app/drivers/kscan/kscan_gpio_demux.c | 4 | ||||
| -rw-r--r-- | app/drivers/kscan/kscan_gpio_direct.c | 8 | ||||
| -rw-r--r-- | app/drivers/kscan/kscan_gpio_matrix.c | 4 | ||||
| -rw-r--r-- | app/drivers/kscan/kscan_mock.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/app/drivers/kscan/kscan_gpio_demux.c b/app/drivers/kscan/kscan_gpio_demux.c index 44abca4..3ad9d57 100644 --- a/app/drivers/kscan/kscan_gpio_demux.c +++ b/app/drivers/kscan/kscan_gpio_demux.c @@ -74,7 +74,7 @@ struct kscan_gpio_item_config { } \ \ static const struct kscan_gpio_item_config *kscan_gpio_input_configs_##n(struct device *dev) { \ - const struct kscan_gpio_config_##n *cfg = dev->config_info; \ + const struct kscan_gpio_config_##n *cfg = dev->config; \ return cfg->rows; \ } \ \ @@ -86,7 +86,7 @@ struct kscan_gpio_item_config { \ static const struct kscan_gpio_item_config *kscan_gpio_output_configs_##n( \ struct device *dev) { \ - const struct kscan_gpio_config_##n *cfg = dev->config_info; \ + const struct kscan_gpio_config_##n *cfg = dev->config; \ /* If row2col, rows = outputs & cols = inputs */ \ return cfg->cols; \ } \ diff --git a/app/drivers/kscan/kscan_gpio_direct.c b/app/drivers/kscan/kscan_gpio_direct.c index 6df68cd..5598205 100644 --- a/app/drivers/kscan/kscan_gpio_direct.c +++ b/app/drivers/kscan/kscan_gpio_direct.c @@ -49,7 +49,7 @@ static struct device **kscan_gpio_input_devices(struct device *dev) { } static const struct kscan_gpio_item_config *kscan_gpio_input_configs(struct device *dev) { - const struct kscan_gpio_config *cfg = dev->config_info; + const struct kscan_gpio_config *cfg = dev->config; return cfg->inputs; } @@ -72,7 +72,7 @@ struct kscan_gpio_irq_callback { }; static int kscan_gpio_config_interrupts(struct device *dev, gpio_flags_t flags) { - const struct kscan_gpio_config *cfg = dev->config_info; + const struct kscan_gpio_config *cfg = dev->config; struct device **devices = kscan_gpio_input_devices(dev); const struct kscan_gpio_item_config *configs = kscan_gpio_input_configs(dev); @@ -139,7 +139,7 @@ static int kscan_gpio_direct_configure(struct device *dev, kscan_callback_t call static int kscan_gpio_read(struct device *dev) { struct kscan_gpio_data *data = dev->driver_data; - const struct kscan_gpio_config *cfg = dev->config_info; + const struct kscan_gpio_config *cfg = dev->config; uint32_t read_state = data->pin_state; bool submit_follow_up_read = false; for (int i = 0; i < cfg->num_of_inputs; i++) { @@ -196,7 +196,7 @@ static const struct kscan_driver_api gpio_driver_api = { .inputs = {[INST_INPUT_LEN(n) - 1] = NULL}}; \ static int kscan_gpio_init_##n(struct device *dev) { \ struct kscan_gpio_data *data = dev->driver_data; \ - const struct kscan_gpio_config *cfg = dev->config_info; \ + const struct kscan_gpio_config *cfg = dev->config; \ int err; \ struct device **input_devices = kscan_gpio_input_devices(dev); \ for (int i = 0; i < cfg->num_of_inputs; i++) { \ diff --git a/app/drivers/kscan/kscan_gpio_matrix.c b/app/drivers/kscan/kscan_gpio_matrix.c index 9887a28..9af7899 100644 --- a/app/drivers/kscan/kscan_gpio_matrix.c +++ b/app/drivers/kscan/kscan_gpio_matrix.c @@ -86,7 +86,7 @@ static int kscan_gpio_config_interrupts(struct device **devices, (data->rows))); \ } \ static const struct kscan_gpio_item_config *kscan_gpio_input_configs_##n(struct device *dev) { \ - const struct kscan_gpio_config_##n *cfg = dev->config_info; \ + const struct kscan_gpio_config_##n *cfg = dev->config; \ return (( \ COND_CODE_0(DT_ENUM_IDX(DT_DRV_INST(n), diode_direction), (cfg->cols), (cfg->rows)))); \ } \ @@ -97,7 +97,7 @@ static int kscan_gpio_config_interrupts(struct device **devices, } \ static const struct kscan_gpio_item_config *kscan_gpio_output_configs_##n( \ struct device *dev) { \ - const struct kscan_gpio_config_##n *cfg = dev->config_info; \ + const struct kscan_gpio_config_##n *cfg = dev->config; \ return ( \ COND_CODE_0(DT_ENUM_IDX(DT_DRV_INST(n), diode_direction), (cfg->rows), (cfg->cols))); \ } \ diff --git a/app/drivers/kscan/kscan_mock.c b/app/drivers/kscan/kscan_mock.c index b1454fe..d0e7808 100644 --- a/app/drivers/kscan/kscan_mock.c +++ b/app/drivers/kscan/kscan_mock.c @@ -50,7 +50,7 @@ static int kscan_mock_configure(struct device *dev, kscan_callback_t callback) { }; \ static void kscan_mock_schedule_next_event_##n(struct device *dev) { \ struct kscan_mock_data *data = dev->driver_data; \ - const struct kscan_mock_config_##n *cfg = dev->config_info; \ + const struct kscan_mock_config_##n *cfg = dev->config; \ if (data->event_index < DT_INST_PROP_LEN(n, events)) { \ uint32_t ev = cfg->events[data->event_index]; \ LOG_DBG("delaying next keypress: %d", ZMK_MOCK_MSEC(ev)); \ @@ -62,7 +62,7 @@ static int kscan_mock_configure(struct device *dev, kscan_callback_t callback) { } \ static void kscan_mock_work_handler_##n(struct k_work *work) { \ struct kscan_mock_data *data = CONTAINER_OF(work, struct kscan_mock_data, work); \ - const struct kscan_mock_config_##n *cfg = data->dev->config_info; \ + const struct kscan_mock_config_##n *cfg = data->dev->config; \ uint32_t ev = cfg->events[data->event_index]; \ LOG_DBG("ev %u row %d column %d state %d\n", ev, ZMK_MOCK_ROW(ev), ZMK_MOCK_COL(ev), \ ZMK_MOCK_IS_PRESS(ev)); \ |