Move disable_jtag to platforms (#16960)
This commit is contained in:
parent
0de08b09e7
commit
d458d4a596
2 changed files with 13 additions and 16 deletions
|
@ -16,6 +16,17 @@
|
||||||
|
|
||||||
#include "platform_deps.h"
|
#include "platform_deps.h"
|
||||||
|
|
||||||
void platform_setup(void) {
|
static void disable_jtag(void) {
|
||||||
// do nothing
|
// To use PF4-7 (PC2-5 on ATmega32A), disable JTAG by writing JTD bit twice within four cycles.
|
||||||
|
#if (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
|
||||||
|
MCUCR |= _BV(JTD);
|
||||||
|
MCUCR |= _BV(JTD);
|
||||||
|
#elif defined(__AVR_ATmega32A__)
|
||||||
|
MCUCSR |= _BV(JTD);
|
||||||
|
MCUCSR |= _BV(JTD);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void platform_setup(void) {
|
||||||
|
disable_jtag();
|
||||||
}
|
}
|
||||||
|
|
|
@ -211,17 +211,6 @@ static inline bool has_ghost_in_row(uint8_t row, matrix_row_t rowdata) {
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void disable_jtag(void) {
|
|
||||||
// To use PF4-7 (PC2-5 on ATmega32A), disable JTAG by writing JTD bit twice within four cycles.
|
|
||||||
#if (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
|
|
||||||
MCUCR |= _BV(JTD);
|
|
||||||
MCUCR |= _BV(JTD);
|
|
||||||
#elif defined(__AVR_ATmega32A__)
|
|
||||||
MCUCSR |= _BV(JTD);
|
|
||||||
MCUCSR |= _BV(JTD);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/** \brief matrix_setup
|
/** \brief matrix_setup
|
||||||
*
|
*
|
||||||
* FIXME: needs doc
|
* FIXME: needs doc
|
||||||
|
@ -263,9 +252,6 @@ __attribute__((weak)) void keyboard_post_init_kb(void) {
|
||||||
* FIXME: needs doc
|
* FIXME: needs doc
|
||||||
*/
|
*/
|
||||||
void keyboard_setup(void) {
|
void keyboard_setup(void) {
|
||||||
#ifndef NO_JTAG_DISABLE
|
|
||||||
disable_jtag();
|
|
||||||
#endif
|
|
||||||
print_set_sendchar(sendchar);
|
print_set_sendchar(sendchar);
|
||||||
#ifdef EEPROM_DRIVER
|
#ifdef EEPROM_DRIVER
|
||||||
eeprom_driver_init();
|
eeprom_driver_init();
|
||||||
|
|
Loading…
Reference in a new issue