avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Consolidate more error messages in term.c

This commit is contained in:
Stefan Rueger 2022-07-12 12:24:30 +01:00
parent f871a4dc1e
commit 63fb79accb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/term.c
View File

@ -316,11 +316,11 @@ static int cmd_dump(PROGRAMMER * pgm, struct avrpart * p,
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
int rc = pgm->read_byte(pgm, p, mem, addr + i, &buf[i]); int rc = pgm->read_byte(pgm, p, mem, addr + i, &buf[i]);
if (rc != 0) { if (rc != 0) {
avrdude_message(MSG_INFO, "error reading %s address 0x%05lx of part %s\n", avrdude_message(MSG_INFO, "%s (dump): error reading %s address 0x%05lx of part %s\n",
mem->desc, (long) addr + i, p->desc); progname, mem->desc, (long) addr + i, p->desc);
if (rc == -1) if (rc == -1)
avrdude_message(MSG_INFO, "read operation not supported on memory type %s\n", avrdude_message(MSG_INFO, "%*sread operation not supported on memory type %s\n",
mem->desc); (int) strlen(progname)+9, "", mem->desc);
return -1; return -1;
} }
report_progress(i, len, NULL); report_progress(i, len, NULL);
@ -597,8 +597,8 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
char * memtype = argv[1]; // Memory name string char * memtype = argv[1]; // Memory name string
AVRMEM * mem = avr_locate_mem(p, memtype); AVRMEM * mem = avr_locate_mem(p, memtype);
if (mem == NULL) { if (mem == NULL) {
avrdude_message(MSG_INFO, "%s memory type not defined for part %s\n", avrdude_message(MSG_INFO, "%s (write): %s memory type not defined for part %s\n",
memtype, p->desc); progname, memtype, p->desc);
return -1; return -1;
} }
int maxsize = mem->size; int maxsize = mem->size;
@ -853,10 +853,10 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
if(data.str_ptr) if(data.str_ptr)
free(data.str_ptr); free(data.str_ptr);
avrdude_message(MSG_NOTICE, "\nInfo: Writing %d bytes starting from address 0x%02lx", avrdude_message(MSG_NOTICE, "Info: writing %d bytes starting from address 0x%02lx",
len + data.bytes_grown, (long) addr); len + data.bytes_grown, (long) addr);
if (write_mode == WRITE_MODE_FILL) if (write_mode == WRITE_MODE_FILL)
avrdude_message(MSG_NOTICE, ". Remaining space filled with %s", argv[argc - 2]); avrdude_message(MSG_NOTICE, "; remaining space filled with %s", argv[argc - 2]);
avrdude_message(MSG_NOTICE, "\n"); avrdude_message(MSG_NOTICE, "\n");
pgm->err_led(pgm, OFF); pgm->err_led(pgm, OFF);
@ -868,8 +868,8 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
avrdude_message(MSG_INFO, "%s (write): error writing 0x%02x at 0x%05lx, rc=%d\n", avrdude_message(MSG_INFO, "%s (write): error writing 0x%02x at 0x%05lx, rc=%d\n",
progname, buf[i], (long) addr+i, (int) rc); progname, buf[i], (long) addr+i, (int) rc);
if (rc == -1) if (rc == -1)
avrdude_message(MSG_INFO, "write operation not supported on memory type %s\n", avrdude_message(MSG_INFO, "%*swrite operation not supported on memory type %s\n",
mem->desc); (int) strlen(progname)+10, "", mem->desc);
werror = true; werror = true;
} }