From 634e42b2b47d32ae8aa933599e63e3761939e3f5 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 2 Nov 2021 18:53:46 +0000
Subject: Revert to old init order for host driver (#15029)

* Partially revert 14888
---
 quantum/main.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'quantum/main.c')

diff --git a/quantum/main.c b/quantum/main.c
index a896a67c66..3814d371c1 100644
--- a/quantum/main.c
+++ b/quantum/main.c
@@ -19,11 +19,21 @@
 void platform_setup(void);
 
 void protocol_setup(void);
-void protocol_init(void);
+void protocol_pre_init(void);
+void protocol_post_init(void);
 void protocol_pre_task(void);
 void protocol_post_task(void);
 
-// Bodge as refactoring vusb sucks....
+// 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();
@@ -44,7 +54,6 @@ int main(void) {
     keyboard_setup();
 
     protocol_init();
-    keyboard_init();
 
     /* Main loop */
     while (true) {
-- 
cgit v1.2.3