diff options
author | Danny Nguyen <danny@keeb.io> | 2018-11-02 15:28:16 -0400 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2018-11-02 14:31:29 -0700 |
commit | a5fa75fcb3de822f4e43dcf29cee6eb9f945a992 (patch) | |
tree | 38e37e3e83e34f611293a266b59be0cee906de34 /quantum/split_common/split_util.c | |
parent | 5779ffb59a2e36fd45c3d4000d41ad73ad140de3 (diff) | |
download | qmk_firmware-a5fa75fcb3de822f4e43dcf29cee6eb9f945a992.tar.gz qmk_firmware-a5fa75fcb3de822f4e43dcf29cee6eb9f945a992.zip |
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
Diffstat (limited to 'quantum/split_common/split_util.c')
-rw-r--r-- | quantum/split_common/split_util.c | 14 |
1 files changed, 0 insertions, 14 deletions
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) { | |||
94 | 94 | ||
95 | void disable_JTAG(void); | 95 | void disable_JTAG(void); |
96 | void keyboard_slave_loop(void) { | 96 | void keyboard_slave_loop(void) { |
97 | // Disable JTAG since we skip calling keyboard_init() on the slave side | ||
98 | // Future fix will possible call keyboard_init() on the slave to remove this need | ||
99 | disable_JTAG(); | ||
100 | |||
101 | matrix_init(); | 97 | matrix_init(); |
102 | 98 | ||
103 | //Init RGB | 99 | //Init RGB |
@@ -157,13 +153,3 @@ void matrix_setup(void) { | |||
157 | keyboard_slave_loop(); | 153 | keyboard_slave_loop(); |
158 | } | 154 | } |
159 | } | 155 | } |
160 | |||
161 | // Temporary code to disable JTAG on the slave board | ||
162 | void disable_JTAG(void) { | ||
163 | /* Copied from tmk_core/common/keybaord.c */ | ||
164 | // To use PORTF disable JTAG with writing JTD bit twice within four cycles. | ||
165 | #if (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega32U4__)) | ||
166 | MCUCR |= _BV(JTD); | ||
167 | MCUCR |= _BV(JTD); | ||
168 | #endif | ||
169 | } | ||