summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorPete Johanson <peter@peterjohanson.com>2020-10-04 23:04:16 -0400
committerGitHub <noreply@github.com>2020-10-04 23:04:16 -0400
commit7d222e15530f2aa634e9cc11e7af3875dd042e97 (patch)
treefbfa138e01e4ea98429100768e374deb9deaf421 /app/src
parent9249d2f4b74b524503a46bc358b07c3fe391a7f5 (diff)
parent4121b07f7f75b81cf1d533632fde858074b0fc03 (diff)
Merge pull request #237 from ChaosinaCan/direct-gpio-fix
Fix direct GPIO when using interrupts
Diffstat (limited to 'app/src')
-rw-r--r--app/src/kscan_composite.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/app/src/kscan_composite.c b/app/src/kscan_composite.c
index 0249140..f8e8d60 100644
--- a/app/src/kscan_composite.c
+++ b/app/src/kscan_composite.c
@@ -38,8 +38,7 @@ struct kscan_composite_data {
};
static int kscan_composite_enable_callback(struct device *dev) {
- for (int i = 0; i < sizeof(kscan_composite_children) / sizeof(kscan_composite_children[0]);
- i++) {
+ for (int i = 0; i < ARRAY_SIZE(kscan_composite_children); i++) {
const struct kscan_composite_child_config *cfg = &kscan_composite_children[i];
kscan_enable_callback(device_get_binding(cfg->label));
@@ -48,8 +47,7 @@ static int kscan_composite_enable_callback(struct device *dev) {
}
static int kscan_composite_disable_callback(struct device *dev) {
- for (int i = 0; i < sizeof(kscan_composite_children) / sizeof(kscan_composite_children[0]);
- i++) {
+ for (int i = 0; i < ARRAY_SIZE(kscan_composite_children); i++) {
const struct kscan_composite_child_config *cfg = &kscan_composite_children[i];
kscan_disable_callback(device_get_binding(cfg->label));
@@ -63,8 +61,7 @@ static void kscan_composite_child_callback(struct device *child_dev, u32_t row,
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++) {
+ for (int i = 0; i < ARRAY_SIZE(kscan_composite_children); i++) {
const struct kscan_composite_child_config *cfg = &kscan_composite_children[i];
if (device_get_binding(cfg->label) != child_dev) {
@@ -82,8 +79,7 @@ static int kscan_composite_configure(struct device *dev, kscan_callback_t callba
return -EINVAL;
}
- for (int i = 0; i < sizeof(kscan_composite_children) / sizeof(kscan_composite_children[0]);
- i++) {
+ for (int i = 0; i < ARRAY_SIZE(kscan_composite_children); i++) {
const struct kscan_composite_child_config *cfg = &kscan_composite_children[i];
kscan_config(device_get_binding(cfg->label), &kscan_composite_child_callback);