1 files changed, 24 insertions, 2 deletions

diff --git a/quantum/main.c b/quantum/main.c
index 2cbcd73d8..3814d371c 100644
--- a/quantum/main.c
+++ b/quantum/main.c
@@ -19,8 +19,29 @@
 void platform_setup(void);
 
 void protocol_setup(void);
-void protocol_init(void);
-void protocol_task(void);
+void protocol_pre_init(void);
+void protocol_post_init(void);
+void protocol_pre_task(void);
+void protocol_post_task(void);
+
+// Bodge as refactoring this area sucks....
+void protocol_init(void) __attribute__((weak));
+void protocol_init(void) {
+    protocol_pre_init();
+
+    keyboard_init();
+
+    protocol_post_init();
+}
+
+void protocol_task(void) __attribute__((weak));
+void protocol_task(void) {
+    protocol_pre_task();
+
+    keyboard_task();
+
+    protocol_post_task();
+}
 
 /** \brief Main
  *
@@ -30,6 +51,7 @@ int main(void) __attribute__((weak));
 int main(void) {
     platform_setup();
     protocol_setup();
+    keyboard_setup();
 
     protocol_init();