Merge remote-tracking branch 'upstream/main' into underglow/state-persistence

1 files changed, 22 insertions, 23 deletions

diff --git a/app/src/behaviors/behavior_reset.c b/app/src/behaviors/behavior_reset.c
index 44cbc21..90de20b 100644
--- a/app/src/behaviors/behavior_reset.c
+++ b/app/src/behaviors/behavior_reset.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
@@ -13,33 +13,32 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-struct behavior_reset_config { };
-struct behavior_reset_data { };
-
-static int behavior_reset_init(struct device *dev)
-{
-	return 0;
+struct behavior_reset_config {
+    int type;
 };
 
-static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t _param1, u32_t _param2)
-{
-  // TODO: Correct magic code for going into DFU?
-  // See https://github.com/adafruit/Adafruit_nRF52_Bootloader/blob/d6b28e66053eea467166f44875e3c7ec741cb471/src/main.c#L107
-  sys_reboot(0);
-  return 0;
+static int behavior_reset_init(struct device *dev) { return 0; };
+
+static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t _param1,
+                                     u32_t _param2) {
+    const struct behavior_reset_config *cfg = dev->config_info;
+
+    // TODO: Correct magic code for going into DFU?
+    // See
+    // https://github.com/adafruit/Adafruit_nRF52_Bootloader/blob/d6b28e66053eea467166f44875e3c7ec741cb471/src/main.c#L107
+    sys_reboot(cfg->type);
+    return 0;
 }
 
 static const struct behavior_driver_api behavior_reset_driver_api = {
-  .binding_pressed = on_keymap_binding_pressed,
+    .binding_pressed = on_keymap_binding_pressed,
 };
 
+#define RST_INST(n)                                                                                \
+    static const struct behavior_reset_config behavior_reset_config_##n = {                        \
+        .type = DT_INST_PROP(n, type)};                                                            \
+    DEVICE_AND_API_INIT(behavior_reset_##n, DT_INST_LABEL(n), behavior_reset_init, NULL,           \
+                        &behavior_reset_config_##n, APPLICATION,                                   \
+                        CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_reset_driver_api);
 
-static const struct behavior_reset_config behavior_reset_config = {};
-
-static struct behavior_reset_data behavior_reset_data;
-
-DEVICE_AND_API_INIT(behavior_reset, DT_INST_LABEL(0), behavior_reset_init,
-                    &behavior_reset_data,
-                    &behavior_reset_config,
-                    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
-                    &behavior_reset_driver_api);
\ No newline at end of file
+DT_INST_FOREACH_STATUS_OKAY(RST_INST)
\ No newline at end of file