aboutsummaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2021-11-02 18:53:46 +0000
committerGitHub <noreply@github.com>2021-11-02 18:53:46 +0000
commit634e42b2b47d32ae8aa933599e63e3761939e3f5 (patch)
tree5079db1b33ae4b13c97339fc36573d967384da15 /quantum
parent0ecd4926b20b3a3240dcb29f5184853c1ec192b8 (diff)
downloadqmk_firmware-634e42b2b47d32ae8aa933599e63e3761939e3f5.tar.gz
qmk_firmware-634e42b2b47d32ae8aa933599e63e3761939e3f5.zip
Revert to old init order for host driver (#15029)
* Partially revert 14888
Diffstat (limited to 'quantum')
-rw-r--r--quantum/main.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/quantum/main.c b/quantum/main.c
index a896a67c6..3814d371c 100644
--- a/quantum/main.c
+++ b/quantum/main.c
@@ -19,11 +19,21 @@
19void platform_setup(void); 19void platform_setup(void);
20 20
21void protocol_setup(void); 21void protocol_setup(void);
22void protocol_init(void); 22void protocol_pre_init(void);
23void protocol_post_init(void);
23void protocol_pre_task(void); 24void protocol_pre_task(void);
24void protocol_post_task(void); 25void protocol_post_task(void);
25 26
26// Bodge as refactoring vusb sucks.... 27// Bodge as refactoring this area sucks....
28void protocol_init(void) __attribute__((weak));
29void protocol_init(void) {
30 protocol_pre_init();
31
32 keyboard_init();
33
34 protocol_post_init();
35}
36
27void protocol_task(void) __attribute__((weak)); 37void protocol_task(void) __attribute__((weak));
28void protocol_task(void) { 38void protocol_task(void) {
29 protocol_pre_task(); 39 protocol_pre_task();
@@ -44,7 +54,6 @@ int main(void) {
44 keyboard_setup(); 54 keyboard_setup();
45 55
46 protocol_init(); 56 protocol_init();
47 keyboard_init();
48 57
49 /* Main loop */ 58 /* Main loop */
50 while (true) { 59 while (true) {