3 files changed, 72 insertions, 4 deletions

diff --git a/app/include/drivers/behavior.h b/app/include/drivers/behavior.h
index 84b11ce..f5f5f53 100644
--- a/app/include/drivers/behavior.h
+++ b/app/include/drivers/behavior.h
@@ -22,12 +22,14 @@ extern "C" {
  * (Internal use only.)
  */
 
-typedef int (*behavior_position_pressed_t)(struct device *dev, u32_t param1, u32_t param2);
-typedef int (*behavior_position_released_t)(struct device *dev, u32_t param1, u32_t param2);
+typedef int (*behavior_position_callback_t)(struct device *dev, u32_t param1, u32_t param2);
+typedef int (*behavior_keycode_callback_t)(struct device *dev, u32_t keycode);
 
 __subsystem struct behavior_driver_api {
-	behavior_position_pressed_t position_pressed;
-	behavior_position_released_t position_released;
+	behavior_position_callback_t position_pressed;
+	behavior_position_callback_t position_released;
+	behavior_keycode_callback_t keycode_pressed;
+	behavior_keycode_callback_t keycode_released;
 };
 /**
  * @endcond
@@ -77,6 +79,51 @@ static inline int z_impl_behavior_position_released(struct device *dev, u32_t pa
 	return api->position_released(dev, param1, param2);
 }
 
+/**
+ * @brief Handle the keycode being pressed
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param keycode The keycode that is being pressed.
+ *
+ * @retval 0 If successful.
+ * @retval Negative errno code if failure.
+ */
+__syscall int behavior_keycode_pressed(struct device *dev, u32_t keycode);
+
+static inline int z_impl_behavior_keycode_pressed(struct device *dev, u32_t keycode)
+{
+	const struct behavior_driver_api *api =
+			(const struct behavior_driver_api *)dev->driver_api;
+
+	if (api->keycode_pressed == NULL) {
+		return -ENOTSUP;
+	}
+
+	return api->keycode_pressed(dev, keycode);
+}
+
+
+/**
+ * @brief Handle the keycode being released
+ * @param dev Pointer to the device structure for the driver instance.
+ * @param keycode The keycode that is being pressed.
+ *
+ * @retval 0 If successful.
+ * @retval Negative errno code if failure.
+ */
+__syscall int behavior_keycode_released(struct device *dev, u32_t keycode);
+
+static inline int z_impl_behavior_keycode_released(struct device *dev, u32_t keycode)
+{
+	const struct behavior_driver_api *api =
+			(const struct behavior_driver_api *)dev->driver_api;
+
+	if (api->keycode_released == NULL) {
+		return -ENOTSUP;
+	}
+
+	return api->keycode_released(dev, keycode);
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/app/include/zmk/behavior.h b/app/include/zmk/behavior.h
new file mode 100644
index 0000000..63edcc9
--- /dev/null
+++ b/app/include/zmk/behavior.h
@@ -0,0 +1,8 @@
+
+#pragma once
+
+struct zmk_behavior_binding {
+    char *behavior_dev;
+    u32_t param1;
+    u32_t param2;
+};
\ No newline at end of file
diff --git a/app/include/zmk/events.h b/app/include/zmk/events.h
new file mode 100644
index 0000000..9314b9d
--- /dev/null
+++ b/app/include/zmk/events.h
@@ -0,0 +1,13 @@
+#pragma once
+
+int zmk_events_position_pressed(u32_t row, u32_t column);
+int zmk_events_position_released(u32_t row, u32_t column);
+int zmk_events_keycode_pressed(u32_t keycode);
+int zmk_events_keycode_released(u32_t keycode);
+int zmk_events_mod_pressed(u32_t modifier);
+int zmk_events_mod_released(u32_t modifier);
+int zmk_events_consumer_key_pressed(u32_t usage);
+int zmk_events_consumer_key_released(u32_t usage);
+
+// TODO: Encoders?
+// TODO: Sensors?
\ No newline at end of file