From c434b9ae2bb7b9b3e43a35dd4d9d4244a5e423ed Mon Sep 17 00:00:00 2001
From: stefanrueger <stefan.rueger@urclocks.com>
Date: Sat, 10 May 2025 00:34:29 +0200
Subject: [PATCH] Use bitclock in avrftdi.c regardless of HAS_BITCLOCK_ADJ

---
 src/avrftdi.c | 24 ++++++++++++------------
 src/jtag3.c   |  1 -
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/avrftdi.c b/src/avrftdi.c
index f5a6bb6f..2cf90cf9 100644
--- a/src/avrftdi.c
+++ b/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) {
diff --git a/src/jtag3.c b/src/jtag3.c
index 19026340..c2960fe7 100644
--- a/src/jtag3.c
+++ b/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");