From 596a4a8ac9d0efc20d9f97a65130facf0e2f89ad Mon Sep 17 00:00:00 2001
From: Stefan Rueger <stefan.rueger@urclocks.com>
Date: Mon, 19 Aug 2024 23:18:44 +0100
Subject: [PATCH] Crisp up programmer type descriptions

---
 src/arduino.c        | 2 +-
 src/avr910.c         | 2 +-
 src/avrftdi.c        | 2 +-
 src/buspirate.c      | 4 ++--
 src/butterfly.c      | 2 +-
 src/ch341a.c         | 2 +-
 src/doc/avrdude.texi | 4 ++--
 src/ft245r.c         | 2 +-
 src/usbtiny.c        | 2 +-
 src/wiring.c         | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/arduino.c b/src/arduino.c
index 5bbff776..fe3ac72f 100644
--- a/src/arduino.c
+++ b/src/arduino.c
@@ -155,7 +155,7 @@ static void arduino_close(PROGRAMMER *pgm) {
   pgm->fd.ifd = -1;
 }
 
-const char arduino_desc[] = "Arduino programmer";
+const char arduino_desc[] = "Arduino programmer for bootloading";
 
 void arduino_initpgm(PROGRAMMER *pgm) {
   /* This is mostly a STK500; just the signature is read
diff --git a/src/avr910.c b/src/avr910.c
index a7a19ed2..ada92b38 100644
--- a/src/avr910.c
+++ b/src/avr910.c
@@ -644,7 +644,7 @@ static int avr910_read_sig_bytes(const PROGRAMMER *pgm, const AVRPART *p, const
   return 3;
 }
 
-const char avr910_desc[] = "Serial programmers using protocol described in application note AVR910";
+const char avr910_desc[] = "Serial programmer using protocol from appnote AVR910";
 
 void avr910_initpgm(PROGRAMMER *pgm) {
   strcpy(pgm->type, "avr910");
diff --git a/src/avrftdi.c b/src/avrftdi.c
index 4a106260..51f5afdd 100644
--- a/src/avrftdi.c
+++ b/src/avrftdi.c
@@ -1739,5 +1739,5 @@ void avrftdi_jtag_initpgm(PROGRAMMER *pgm) {
 }
 #endif // DO_NOT_BUILD_AVRFTDI
 
-const char avrftdi_desc[] = "Interface to the MPSSE Engine of FTDI Chips using libftdi.";
+const char avrftdi_desc[] = "Interface to the MPSSE Engine of FTDI chips using libftdi";
 const char avrftdi_jtag_desc[] = "libftdi JTAG interface";
diff --git a/src/buspirate.c b/src/buspirate.c
index 225c9b86..15b4224f 100644
--- a/src/buspirate.c
+++ b/src/buspirate.c
@@ -1119,7 +1119,7 @@ static void buspirate_teardown(PROGRAMMER *pgm) {
   pgm->cookie = NULL;
 }
 
-const char buspirate_desc[] = "Using the Bus Pirate's SPI interface for programming";
+const char buspirate_desc[] = "Bus Pirate's SPI interface";
 
 void buspirate_initpgm(PROGRAMMER *pgm) {
   strcpy(pgm->type, "BusPirate");
@@ -1306,7 +1306,7 @@ static void buspirate_bb_powerdown(const PROGRAMMER *pgm) {
   buspirate_bb_setpin_internal(pgm, 7, 0);
 }
 
-const char buspirate_bb_desc[] = "Using the Bus Pirate's bitbang interface for programming";
+const char buspirate_bb_desc[] = "Bus Pirate's bitbang interface";
 
 void buspirate_bb_initpgm(PROGRAMMER *pgm) {
   strcpy(pgm->type, "BusPirate_BB");
diff --git a/src/butterfly.c b/src/butterfly.c
index fc0d299b..4aabd59b 100644
--- a/src/butterfly.c
+++ b/src/butterfly.c
@@ -659,7 +659,7 @@ static int butterfly_parseextparms(const PROGRAMMER *pgm, const LISTID extparms)
   return rv;
 }
 
-const char butterfly_desc[] = "Atmel Butterfly evaluation board; Atmel AppNotes AVR109, AVR911";
+const char butterfly_desc[] = "Atmel Butterfly evaluation board (AVR109, AVR911)";
 
 void butterfly_initpgm(PROGRAMMER *pgm) {
   strcpy(pgm->type, "butterfly");
diff --git a/src/ch341a.c b/src/ch341a.c
index 5202182b..a2b60132 100644
--- a/src/ch341a.c
+++ b/src/ch341a.c
@@ -477,4 +477,4 @@ void ch341a_initpgm(PROGRAMMER *pgm) {
 }
 #endif                          // !defined(HAVE_LIBUSB_1_0)
 
-const char ch341a_desc[] = "Programmer chip CH341A (AVR must have minimum F_CPU of 6.8 MHz)";
+const char ch341a_desc[] = "Chip CH341A: AVR must have min F_CPU of 6.8 MHz";
diff --git a/src/doc/avrdude.texi b/src/doc/avrdude.texi
index 542ea842..af88bc5d 100644
--- a/src/doc/avrdude.texi
+++ b/src/doc/avrdude.texi
@@ -525,7 +525,7 @@ following programmer ids are understood and supported:
 
 @cindex Programmer support
 
-@multitable @columnfractions .3 .68
+@multitable @columnfractions .22 .73
 @include programmers.texi
 @end multitable
 
@@ -3644,7 +3644,7 @@ the polarity of all pins in a list use @code{~(<num1> [, <num2> ... ])}
 @noindent
 The following programmer types are currently implemented:
 
-@multitable @columnfractions .25 .6
+@multitable @columnfractions .21 .75
 @include programmer_types.texi
 @end multitable
 
diff --git a/src/ft245r.c b/src/ft245r.c
index d7e32077..437cc62f 100644
--- a/src/ft245r.c
+++ b/src/ft245r.c
@@ -1238,4 +1238,4 @@ void ft245r_initpgm(PROGRAMMER *pgm) {
 }
 #endif
 
-const char ft245r_desc[] = "FT245R/FT232R synchronous bit-bang programmer of type ftdi_syncbb";
+const char ft245r_desc[] = "FT245R/FT232R synchronous bit-bang programmer";
diff --git a/src/usbtiny.c b/src/usbtiny.c
index 8c9df8e1..50ed7797 100644
--- a/src/usbtiny.c
+++ b/src/usbtiny.c
@@ -771,4 +771,4 @@ void usbtiny_initpgm(PROGRAMMER *pgm) {
 }
 #endif                          // HAVE_LIBUSB
 
-const char usbtiny_desc[] = "Usbtiny-type programmers incl arduinoisp, arduino_gemma and adafruit_gemma";
+const char usbtiny_desc[] = "Usbtiny programmer (also as bootloading protocol)";
diff --git a/src/wiring.c b/src/wiring.c
index ca6186d2..6ddb4bf3 100644
--- a/src/wiring.c
+++ b/src/wiring.c
@@ -188,7 +188,7 @@ static void wiring_close(PROGRAMMER *pgm) {
   pgm->fd.ifd = -1;
 }
 
-const char wiring_desc[] = "Bootloader using STK500v2 protocol, see http://wiring.org.co";
+const char wiring_desc[] = "Bootloader using the STK500v2 protocol (AVR068)";
 
 void wiring_initpgm(PROGRAMMER *pgm) {
   // The Wiring bootloader uses a near-complete STK500v2 protocol