Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-22 00:56:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use bitclock in avrftdi.c regardless of HAS_BITCLOCK_ADJ

Browse Source
This commit is contained in:
stefanrueger
2025-05-10 00:34:29 +02:00
parent bd58fb8394
commit c434b9ae2b
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/avrftdi.c
View File

@@ -702,18 +702,18 @@ static int avrftdi_open(PROGRAMMER *pgm, const char *port) {
write_flush(pdata);
if(pgm->extra_features & HAS_BITCLOCK_ADJ) {
if(pgm->baudrate && pgm->bitclock && (int) (1.0/pgm->bitclock) != pgm->baudrate)
pmsg_warning("both -b baud and -B bitrate set; ignoring -B\n");
set_frequency(pdata,
pgm->baudrate? pgm->baudrate:
pgm->bitclock? (int) (1.0/pgm->bitclock):
150000
);
} else if(pgm->baudrate || pgm->bitclock) {
pmsg_warning("-c %s does not support adjustable bitclock speed; ignoring %s\n",
pgmid, pgm->baudrate && pgm->bitclock? "-b and -B": pgm->baudrate? "-b": "-B");
}
if(pgm->baudrate || pgm->bitclock)
if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
pmsg_warning("setting bitclock despite HAS_BITCLOCK_ADJ missing in pgm->extra_features\n");
if(pgm->baudrate && pgm->bitclock && (int) (1.0/pgm->bitclock) != pgm->baudrate)
pmsg_warning("both -b baudrate and -B bitrate set; ignoring -B\n");
set_frequency(pdata,
pgm->baudrate? pgm->baudrate:
pgm->bitclock? (int) (1.0/pgm->bitclock):
150000
);
// Set pin limit depending on chip type
switch(pdata->ftdic->type) {

1
src/jtag3.c
View File

@@ -1059,7 +1059,6 @@ static int jtag3_initialize(const PROGRAMMER *pgm, const AVRPART *p) {
if(jtag3_setparm(pgm, SCOPE_AVR, 1, PARM3_CONNECTION, parm, 1) < 0)
return -1;
if(pgm->bitclock && !(pgm->extra_features & HAS_BITCLOCK_ADJ))
pmsg_warning("setting bitclock despite HAS_BITCLOCK_ADJ missing in pgm->extra_features\n");