From a5fa75fcb3de822f4e43dcf29cee6eb9f945a992 Mon Sep 17 00:00:00 2001 From: Danny Nguyen Date: Fri, 2 Nov 2018 15:28:16 -0400 Subject: Move disable JTAG code from `keyboard_init` to `keyboard_setup` This way all split keyboards are using that code instead of just those using split_common with the fix --- quantum/split_common/split_util.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'quantum/split_common/split_util.c') diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c index 8d39329d4..7d1d7ee04 100644 --- a/quantum/split_common/split_util.c +++ b/quantum/split_common/split_util.c @@ -94,10 +94,6 @@ void split_keyboard_setup(void) { void disable_JTAG(void); void keyboard_slave_loop(void) { - // Disable JTAG since we skip calling keyboard_init() on the slave side - // Future fix will possible call keyboard_init() on the slave to remove this need - disable_JTAG(); - matrix_init(); //Init RGB @@ -157,13 +153,3 @@ void matrix_setup(void) { keyboard_slave_loop(); } } - -// Temporary code to disable JTAG on the slave board -void disable_JTAG(void) { - /* Copied from tmk_core/common/keybaord.c */ - // To use PORTF disable JTAG with writing JTD bit twice within four cycles. - #if (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega32U4__)) - MCUCR |= _BV(JTD); - MCUCR |= _BV(JTD); - #endif -} -- cgit v1.2.3-24-g4f1b