Use bitclock in avrftdi.c regardless of HAS_BITCLOCK_ADJ

Author: stefanrueger

src/avrftdi.c

@@ -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) {

src/jtag3.c

@@ -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");