Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Split - Avoid race condition during matrix_init_quantum (#8235)

Browse source 
* Avoid race condition during matrix_init_quantum

* spelling is hard
This commit is contained in:
Joel Challis 2020-02-25 14:10:04 +00:00 • committed by GitHub
parent 891d28a379
commit f6111d49bb
Failed to generate hash of commit
3 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
quantum/split_common/split_util.c
View file

@ -81,19 +81,8 @@ __attribute__((weak)) bool is_keyboard_master(void) {
return (usbstate == MASTER);
}
static void keyboard_master_setup(void) {
#if defined(USE_I2C)
# ifdef SSD1306OLED
matrix_master_OLED_init();
# endif
#endif
transport_master_init();
}
static void keyboard_slave_setup(void) { transport_slave_init(); }
// this code runs before the keyboard is fully initialized
void keyboard_split_setup(void) {
void split_pre_init(void) {
isLeftHand = is_keyboard_left();
#if defined(RGBLIGHT_ENABLE) && defined(RGBLED_SPLIT)
@ -106,8 +95,18 @@ void keyboard_split_setup(void) {
#endif
if (is_keyboard_master()) {
keyboard_master_setup();
} else {
keyboard_slave_setup();
#if defined(USE_I2C) && defined(SSD1306OLED)
matrix_master_OLED_init();
#endif
transport_master_init();
}
}
// this code runs after the keyboard is fully initialized
// - avoids race condition during matrix_init_quantum where slave can start
// receiving before the init process has completed
void split_post_init(void) {
if (!is_keyboard_master()) {
transport_slave_init();
}
}