diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kscan_composite.c | 130 | ||||
| -rw-r--r-- | src/kscan_mock.c | 125 |
2 files changed, 185 insertions, 70 deletions
diff --git a/src/kscan_composite.c b/src/kscan_composite.c new file mode 100644 index 0000000..d46484b --- /dev/null +++ b/src/kscan_composite.c @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com> + * + * SPDX-License-Identifier: MIT + */ + +#define DT_DRV_COMPAT zmk_kscan_composite + +#include <device.h> +#include <drivers/kscan.h> +#include <logging/log.h> +LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); + +#define MATRIX_NODE_ID DT_DRV_INST(0) +#define MATRIX_ROWS DT_PROP(MATRIX_NODE_ID, rows) +#define MATRIX_COLS DT_PROP(MATRIX_NODE_ID, columns) + +struct kscan_composite_child_config +{ + char *label; + u8_t row_offset; + u8_t column_offset; +}; + +#define CHILD_CONFIG(inst) \ + { \ + .label = DT_LABEL(DT_PHANDLE(inst, kscan)), \ + .row_offset = DT_PROP(inst, row_offset), \ + .column_offset = DT_PROP(inst, column_offset)}, + +const struct kscan_composite_child_config kscan_composite_children[] = { + DT_FOREACH_CHILD(MATRIX_NODE_ID, CHILD_CONFIG)}; + +struct kscan_composite_config +{ +}; + +struct kscan_composite_data +{ + kscan_callback_t callback; + + struct device *dev; +}; + +static int kscan_composite_enable_callback(struct device *dev) +{ + for (int i = 0; i < sizeof(kscan_composite_children) / sizeof(kscan_composite_children[0]); i++) + { + const struct kscan_composite_child_config *cfg = &kscan_composite_children[i]; + + kscan_enable_callback(device_get_binding(cfg->label)); + } + return 0; +} + +static int kscan_composite_disable_callback(struct device *dev) +{ + for (int i = 0; i < sizeof(kscan_composite_children) / sizeof(kscan_composite_children[0]); i++) + { + const struct kscan_composite_child_config *cfg = &kscan_composite_children[i]; + + kscan_disable_callback(device_get_binding(cfg->label)); + } + return 0; +} + +static void kscan_composite_child_callback(struct device *child_dev, u32_t row, u32_t column, bool pressed) +{ + // TODO: Ideally we can get this passed into our callback! + struct device *dev = device_get_binding(DT_INST_LABEL(0)); + struct kscan_composite_data *data = dev->driver_data; + + for (int i = 0; i < sizeof(kscan_composite_children) / sizeof(kscan_composite_children[0]); i++) + { + const struct kscan_composite_child_config *cfg = &kscan_composite_children[i]; + + if (device_get_binding(cfg->label) != child_dev) + { + continue; + } + + data->callback(dev, row + cfg->row_offset, column + cfg->column_offset, pressed); + } +} + +static int kscan_composite_configure(struct device *dev, kscan_callback_t callback) +{ + struct kscan_composite_data *data = dev->driver_data; + + if (!callback) + { + return -EINVAL; + } + + for (int i = 0; i < sizeof(kscan_composite_children) / sizeof(kscan_composite_children[0]); i++) + { + const struct kscan_composite_child_config *cfg = &kscan_composite_children[i]; + + kscan_config(device_get_binding(cfg->label), &kscan_composite_child_callback); + } + + data->callback = callback; + + return 0; +} + +static int kscan_composite_init(struct device *dev) +{ + struct kscan_composite_data *data = dev->driver_data; + + data->dev = dev; + + return 0; +} + +static const struct kscan_driver_api mock_driver_api = { + .config = kscan_composite_configure, + .enable_callback = kscan_composite_enable_callback, + .disable_callback = kscan_composite_disable_callback, +}; + +static const struct kscan_composite_config kscan_composite_config = {}; + +static struct kscan_composite_data kscan_composite_data; + +DEVICE_AND_API_INIT(kscan_composite, DT_INST_LABEL(0), kscan_composite_init, + &kscan_composite_data, + &kscan_composite_config, + APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, + &mock_driver_api); diff --git a/src/kscan_mock.c b/src/kscan_mock.c index a214335..7d2d24d 100644 --- a/src/kscan_mock.c +++ b/src/kscan_mock.c @@ -13,16 +13,6 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include <zmk/kscan-mock.h> -#define MATRIX_NODE_ID DT_DRV_INST(0) -#define MATRIX_ROWS DT_PROP(MATRIX_NODE_ID, rows) -#define MATRIX_COLS DT_PROP(MATRIX_NODE_ID, columns) -#define MATRIX_MOCK_EVENT_COUNT DT_PROP_LEN(MATRIX_NODE_ID, events) - -struct kscan_mock_config -{ - u32_t events[MATRIX_MOCK_EVENT_COUNT]; -}; - struct kscan_mock_data { kscan_callback_t callback; @@ -32,47 +22,14 @@ struct kscan_mock_data struct device *dev; }; -static void kscan_mock_schedule_next_event(struct device *dev) -{ - struct kscan_mock_data *data = dev->driver_data; - const struct kscan_mock_config *cfg = dev->config_info; - - if (data->event_index < MATRIX_MOCK_EVENT_COUNT) - { - u32_t ev = cfg->events[data->event_index]; - LOG_DBG("delaying next keypress: %d", ZMK_MOCK_MSEC(ev)); - k_delayed_work_submit(&data->work, K_MSEC(ZMK_MOCK_MSEC(ev))); - } -} - -static int kscan_mock_enable_callback(struct device *dev) -{ - struct kscan_mock_data *data = dev->driver_data; - kscan_mock_schedule_next_event(dev); - return 0; -} - static int kscan_mock_disable_callback(struct device *dev) { struct kscan_mock_data *data = dev->driver_data; - const struct kscan_mock_config *cfg = dev->config_info; k_delayed_work_cancel(&data->work); return 0; } -static void kscan_mock_work_handler(struct k_work *work) -{ - struct kscan_mock_data *data = - CONTAINER_OF(work, struct kscan_mock_data, work); - struct kscan_mock_config *cfg = data->dev->config_info; - - u32_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)); - data->callback(data->dev, ZMK_MOCK_ROW(ev), ZMK_MOCK_COL(ev), ZMK_MOCK_IS_PRESS(ev)); - kscan_mock_schedule_next_event(data->dev); -} - static int kscan_mock_configure(struct device *dev, kscan_callback_t callback) { struct kscan_mock_data *data = dev->driver_data; @@ -88,30 +45,58 @@ static int kscan_mock_configure(struct device *dev, kscan_callback_t callback) return 0; } -static int kscan_mock_init(struct device *dev) -{ - struct kscan_mock_data *data = dev->driver_data; - const struct kscan_mock_config *cfg = dev->config_info; - - data->dev = dev; - k_delayed_work_init(&data->work, kscan_mock_work_handler); - - return 0; -} - -static const struct kscan_driver_api mock_driver_api = { - .config = kscan_mock_configure, - .enable_callback = kscan_mock_enable_callback, - .disable_callback = kscan_mock_disable_callback, -}; - -static const struct kscan_mock_config kscan_mock_config = { - .events = DT_PROP(MATRIX_NODE_ID, events)}; - -static struct kscan_mock_data kscan_mock_data; - -DEVICE_AND_API_INIT(kscan_mock, DT_INST_LABEL(0), kscan_mock_init, - &kscan_mock_data, - &kscan_mock_config, - APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, - &mock_driver_api); +#define MOCK_INST_INIT(n) \ + struct kscan_mock_config_##n \ + { \ + u32_t events[DT_INST_PROP_LEN(n, events)]; \ + }; \ + 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; \ + if (data->event_index < DT_INST_PROP_LEN(n, events)) \ + { \ + u32_t ev = cfg->events[data->event_index]; \ + LOG_DBG("delaying next keypress: %d", ZMK_MOCK_MSEC(ev)); \ + k_delayed_work_submit(&data->work, K_MSEC(ZMK_MOCK_MSEC(ev))); \ + } \ + } \ + 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; \ + u32_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)); \ + data->callback(data->dev, \ + ZMK_MOCK_ROW(ev), ZMK_MOCK_COL(ev), ZMK_MOCK_IS_PRESS(ev)); \ + kscan_mock_schedule_next_event_##n(data->dev); \ + } \ + static int kscan_mock_init_##n(struct device *dev) \ + { \ + struct kscan_mock_data *data = dev->driver_data; \ + data->dev = dev; \ + k_delayed_work_init(&data->work, kscan_mock_work_handler_##n); \ + return 0; \ + } \ + static int kscan_mock_enable_callback_##n(struct device *dev) \ + { \ + kscan_mock_schedule_next_event_##n(dev); \ + return 0; \ + } \ + static const struct kscan_driver_api mock_driver_api_##n = { \ + .config = kscan_mock_configure, \ + .enable_callback = kscan_mock_enable_callback_##n, \ + .disable_callback = kscan_mock_disable_callback, \ + }; \ + static struct kscan_mock_data kscan_mock_data_##n; \ + static const struct kscan_mock_config_##n kscan_mock_config_##n = { \ + .events = DT_INST_PROP(n, events)}; \ + DEVICE_AND_API_INIT(kscan_mock_##n, DT_INST_LABEL(n), kscan_mock_init_##n, \ + &kscan_mock_data_##n, \ + &kscan_mock_config_##n, \ + APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ + &mock_driver_api_##n); + +DT_INST_FOREACH_STATUS_OKAY(MOCK_INST_INIT)
\ No newline at end of file |