diff options
author | fauxpark <fauxpark@gmail.com> | 2019-08-21 15:18:52 +1000 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-08-20 22:18:52 -0700 |
commit | f2c179de58c63b2202a490d283fd8fa216680ce7 (patch) | |
tree | b6ac2946b63566f604251af6c2e160457ca5e11c /keyboards/sx60/matrix.c | |
parent | 977c316eb1bdca7f0e13026936322cb9a9fcd0d2 (diff) | |
download | qmk_firmware-f2c179de58c63b2202a490d283fd8fa216680ce7.tar.gz qmk_firmware-f2c179de58c63b2202a490d283fd8fa216680ce7.zip |
Remove superfluous JTAG disable code (#6445)
* Remove superfluous JTAG disable code
* 32A has differently named register
* Accidentally some operators
* 32A also has different JTAG pins
* Wrap disable_jtag() in an ifndef
* Document this new define
* Rename the define, it conflicts with a LUFA thing
Also, move the ifndef wrapping to the call in keyboard_setup()
Diffstat (limited to 'keyboards/sx60/matrix.c')
-rw-r--r-- | keyboards/sx60/matrix.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/keyboards/sx60/matrix.c b/keyboards/sx60/matrix.c index e8e9d6574..58647d13b 100644 --- a/keyboards/sx60/matrix.c +++ b/keyboards/sx60/matrix.c | |||
@@ -113,13 +113,6 @@ uint8_t matrix_cols(void) { | |||
113 | } | 113 | } |
114 | 114 | ||
115 | void matrix_init(void) { | 115 | void matrix_init(void) { |
116 | |||
117 | /* To use PORTF disable JTAG with writing JTD bit twice within four cycles. */ | ||
118 | #if (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega32U4__)) | ||
119 | MCUCR |= _BV(JTD); | ||
120 | MCUCR |= _BV(JTD); | ||
121 | #endif | ||
122 | |||
123 | mcp23018_status = true; | 116 | mcp23018_status = true; |
124 | 117 | ||
125 | /* initialize row and col */ | 118 | /* initialize row and col */ |