Merge remote-tracking branch 'upstream/main' into bluetooth/battery-reporting

1 files changed, 21 insertions, 25 deletions

diff --git a/app/src/event_manager.c b/app/src/event_manager.c
index 47ad6b7..226f3ce 100644
--- a/app/src/event_manager.c
+++ b/app/src/event_manager.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
- 
+
 #include <zephyr.h>
 #include <logging/log.h>
 
@@ -11,15 +11,13 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #include <zmk/event-manager.h>
 
-extern struct zmk_event_type* __event_type_start[];
-extern struct zmk_event_type* __event_type_end[];
+extern struct zmk_event_type *__event_type_start[];
+extern struct zmk_event_type *__event_type_end[];
 
 extern struct zmk_event_subscription __event_subscriptions_start[];
 extern struct zmk_event_subscription __event_subscriptions_end[];
 
-
-int zmk_event_manager_handle_from(struct zmk_event_header *event, u8_t start_index)
-{
+int zmk_event_manager_handle_from(struct zmk_event_header *event, u8_t start_index) {
     int ret = 0;
     u8_t len = __event_subscriptions_end - __event_subscriptions_start;
     for (int i = start_index; i < len; i++) {
@@ -31,15 +29,15 @@ int zmk_event_manager_handle_from(struct zmk_event_header *event, u8_t start_ind
                 goto release;
             } else if (ret > 0) {
                 switch (ret) {
-                    case ZMK_EV_EVENT_HANDLED:
-                        LOG_DBG("Listener handled the event");
-                        ret = 0;
-                        goto release;
-                    case ZMK_EV_EVENT_CAPTURED:
-                        LOG_DBG("Listener captured the event");
-                        event->last_listener_index = i;
-                        // Listeners are expected to free events they capture
-                        return 0;
+                case ZMK_EV_EVENT_HANDLED:
+                    LOG_DBG("Listener handled the event");
+                    ret = 0;
+                    goto release;
+                case ZMK_EV_EVENT_CAPTURED:
+                    LOG_DBG("Listener captured the event");
+                    event->last_listener_index = i;
+                    // Listeners are expected to free events they capture
+                    return 0;
                 }
             }
         }
@@ -50,19 +48,18 @@ release:
     return ret;
 }
 
-int zmk_event_manager_raise(struct zmk_event_header *event)
-{
+int zmk_event_manager_raise(struct zmk_event_header *event) {
     return zmk_event_manager_handle_from(event, 0);
 }
 
-int zmk_event_manager_raise_after(struct zmk_event_header *event, const struct zmk_listener *listener)
-{
+int zmk_event_manager_raise_after(struct zmk_event_header *event,
+                                  const struct zmk_listener *listener) {
     u8_t len = __event_subscriptions_end - __event_subscriptions_start;
     for (int i = 0; i < len; i++) {
         struct zmk_event_subscription *ev_sub = __event_subscriptions_start + i;
 
         if (ev_sub->event_type == event->event && ev_sub->listener == listener) {
-            return zmk_event_manager_handle_from(event, i+1);
+            return zmk_event_manager_handle_from(event, i + 1);
         }
     }
 
@@ -71,8 +68,8 @@ int zmk_event_manager_raise_after(struct zmk_event_header *event, const struct z
     return -EINVAL;
 }
 
-int zmk_event_manager_raise_at(struct zmk_event_header *event, const struct zmk_listener *listener)
-{
+int zmk_event_manager_raise_at(struct zmk_event_header *event,
+                               const struct zmk_listener *listener) {
     u8_t len = __event_subscriptions_end - __event_subscriptions_start;
     for (int i = 0; i < len; i++) {
         struct zmk_event_subscription *ev_sub = __event_subscriptions_start + i;
@@ -87,7 +84,6 @@ int zmk_event_manager_raise_at(struct zmk_event_header *event, const struct zmk_
     return -EINVAL;
 }
 
-int zmk_event_manager_release(struct zmk_event_header *event)
-{
+int zmk_event_manager_release(struct zmk_event_header *event) {
     return zmk_event_manager_handle_from(event, event->last_listener_index + 1);
 }