Merge pull request #2061 from stefanrueger/libavrdude_exit

Differentiate `LIBAVRDUDE_EXIT_FAIL` and `..._EXIT_OK`

Author: stefanrueger

src/arduino.c

@@ -56,7 +56,7 @@ static int arduino_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
 
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {

src/avr.c

@@ -471,7 +471,7 @@ int avr_read_mem(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, con
     if(pgm->read_sig_bytes) {
       int rc = pgm->read_sig_bytes(pgm, p, mem);
 
-      if(rc < 0 && rc != LIBAVRDUDE_EXIT)
+      if(rc < 0 && rc != LIBAVRDUDE_EXIT_OK)
         led_set(pgm, LED_ERR);
       led_clr(pgm, LED_PGM);
       return rc;
@@ -1216,13 +1216,13 @@ int avr_signature(const PROGRAMMER *pgm, const AVRPART *p) {
   if(verbose > 1)
     report_progress(0, 1, "Reading");
   rc = avr_read(pgm, p, "signature", 0);
-  if(rc < LIBAVRDUDE_SUCCESS && rc != LIBAVRDUDE_EXIT) {
+  if(rc < LIBAVRDUDE_SUCCESS && rc != LIBAVRDUDE_EXIT_OK) {
     pmsg_error("unable to read signature data for part %s (rc = %d)\n", p->desc, rc);
     return rc;
   }
   report_progress(1, 1, NULL);
 
-  return rc < LIBAVRDUDE_SUCCESS? LIBAVRDUDE_EXIT: LIBAVRDUDE_SUCCESS;
+  return rc < LIBAVRDUDE_SUCCESS? LIBAVRDUDE_EXIT_OK: LIBAVRDUDE_SUCCESS;
 }
 
 // Obtain bitmask for byte in memory (classic, TPI, PDI and UPDI parts)

src/avr910.c

@@ -303,7 +303,7 @@ static int avr910_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
     }
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {

src/avrdude.1

@@ -1665,15 +1665,18 @@ Show help menu and exit.
 .It Ar PICkit 4
 .It Ar MPLAB SNAP
 .Bl -tag -offset indent -width indent
-.It Ar mode=avr,pic
-Switch programmer to AVR or PIC mode, then exit: the PICkit 4 and MPLAB SNAP
-programmer can only be utilised by
+.It Ar mode=avr
+Switch programmer to AVR mode, then exit if not already in AVR mode
+.It Ar mode=<mplab|pic>
+Switch programmer to MPLAB aka PIC mode, then exit
+.Pp
+The PICkit 4 and MPLAB SNAP programmer can only be utilised by
 .Nm
 when in AVR mode. Use
 .Ar -x mode=avr
 for switching to AVR mode, or
-.Ar -x mode=pic
-for switching to PIC mode.
+.Ar -x mode=mplab
+for switching (back) to MPLAB mode.
 .It Ar help
 Show help menu and exit.
 .El

src/avrftdi.c

@@ -1348,7 +1348,7 @@ static int avrftdi_jtag_initialize(const PROGRAMMER *pgm, const AVRPART *p) {
 
       pmsg_error("programmer type %s is known not to work for %s\n", pgm->type, p->desc);
       pmsg_error("exiting, use -F to carry on regardless\n");
-      return LIBAVRDUDE_EXIT;
+      return LIBAVRDUDE_EXIT_FAIL;
     }
   }
 

src/buspirate.c

@@ -395,7 +395,7 @@ static int buspirate_parseextparms(const PROGRAMMER *pgm, const LISTID extparms)
 
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {

src/butterfly.c

@@ -640,7 +640,7 @@ static int butterfly_parseextparms(const PROGRAMMER *pgm, const LISTID extparms)
 
     if(str_eq(extended_param, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {

src/doc/avrdude.texi

@@ -1422,13 +1422,16 @@ The current set-voltage can be read by @code{-x vtarg} alone.
 
 The PICkit 4 and MPLAB(R) SNAP programmers accept the following extended parameters:
 @table @code
-@item mode=avr,mplab/pic
-Switch programmer to AVR or MPLAB mode, then exit: the PICkit 4 and MPLAB(R) SNAP
-programmer can only be utilised by Avrdude when in AVR mode.
-Use @code{-x mode=avr} for switching to AVR mode, or @code{-x mode=mplab}
-for switching to MPLAB mode.
+@item mode=avr
+Switch programmer to AVR mode, then exit unless it was already in AVR mode
+@item mode=<mplab|pic>
+Switch programmer to MPLAB aka PIC mode, then exit
 @end table
 
+The PICkit 4 and MPLAB(R) SNAP programmer can only be utilised by AVRDUDE
+when in AVR mode. Use @code{-x mode=avr} for switching to AVR mode, or
+@code{-x mode=mplab} for switching (back) to MPLAB mode.
+
 @cindex Option @code{-x} PICkit 5
 @cindex @code{-x} PICkit 5
 @cindex MPLAB(R) PICkit 4

src/dryrun.c

@@ -1016,7 +1016,7 @@ static int dryrun_parseextparams(const PROGRAMMER *pgm, const LISTID extparms) {
     }
     if(str_eq(xpara, "help")) {
       help = true;
-      rc = LIBAVRDUDE_EXIT;
+      rc = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {

src/flip2.c

@@ -484,7 +484,7 @@ static int flip2_parseexitspecs(PROGRAMMER *pgm, const char *sp) {
     }
     if(str_eq(cp, "help")) {
       help = true;
-      rv = LIBAVRDUDE_EXIT;
+      rv = LIBAVRDUDE_EXIT_OK;
     }
 
     if(!help) {