diff --git a/src/jtag3.c b/src/jtag3.c index e6d5078b..d62a0f7c 100644 --- a/src/jtag3.c +++ b/src/jtag3.c @@ -1063,23 +1063,23 @@ static int jtag3_initialize(const PROGRAMMER *pgm, const AVRPART *p) { if(pgm->bitclock && !(pgm->extra_features & HAS_BITCLOCK_ADJ)) pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n"); - if(conn == PARM3_CONN_PDI || conn == PARM3_CONN_UPDI) - my.set_sck = jtag3_set_sck_xmega_pdi; - else if(conn == PARM3_CONN_JTAG) { - if(is_pdi(p)) - my.set_sck = jtag3_set_sck_xmega_jtag; - else - my.set_sck = jtag3_set_sck_mega_jtag; - } - if(pgm->bitclock && my.set_sck != NULL) { - unsigned int clock = 1E-3/pgm->bitclock; // kHz + if(conn == PARM3_CONN_PDI || conn == PARM3_CONN_UPDI) + my.set_sck = jtag3_set_sck_xmega_pdi; + else if(conn == PARM3_CONN_JTAG) { + if(is_pdi(p)) + my.set_sck = jtag3_set_sck_xmega_jtag; + else + my.set_sck = jtag3_set_sck_mega_jtag; + } + if(pgm->bitclock && my.set_sck != NULL) { + unsigned int clock = 1E-3/pgm->bitclock; // kHz - pmsg_notice2("%s(): trying to set JTAG clock to %u kHz\n", __func__, clock); - parm[0] = clock & 0xff; - parm[1] = (clock >> 8) & 0xff; - if(my.set_sck(pgm, parm) < 0) - return -1; - } + pmsg_notice2("%s(): trying to set JTAG clock to %u kHz\n", __func__, clock); + parm[0] = clock & 0xff; + parm[1] = (clock >> 8) & 0xff; + if(my.set_sck(pgm, parm) < 0) + return -1; + } if(conn == PARM3_CONN_JTAG) {