diff options
| author | Nick <nick.win999@gmail.com> | 2020-09-07 12:22:18 -0500 |
|---|---|---|
| committer | Nick <nick.win999@gmail.com> | 2020-09-07 12:22:18 -0500 |
| commit | fa40558f73ae0b7f693d93ec931aecf9d52167a1 (patch) | |
| tree | 3ab362de33ea29d2489d8a4414f88044b4e7137c /app/drivers/zephyr/kscan_gpio_matrix.c | |
| parent | bc282a0a4f1af4f6f78a0dd63e5b022eb76a603c (diff) | |
| parent | 61b249666b13f7f356c0e77ee5eb500d672d7dce (diff) | |
Merge commit '61b249666b13f7f356c0e77ee5eb500d672d7dce' into boards/dz60rgb
Diffstat (limited to 'app/drivers/zephyr/kscan_gpio_matrix.c')
| -rw-r--r-- | app/drivers/zephyr/kscan_gpio_matrix.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/drivers/zephyr/kscan_gpio_matrix.c b/app/drivers/zephyr/kscan_gpio_matrix.c index 8e27712..b19c492 100644 --- a/app/drivers/zephyr/kscan_gpio_matrix.c +++ b/app/drivers/zephyr/kscan_gpio_matrix.c @@ -171,7 +171,7 @@ static int kscan_gpio_config_interrupts(struct device **devices, ({ k_work_submit(&data->work); }), \ ({ \ k_delayed_work_cancel(&data->work); \ - k_delayed_work_submit(&data->work, K_MSEC(1)); })) \ + k_delayed_work_submit(&data->work, K_MSEC(5)); })) \ } \ return 0; \ } \ @@ -205,7 +205,13 @@ static int kscan_gpio_config_interrupts(struct device **devices, } \ data->callback = callback; \ return 0; \ - } \ + }; \ + static int kscan_gpio_enable_##n(struct device *dev) \ + { \ + int err = kscan_gpio_enable_interrupts_##n(dev); \ + if (err) { return err; } \ + return kscan_gpio_read_##n(dev); \ + }; \ static int kscan_gpio_init_##n(struct device *dev) \ { \ struct kscan_gpio_data_##n *data = dev->driver_data; \ @@ -258,7 +264,7 @@ static int kscan_gpio_config_interrupts(struct device **devices, } \ static const struct kscan_driver_api gpio_driver_api_##n = { \ .config = kscan_gpio_configure_##n, \ - .enable_callback = kscan_gpio_enable_interrupts_##n, \ + .enable_callback = kscan_gpio_enable_##n, \ .disable_callback = kscan_gpio_disable_interrupts_##n, \ }; \ static const struct kscan_gpio_config_##n kscan_gpio_config_##n = { \ |