kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Fixes for review feedback.

Browse source
This commit is contained in:
Peter Johanson 2024-01-26 01:48:46 -08:00 • committed by Pete Johanson
parent 5d960a758f
commit bd21f41412
2 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Kconfig
View file

@ -522,7 +522,7 @@ if ZMK_KSCAN_SIDEBAND_BEHAVIORS
config ZMK_KSCAN_SIDEBAND_BEHAVIORS_INIT_PRIORITY config ZMK_KSCAN_SIDEBAND_BEHAVIORS_INIT_PRIORITY
int "Keyboard scan sideband behaviors driver init priority" int "Keyboard scan sideband behaviors driver init priority"
# The default kscan init priority is 90, so be sure we are lower. # The default kscan init priority is 90, so be sure we are initialized later.
default 95 default 95
endif # ZMK_KSCAN_SIDEBAND_BEHAVIORS endif # ZMK_KSCAN_SIDEBAND_BEHAVIORS

29
app/src/kscan_sideband_behaviors.c
View file

@ -41,44 +41,41 @@ struct ksbb_data {
// KSBBs to check when a kscan callback from the "wrapped" inner kscan fires. // KSBBs to check when a kscan callback from the "wrapped" inner kscan fires.
static const struct device *ksbbs[] = {DT_INST_FOREACH_STATUS_OKAY(GET_KSBB_DEV)}; static const struct device *ksbbs[] = {DT_INST_FOREACH_STATUS_OKAY(GET_KSBB_DEV)};
int find_ksbb_for_inner(const struct device *inner_dev, const struct device **ksbb_dev) { const struct device *find_ksbb_for_inner(const struct device *inner_dev) {
for (int i = 0; i < ARRAY_SIZE(ksbbs); i++) { for (int i = 0; i < ARRAY_SIZE(ksbbs); i++) {
const struct device *ksbb = ksbbs[i]; const struct device *ksbb = ksbbs[i];
const struct ksbb_config *cfg = ksbb->config; const struct ksbb_config *cfg = ksbb->config;
if (cfg->kscan == inner_dev) { if (cfg->kscan == inner_dev) {
*ksbb_dev = ksbb; return ksbb;
return 0;
} }
} }
return -ENODEV; return NULL;
} }
int find_sideband_behavior(const struct device *dev, uint32_t row, uint32_t column, struct ksbb_entry *find_sideband_behavior(const struct device *dev, uint32_t row, uint32_t column) {
struct ksbb_entry **entry) {
const struct ksbb_config *cfg = dev->config; const struct ksbb_config *cfg = dev->config;
for (int e = 0; e < cfg->entries_len; e++) { for (int e = 0; e < cfg->entries_len; e++) {
struct ksbb_entry *candidate = &cfg->entries[e]; struct ksbb_entry *candidate = &cfg->entries[e];
if (candidate->row == row && candidate->column == column) { if (candidate->row == row && candidate->column == column) {
*entry = candidate; return candidate;
return 0;
} }
} }
return -ENODEV; return NULL;
} }
void ksbb_inner_kscan_callback(const struct device *dev, uint32_t row, uint32_t column, void ksbb_inner_kscan_callback(const struct device *dev, uint32_t row, uint32_t column,
bool pressed) { bool pressed) {
struct ksbb_entry *entry = NULL; const struct device *ksbb = find_ksbb_for_inner(dev);
const struct device *ksbb = NULL; if (ksbb) {
if (find_ksbb_for_inner(dev, &ksbb) >= 0) {
struct ksbb_data *data = ksbb->data; struct ksbb_data *data = ksbb->data;
if (find_sideband_behavior(ksbb, row, column, &entry) >= 0) {
struct ksbb_entry *entry = find_sideband_behavior(ksbb, row, column);
if (entry) {
struct zmk_behavior_binding_event event = {.position = INT32_MAX, struct zmk_behavior_binding_event event = {.position = INT32_MAX,
.timestamp = k_uptime_get()}; .timestamp = k_uptime_get()};
@ -159,8 +156,6 @@ static int ksbb_pm_action(const struct device *dev, enum pm_device_action action
#endif // IS_ENABLED(CONFIG_PM_DEVICE) #endif // IS_ENABLED(CONFIG_PM_DEVICE)
#define JUST_ONE(_id) 1
#define ENTRY(e) \ #define ENTRY(e) \
{ \ { \
.row = DT_PROP(e, row), .column = DT_PROP(e, column), \ .row = DT_PROP(e, row), .column = DT_PROP(e, column), \
@ -173,7 +168,7 @@ static int ksbb_pm_action(const struct device *dev, enum pm_device_action action
const struct ksbb_config ksbb_config_##n = { \ const struct ksbb_config ksbb_config_##n = { \
.kscan = DEVICE_DT_GET(DT_INST_PHANDLE(n, kscan)), \ .kscan = DEVICE_DT_GET(DT_INST_PHANDLE(n, kscan)), \
.entries = entries_##n, \ .entries = entries_##n, \
.entries_len = DT_INST_FOREACH_CHILD_STATUS_OKAY_SEP(n, JUST_ONE, (+)), \ .entries_len = ARRAY_SIZE(entries_##n), \
}; \ }; \
struct ksbb_data ksbb_data_##n = {}; \ struct ksbb_data ksbb_data_##n = {}; \
PM_DEVICE_DT_INST_DEFINE(n, ksbb_pm_action); \ PM_DEVICE_DT_INST_DEFINE(n, ksbb_pm_action); \