Update bitclock help text

MCUdude · MCUdude · commit 6932030972b9 · 2025-05-08T22:07:05.000+02:00
diff --git a/src/arduino.c b/src/arduino.c
@@ -112,9 +112,11 @@ static int arduino_read_sig_bytes(const PROGRAMMER *pgm, const AVRPART *p, const
 }
 
 static int arduino_open(PROGRAMMER *pgm, const char *port) {
-  union pinfo pinfo;
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
 
   pgm->port = port;
+  union pinfo pinfo;
   pinfo.serialinfo.baud = pgm->baudrate? pgm->baudrate: 115200;
   pinfo.serialinfo.cflags = SERIAL_8N1;
   if(serial_open(port, pinfo, &pgm->fd) == -1) {
diff --git a/src/avr910.c b/src/avr910.c
@@ -321,10 +321,8 @@ static int avr910_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
 }
 
 static int avr910_open(PROGRAMMER *pgm, const char *port) {
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
 
   union pinfo pinfo;
   if(pgm->baudrate == 0)
diff --git a/src/buspirate.c b/src/buspirate.c
@@ -441,10 +441,12 @@ static int buspirate_verifyconfig(const PROGRAMMER *pgm) {
 
 // ====== Programmer methods =======
 static int buspirate_open(PROGRAMMER *pgm, const char *port) {
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ)) {
-      pmsg_warning("%s does not support adjustable bitclock speed using -B.\n", pgmid);
-      imsg_warning("Ignoring -B flag. Use -x help to view alternative SPI clock options\n");
+  if(pgm->bitclock) {
+    if(str_eq(pgm->type, "buspirate_bb"))
+      pmsg_warning("programmer type %s does not support adjustable bitclock speed using -B. Use -i instead\n", pgm->type);
+    else {
+      pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+      imsg_warning("Use -x help to view alternative SPI clock options\n");
     }
   }
 
diff --git a/src/butterfly.c b/src/butterfly.c
@@ -321,10 +321,8 @@ static void butterfly_enable(PROGRAMMER *pgm, const AVRPART *p) {
 }
 
 static int butterfly_open(PROGRAMMER *pgm, const char *port) {
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
 
   pgm->port = port;
 
diff --git a/src/ch341a.c b/src/ch341a.c
@@ -251,10 +251,8 @@ static int ch341a_open(PROGRAMMER *pgm, const char *port) {
     return -1;
   }
 
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
 
   return 0;
 }
diff --git a/src/dryrun.c b/src/dryrun.c
@@ -728,6 +728,9 @@ static void dryrun_disable(const PROGRAMMER *pgm) {
 }
 
 static int dryrun_open(PROGRAMMER *pgm, const char *port) {
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+
   pmsg_debug("%s(%s)\n", __func__, port? port: "NULL");
 
   return 0;
diff --git a/src/flip1.c b/src/flip1.c
@@ -180,10 +180,8 @@ void flip1_initpgm(PROGRAMMER *pgm) {
 #ifdef HAVE_LIBUSB
 
 static int flip1_open(PROGRAMMER *pgm, const char *port_spec) {
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
 
   FLIP1(pgm)->dfu = dfu_open(port_spec);
   return (FLIP1(pgm)->dfu != NULL)? 0: -1;
diff --git a/src/flip2.c b/src/flip2.c
@@ -178,10 +178,8 @@ void flip2_initpgm(PROGRAMMER *pgm) {
 }
 
 static int flip2_open(PROGRAMMER *pgm, const char *port_spec) {
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
 
   FLIP2(pgm)->dfu = dfu_open(port_spec);
   return (FLIP2(pgm)->dfu != NULL)? 0: -1;
diff --git a/src/jtag3.c b/src/jtag3.c
@@ -1060,9 +1060,9 @@ static int jtag3_initialize(const PROGRAMMER *pgm, const AVRPART *p) {
     return -1;
 
 
-  if(pgm->bitclock != 0.0 && !(pgm->extra_features & HAS_BITCLOCK_ADJ))
-    pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-  else {
+  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) {
@@ -1080,7 +1080,6 @@ static int jtag3_initialize(const PROGRAMMER *pgm, const AVRPART *p) {
       if(my.set_sck(pgm, parm) < 0)
         return -1;
     }
-  }
 
 
   if(conn == PARM3_CONN_JTAG) {
diff --git a/src/jtagmkI.c b/src/jtagmkI.c
@@ -452,14 +452,12 @@ static int jtagmkI_initialize(const PROGRAMMER *pgm, const AVRPART *p) {
     }
   }
 
-  if(pgm->bitclock != 0.0) {
+  if(pgm->bitclock) {
     if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-    else {
-      pmsg_notice2("%s(): trying to set JTAG clock period to %.1f us\n", __func__, pgm->bitclock);
-      if(jtagmkI_set_sck_period(pgm, pgm->bitclock) != 0)
-        return -1;
-    }
+      pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
+    pmsg_notice2("%s(): trying to set JTAG clock period to %.1f us\n", __func__, pgm->bitclock);
+    if(jtagmkI_set_sck_period(pgm, pgm->bitclock) != 0)
+      return -1;
   }
 
   cmd[0] = CMD_STOP;
diff --git a/src/jtagmkII.c b/src/jtagmkII.c
@@ -1197,13 +1197,15 @@ static int jtagmkII_initialize(const PROGRAMMER *pgm, const AVRPART *p) {
         serial_setparams(&pgm->fd, pgm->baudrate, SERIAL_8N1);
     }
   }
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-    else if(pgm->flag & PGM_FL_IS_JTAG) {
+  if(pgm->bitclock) {
+    if(pgm->flag & PGM_FL_IS_JTAG) {
+      if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
+        pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
       pmsg_notice2("%s(): trying to set JTAG clock period to %.1f us\n", __func__, pgm->bitclock);
       if(jtagmkII_set_sck_period(pgm, pgm->bitclock) != 0)
         return -1;
+    } else {
+      pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
     }
   }
 
diff --git a/src/linuxgpio.c b/src/linuxgpio.c
@@ -561,16 +561,17 @@ static void linuxgpio_libgpiod_display(const PROGRAMMER *pgm, const char *p) {
 }
 
 static int linuxgpio_libgpiod_open(PROGRAMMER *pgm, const char *port) {
-  int i;
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
 
   if(bitbang_check_prerequisites(pgm) < 0)
     return -1;
 
-  for(i = 0; i < N_PINS; ++i)
+  for(int i = 0; i < N_PINS; ++i)
     linuxgpio_libgpiod_lines[i] = NULL;
 
   // Avrdude assumes that if a pin number is invalid it means not used/available
-  for(i = 1; i < N_PINS; i++) { // The pin enumeration in libavrdude.h starts with PPI_AVR_VCC = 1
+  for(int i = 1; i < N_PINS; i++) { // The pin enumeration in libavrdude.h starts with PPI_AVR_VCC = 1
     int r;
     int gpio_num;
 
diff --git a/src/micronucleus.c b/src/micronucleus.c
@@ -579,10 +579,8 @@ static int micronucleus_chip_erase(const PROGRAMMER *pgm, const AVRPART *p) {
 static int micronucleus_open(PROGRAMMER *pgm, const char *port) {
   pmsg_debug("micronucleus_open(\"%s\")\n", port);
 
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
 
   struct pdata *pdata = &my;
   const char *bus_name = NULL;
diff --git a/src/par.c b/src/par.c
@@ -226,12 +226,9 @@ static void par_enable(PROGRAMMER *pgm, const AVRPART *p) {
 }
 
 static int par_open(PROGRAMMER *pgm, const char *port) {
-  int rc;
 
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed using -B. Use -i instead\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed using -B. Use -i instead\n", pgm->type);
 
   if(bitbang_check_prerequisites(pgm) < 0)
     return -1;
@@ -243,7 +240,7 @@ static int par_open(PROGRAMMER *pgm, const char *port) {
   }
 
   // Save pin values, so they can be restored when device is closed
-  rc = ppi_getall(&pgm->fd, PPIDATA);
+  int rc = ppi_getall(&pgm->fd, PPIDATA);
   if(rc < 0) {
     pmsg_error("unable to read status of ppi data port\n");
     return -1;
diff --git a/src/pickit5.c b/src/pickit5.c
@@ -947,7 +947,7 @@ static int pickit5_initialize(const PROGRAMMER *pgm, const AVRPART *p) {
 
   // Now we try to figure out if we have to supply power from PICkit
   double v_target = 3.30; // Placeholder in case no VTARG Read
-  if(pgm->extra_features & HAS_VTARG_READ){  // If not supported (PK Basic), use a place
+  if(pgm->extra_features & HAS_VTARG_READ) {  // If not supported (PK Basic), use a place
 
     pickit5_get_vtarget(pgm, &v_target);
     if(v_target < 1.8) {
diff --git a/src/serbb_posix.c b/src/serbb_posix.c
@@ -220,10 +220,8 @@ static int serbb_open(PROGRAMMER *pgm, const char *port) {
   int flags;
   int r;
 
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed using -B. Use -i instead\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed using -B. Use -i instead\n", pgm->type);
 
   if(bitbang_check_prerequisites(pgm) < 0)
     return -1;
diff --git a/src/serbb_win32.c b/src/serbb_win32.c
@@ -229,10 +229,8 @@ static int serbb_open(PROGRAMMER *pgm, const char *port) {
   LPVOID lpMsgBuf;
   HANDLE hComPort = INVALID_HANDLE_VALUE;
 
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed using -B. Use -i instead\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed using -B. Use -i instead\n", pgm->type);
 
   if(bitbang_check_prerequisites(pgm) < 0)
     return -1;
diff --git a/src/serialupdi.c b/src/serialupdi.c
@@ -58,13 +58,10 @@ static void serialupdi_teardown(PROGRAMMER *pgm) {
 }
 
 static int serialupdi_open(PROGRAMMER *pgm, const char *port) {
-  pgm->port = port;
-
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s sets its UPDI speed using -b [baudrate]. Ignoring -B flag\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s sets its UPDI speed using -b [baudrate]. Ignoring -B\n", pgm->type);
 
+  pgm->port = port;
   return updi_link_open(pgm);
 }
 
diff --git a/src/stk500.c b/src/stk500.c
@@ -859,11 +859,15 @@ static int stk500_open(PROGRAMMER *pgm, const char *port) {
   if(stk500_getsync(pgm) < 0)
     return -1;
 
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-    else if(pgm->set_sck_period(pgm, pgm->bitclock) != 0)
-      return -1;
+  if(pgm->bitclock) {
+    if(str_eq(pgm->type, "arduino_as_isp")) // The Arduino as ISP will crash if we change the bitclock
+      pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
+    else {
+      if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
+        pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
+      if(pgm->set_sck_period(pgm, pgm->bitclock) != 0)
+        return -1;
+    }
   }
 
   return 0;
diff --git a/src/stk500v2.c b/src/stk500v2.c
@@ -2153,10 +2153,10 @@ static int stk500v2_open(PROGRAMMER *pgm, const char *port) {
   if(stk500v2_drain(pgm, 0) < 0 || stk500v2_getsync(pgm) < 0 || stk500v2_drain(pgm, 0) < 0)
     return -1;
 
-  if(pgm->bitclock != 0.0) {
+  if(pgm->bitclock) {
     if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-    else if(pgm->set_sck_period(pgm, pgm->bitclock) != 0)
+      pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");
+    if(pgm->set_sck_period(pgm, pgm->bitclock) != 0)
       return -1;
   }
 
diff --git a/src/teensy.c b/src/teensy.c
@@ -307,10 +307,8 @@ static int teensy_chip_erase(const PROGRAMMER *pgm, const AVRPART *p) {
 static int teensy_open(PROGRAMMER *pgm, const char *port) {
   pmsg_debug("teensy_open(\"%s\")\n", port);
 
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
 
   struct pdata *pdata = &my;
   const char *bus_name = NULL;
diff --git a/src/urclock.c b/src/urclock.c
@@ -2227,10 +2227,8 @@ static void urclock_disable(const PROGRAMMER *pgm) {
 
 
 static int urclock_open(PROGRAMMER *pgm, const char *port) {
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
 
   union pinfo pinfo;
   pgm->port = port;
diff --git a/src/wiring.c b/src/wiring.c
@@ -135,10 +135,8 @@ static int wiring_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
 }
 
 static int wiring_open(PROGRAMMER *pgm, const char *port) {
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
 
   int timetosnooze;
   union pinfo pinfo;
diff --git a/src/xbee.c b/src/xbee.c
@@ -1416,10 +1416,8 @@ static int xbee_getsync(const PROGRAMMER *pgm) {
 }
 
 static int xbee_open(PROGRAMMER *pgm, const char *port) {
-  if(pgm->bitclock != 0.0) {
-    if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
-      pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);
-  }
+  if(pgm->bitclock)
+    pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);
 
   union pinfo pinfo;
 

Original file line number	Diff line number	Diff line change
`@@ -251,10 +251,8 @@ static int ch341a_open(PROGRAMMER pgm, const char port) {`
`251`	`251`	`return -1;`
`252`	`252`	`}`
`253`	`253`
`254`		`- if(pgm->bitclock != 0.0) {`
`255`		`- if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))`
`256`		`- pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);`
`257`		`- }`
	`254`	`+ if(pgm->bitclock)`
	`255`	`+ pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);`
`258`	`256`
`259`	`257`	`return 0;`
`260`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -728,6 +728,9 @@ static void dryrun_disable(const PROGRAMMER *pgm) {`
`728`	`728`	`}`
`729`	`729`
`730`	`730`	`static int dryrun_open(PROGRAMMER pgm, const char port) {`
	`731`	`+ if(pgm->bitclock)`
	`732`	`+ pmsg_warning("programmer type %s does not support adjustable bitclock speed; ignoring -B\n", pgm->type);`
	`733`	`+`
`731`	`734`	`pmsg_debug("%s(%s)\n", __func__, port? port: "NULL");`
`732`	`735`
`733`	`736`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -452,14 +452,12 @@ static int jtagmkI_initialize(const PROGRAMMER pgm, const AVRPART p) {`
`452`	`452`	`}`
`453`	`453`	`}`
`454`	`454`
`455`		`- if(pgm->bitclock != 0.0) {`
	`455`	`+ if(pgm->bitclock) {`
`456`	`456`	`if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))`
`457`		`- pmsg_warning("%s does not support adjustable bitclock speed. Ignoring -B flag\n", pgmid);`
`458`		`- else {`
`459`		`- pmsg_notice2("%s(): trying to set JTAG clock period to %.1f us\n", __func__, pgm->bitclock);`
`460`		`- if(jtagmkI_set_sck_period(pgm, pgm->bitclock) != 0)`
`461`		`- return -1;`
`462`		`- }`
	`457`	`+ pmsg_warning("setting bitclock despite missing HAS_BITCLOCK_ADJ setting in extra_features\n");`
	`458`	`+ pmsg_notice2("%s(): trying to set JTAG clock period to %.1f us\n", __func__, pgm->bitclock);`
	`459`	`+ if(jtagmkI_set_sck_period(pgm, pgm->bitclock) != 0)`
	`460`	`+ return -1;`
`463`	`461`	`}`
`464`	`462`
`465`	`463`	`cmd[0] = CMD_STOP;`