Merge pull request #1194 from stefanrueger/exitrc

Fix shell exit value when chip erase is delayed to next flash write

src/avr.c

@@ -145,8 +145,8 @@ int avr_tpi_program_enable(const PROGRAMMER *pgm, const AVRPART *p, unsigned cha
 
 /* TPI: setup NVMCMD register and pointer register (PR) for read/write/erase */
 static int avr_tpi_setup_rw(const PROGRAMMER *pgm, const AVRMEM *mem,
-			    unsigned long addr, unsigned char nvmcmd)
+  unsigned long addr, unsigned char nvmcmd) {
-{
+
   unsigned char cmd[4];
   int rc;
 
@@ -448,9 +448,7 @@ int avr_read_mem(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *mem, con
   }
 
   for (i=0; i < (unsigned long) mem->size; i++) {
-    if (vmem == NULL ||
+    if (vmem == NULL || (vmem->tags[i] & TAG_ALLOCATED) != 0) {
-	(vmem->tags[i] & TAG_ALLOCATED) != 0)
-    {
       rc = pgm->read_byte(pgm, p, mem, i, mem->buf + i);
       if (rc != LIBAVRDUDE_SUCCESS) {
         pmsg_error("unable to read byte at address 0x%04lx\n", i);
@@ -711,9 +709,7 @@ int avr_write_byte_default(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM
       gettimeofday (&tv, NULL);
       start_time = (tv.tv_sec * 1000000) + tv.tv_usec;
       do {
-        /*
+        // Do polling, but timeout after max_write_delay
-         * Do polling, but timeout after max_write_delay.
-	 */
         rc = pgm->read_byte(pgm, p, mem, addr, &r);
         if (rc != 0) {
           pgm->pgm_led(pgm, OFF);
@@ -1326,16 +1322,24 @@ void avr_add_mem_order(const char *str) {
   exit(1);
 }
 
+int avr_memtype_is_flash_type(const char *memtype) {
+  return memtype && (
+     strcmp(memtype, "flash") == 0 ||
+     strcmp(memtype, "application") == 0 ||
+     strcmp(memtype, "apptable") == 0 ||
+     strcmp(memtype, "boot") == 0);
+}
+
 int avr_mem_is_flash_type(const AVRMEM *mem) {
-  return
+  return avr_memtype_is_flash_type(mem->desc);
-     strcmp(mem->desc, "flash") == 0 ||
+}
-     strcmp(mem->desc, "application") == 0 ||
+
-     strcmp(mem->desc, "apptable") == 0 ||
+int avr_memtype_is_eeprom_type(const char *memtype) {
-     strcmp(mem->desc, "boot") == 0;
+  return memtype && strcmp(memtype, "eeprom") == 0;
 }
 
 int avr_mem_is_eeprom_type(const AVRMEM *mem) {
-  return strcmp(mem->desc, "eeprom") == 0;
+  return avr_memtype_is_eeprom_type(mem->desc);
 }
 
 int avr_mem_is_known(const char *str) {

src/libavrdude.h

@@ -899,8 +899,12 @@ int avr_put_cycle_count(const PROGRAMMER *pgm, const AVRPART *p, int cycles);
 
 void avr_add_mem_order(const char *str);
 
+int avr_memtype_is_flash_type(const char *mem);
+
 int avr_mem_is_flash_type(const AVRMEM *mem);
 
+int avr_memtype_is_eeprom_type(const char *mem);
+
 int avr_mem_is_eeprom_type(const AVRMEM *mem);
 
 int avr_mem_is_known(const char *str);

src/main.c

@@ -495,6 +495,7 @@ int main(int argc, char * argv [])
   int     ispdelay;    /* Specify the delay for ISP clock */
   int     init_ok;     /* Device initialization worked well */
   int     is_open;     /* Device open succeeded */
+  int     ce_delayed;  /* Chip erase delayed */
   char  * logfile;     /* Use logfile rather than stderr for diagnostics */
   enum updateflags uflags = UF_AUTO_ERASE | UF_VERIFY; /* Flags for do_op() */
 
@@ -574,6 +575,7 @@ int main(int argc, char * argv [])
   bitclock      = 0.0;
   ispdelay      = 0;
   is_open       = 0;
+  ce_delayed    = 0;
   logfile       = NULL;
 
   len = strlen(progname) + 2;
@@ -1400,7 +1402,8 @@ int main(int argc, char * argv [])
       exitrc = avr_chip_erase(pgm, p);
       if(exitrc == LIBAVRDUDE_SOFTFAIL) {
         imsg_info("delaying chip erase until first -U upload to flash\n");
-        exitrc = 1;
+        ce_delayed = 1;
+        exitrc = 0;
       } else if(exitrc)
         goto main_exit;
     }
@@ -1428,7 +1431,8 @@ int main(int argc, char * argv [])
     if (rc && rc != LIBAVRDUDE_SOFTFAIL) {
       exitrc = 1;
       break;
-    }
+    } else if(rc == 0 && upd->op == DEVICE_WRITE && avr_memtype_is_flash_type(upd->memtype))
+      ce_delayed = 0;           // Redeemed chip erase promise
   }
 
 main_exit:
@@ -1449,5 +1453,5 @@ main_exit:
 
   msg_info("\n%s done.  Thank you.\n\n", progname);
 
-  return exitrc;
+  return ce_delayed? 1: exitrc;
 }