Add HAS_BITCLOCK_ADJ

Author: MCUdude

src/avr910.c

@@ -334,6 +334,11 @@ static int avr910_open(PROGRAMMER *pgm, const char *port) {
 
   (void) avr910_drain(pgm, 0);
 
+  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);
+  }
+
   return 0;
 }
 

src/avrdude.conf.in

@@ -702,13 +702,17 @@ static int avrftdi_open(PROGRAMMER *pgm, const char *port) {
 
   write_flush(pdata);
 
-  if(pgm->baudrate) {
-    set_frequency(pdata, pgm->baudrate);
-  } else if(pgm->bitclock) {
-    set_frequency(pdata, (uint32_t) (1.0f/pgm->bitclock));
-  } else {
-    set_frequency(pdata, pgm->baudrate? pgm->baudrate: 150000);
-  }
+  if(pgm->extra_features & HAS_BITCLOCK_ADJ) {
+    if(pgm->baudrate)
+      set_frequency(pdata, pgm->baudrate);
+    else if(pgm->bitclock)
+      set_frequency(pdata, (uint32_t) (1.0f/pgm->bitclock));
+    else
+      set_frequency(pdata, pgm->baudrate? pgm->baudrate: 150000);
+  } else if(pgm->baudrate || pgm->bitclock) {
+    pmsg_warning("%s does not support adjustable bitclock speed. Ignoring %s \n",
+      pgmid ,pgm->baudrate && pgm->bitclock? "-b and -B flags": pgm->baudrate? "-b flag": "-B flag");
+    }
 
   // Set pin limit depending on chip type
   switch(pdata->ftdic->type) {

src/avrftdi.c

@@ -457,6 +457,13 @@ static int buspirate_open(PROGRAMMER *pgm, const char *port) {
   // Drain any extraneous input
   serial_drain(&pgm->fd, 0);
 
+  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");
+    }
+  }
+
   return 0;
 }
 

src/buspirate.c

@@ -335,6 +335,11 @@ static int butterfly_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(my.autoreset) {
     // This code assumes a negative-logic USB to TTL serial adapter
     // Set RTS/DTR high to discharge the series-capacitor, if present

src/butterfly.c

@@ -250,6 +250,12 @@ static int ch341a_open(PROGRAMMER *pgm, const char *port) {
     libusb_exit(my.ctx);
     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);
+  }
+
   return 0;
 }
 

src/ch341a.c

@@ -348,6 +348,7 @@ TOKEN *new_constant(const char *con) {
     str_eq(con, "HAS_VTARG_READ")? HAS_VTARG_READ:
     str_eq(con, "HAS_FOSC_ADJ")? HAS_FOSC_ADJ:
     str_eq(con, "HAS_VAREF_ADJ")? HAS_VAREF_ADJ:
+    str_eq(con, "HAS_BITCLOCK_ADJ")? HAS_BITCLOCK_ADJ:
     str_eq(con, "pseudo")? 2:
     str_eq(con, "yes") || str_eq(con, "true")? 1: str_eq(con, "no") || str_eq(con, "false")? 0: (assigned = 0);
 

src/config.c

@@ -145,6 +145,8 @@ static char *extra_features_str(int m) {
     strcat(mode, " | HAS_FOSC_ADJ");
   if(m & HAS_VAREF_ADJ)
     strcat(mode, " | HAS_VAREF_ADJ");
+  if(m & HAS_BITCLOCK_ADJ)
+    strcat(mode, " | HAS_BITCLOCK_ADJ");
 
   return mode + (mode[1] == 0? 0: 4);
 }

src/developer_opts.c

@@ -181,6 +181,12 @@ void flip1_initpgm(PROGRAMMER *pgm) {
 
 static int flip1_open(PROGRAMMER *pgm, const char *port_spec) {
   FLIP1(pgm)->dfu = dfu_open(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);
+  }
+
   return (FLIP1(pgm)->dfu != NULL)? 0: -1;
 }
 

src/flip1.c

@@ -179,6 +179,12 @@ void flip2_initpgm(PROGRAMMER *pgm) {
 
 static int flip2_open(PROGRAMMER *pgm, const char *port_spec) {
   FLIP2(pgm)->dfu = dfu_open(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);
+  }
+
   return (FLIP2(pgm)->dfu != NULL)? 0: -1;
 }