fix(events): Remove our usage of assert.

* __ASSERT is converted to a do/while loop when asserts are enabled, which doesn't work with our usage, so revert that addition.
petejohanson · Jan 14, 2024 · fb23819 · fb23819
1 parent 331915f
commit fb23819
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/app/include/zmk/event_manager.h b/app/include/zmk/event_manager.h
@@ -71,19 +71,14 @@ struct zmk_event_subscription {
             .listener = &zmk_listener_##mod,                                                       \
     };
 
-#define ZMK_ASSERT_EVENT_LIKE(ev)                                                                  \
-    (__ASSERT((uint8_t *)&(ev).header - (uint8_t *)&ev == 0,                                       \
-              "header must be first element of event"))
-
-#define ZMK_EVENT_RAISE(ev) (ZMK_ASSERT_EVENT_LIKE(ev), zmk_event_manager_raise(&(ev).header))
+#define ZMK_EVENT_RAISE(ev) zmk_event_manager_raise(&(ev).header)
 
 #define ZMK_EVENT_RAISE_AFTER(ev, mod)                                                             \
-    (ZMK_ASSERT_EVENT_LIKE(ev), zmk_event_manager_raise_after(&(ev).header, &zmk_listener_##mod))
+    zmk_event_manager_raise_after(&(ev).header, &zmk_listener_##mod)
 
-#define ZMK_EVENT_RAISE_AT(ev, mod)                                                                \
-    (ZMK_ASSERT_EVENT_LIKE(ev), zmk_event_manager_raise_at(&(ev).header, &zmk_listener_##mod))
+#define ZMK_EVENT_RAISE_AT(ev, mod) zmk_event_manager_raise_at(&(ev).header, &zmk_listener_##mod)
 
-#define ZMK_EVENT_RELEASE(ev) (ZMK_ASSERT_EVENT_LIKE(ev), zmk_event_manager_release(&(ev).header))
+#define ZMK_EVENT_RELEASE(ev) zmk_event_manager_release(&(ev).header)
 
 int zmk_event_manager_raise(zmk_event_t *event);
 int zmk_event_manager_raise_after(zmk_event_t *event, const struct zmk_listener *listener);