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

Consolidate error messages in term.c

This commit is contained in:
Stefan Rueger 2022-07-12 11:58:51 +01:00
parent 56113f6d8a
commit 8140c9c90b
1 changed files with 74 additions and 75 deletions

97
src/term.c
View File

@ -248,8 +248,8 @@ static int cmd_dump(PROGRAMMER * pgm, struct avrpart * p,
char * memtype = argv[1]; char * memtype = argv[1];
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 (dump): %s memory type not defined for part %s\n",
memtype, p->desc); progname, memtype, p->desc);
return -1; return -1;
} }
uint32_t maxsize = mem->size; uint32_t maxsize = mem->size;
@ -261,12 +261,12 @@ static int cmd_dump(PROGRAMMER * pgm, struct avrpart * p,
if (argc >= 3 && strcmp(argv[2], "...") != 0) { if (argc >= 3 && strcmp(argv[2], "...") != 0) {
addr = strtoul(argv[2], &end_ptr, 0); addr = strtoul(argv[2], &end_ptr, 0);
if (*end_ptr || (end_ptr == argv[2])) { if (*end_ptr || (end_ptr == argv[2])) {
avrdude_message(MSG_INFO, "%s (%s): can't parse address \"%s\"\n", avrdude_message(MSG_INFO, "%s (dump): can't parse address %s\n",
progname, argv[0], argv[2]); progname, argv[2]);
return -1; return -1;
} else if (addr >= maxsize) { } else if (addr >= maxsize) {
avrdude_message(MSG_INFO, "%s (%s): address 0x%05lx is out of range for %s memory\n", avrdude_message(MSG_INFO, "%s (dump): address 0x%05lx is out of range for %s memory\n",
progname, argv[0], addr, mem->desc); progname, (long) addr, mem->desc);
return -1; return -1;
} }
} }
@ -282,8 +282,8 @@ static int cmd_dump(PROGRAMMER * pgm, struct avrpart * p,
} else if (argc == 4) { } else if (argc == 4) {
len = strtol(argv[3], &end_ptr, 0); len = strtol(argv[3], &end_ptr, 0);
if (*end_ptr || (end_ptr == argv[3])) { if (*end_ptr || (end_ptr == argv[3])) {
avrdude_message(MSG_INFO, "%s (%s): can't parse length \"%s\"\n", avrdude_message(MSG_INFO, "%s (dump): can't parse length %s\n",
progname, argv[0], argv[3]); progname, argv[3]);
return -1; return -1;
} }
} else { } else {
@ -317,9 +317,9 @@ static int cmd_dump(PROGRAMMER * pgm, struct avrpart * p,
int32_t rc = pgm->read_byte(pgm, p, mem, addr + i, &buf[i]); int32_t 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, "error reading %s address 0x%05lx of part %s\n",
mem->desc, addr + i, p->desc); 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, "read operation not supported on memory type %s\n",
mem->desc); mem->desc);
return -1; return -1;
} }
@ -573,7 +573,7 @@ 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 memory type not defined for part %s\n",
memtype, p->desc); memtype, p->desc);
return -1; return -1;
} }
@ -582,14 +582,14 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
char * end_ptr; char * end_ptr;
int32_t addr = strtoul(argv[2], &end_ptr, 0); int32_t addr = strtoul(argv[2], &end_ptr, 0);
if (*end_ptr || (end_ptr == argv[2])) { if (*end_ptr || (end_ptr == argv[2])) {
avrdude_message(MSG_INFO, "%s (write): can't parse address \"%s\"\n", avrdude_message(MSG_INFO, "%s (write): can't parse address %s\n",
progname, argv[2]); progname, argv[2]);
return -1; return -1;
} }
if (addr > maxsize) { if (addr > maxsize) {
avrdude_message(MSG_INFO, "%s (write): address 0x%05lx is out of range for %s memory\n", avrdude_message(MSG_INFO, "%s (write): address 0x%05lx is out of range for %s memory\n",
progname, addr, memtype); progname, (long) addr, memtype);
return -1; return -1;
} }
@ -606,7 +606,7 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
start_offset = 4; start_offset = 4;
len = strtoul(argv[3], &end_ptr, 0); len = strtoul(argv[3], &end_ptr, 0);
if (*end_ptr || (end_ptr == argv[3])) { if (*end_ptr || (end_ptr == argv[3])) {
avrdude_message(MSG_INFO, "%s (write ...): can't parse length \"%s\"\n", avrdude_message(MSG_INFO, "%s (write ...): can't parse length %s\n",
progname, argv[3]); progname, argv[3]);
free(buf); free(buf);
return -1; return -1;
@ -639,7 +639,8 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
}; };
if(sizeof(long long) != sizeof(int64_t) || (data.a[0]^data.a[7]) != 1) if(sizeof(long long) != sizeof(int64_t) || (data.a[0]^data.a[7]) != 1)
avrdude_message(MSG_INFO, "%s (write): assumption on data types not met? check source and recompile\n", progname); avrdude_message(MSG_INFO, "%s (write): assumption on data types not met? "
"Check source and recompile\n", progname);
bool is_big_endian = data.a[7]; bool is_big_endian = data.a[7];
for (i = start_offset; i < len + start_offset; i++) { for (i = start_offset; i < len + start_offset; i++) {
@ -734,10 +735,8 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
if(is_outside_int64_t || is_out_of_range) if(is_outside_int64_t || is_out_of_range)
avrdude_message(MSG_INFO, "%s (write): %s out of int%d_t range, " avrdude_message(MSG_INFO, "%s (write): %s out of int%d_t range, "
"interpreted as %d-byte %lld%s; consider 'U' suffix\n", "interpreted as %d-byte %lld; consider 'U' suffix\n",
progname, argi, data.size*8, data.size, data.ll, progname, argi, data.size*8, data.size, data.ll);
is_out_of_range? " (unlikely what you want)": ""
);
} }
} }
} }
@ -776,7 +775,7 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
data.str_ptr = s; data.str_ptr = s;
} }
} else { } else {
avrdude_message(MSG_INFO, "\n%s (write): can't parse data '%s'\n", avrdude_message(MSG_INFO, "%s (write): can't parse data %s\n",
progname, argi); progname, argi);
free(buf); free(buf);
if(data.str_ptr != NULL) if(data.str_ptr != NULL)
@ -819,8 +818,7 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
if ((addr + len + data.bytes_grown) > maxsize) { if ((addr + len + data.bytes_grown) > maxsize) {
avrdude_message(MSG_INFO, "%s (write): selected address and # bytes exceed " avrdude_message(MSG_INFO, "%s (write): selected address and # bytes exceed "
"range for %s memory\n", "range for %s memory\n", progname, memtype);
progname, memtype);
free(buf); free(buf);
return -1; return -1;
} }
@ -828,8 +826,8 @@ 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%02x", avrdude_message(MSG_NOTICE, "\nInfo: Writing %d bytes starting from address 0x%02lx",
len + data.bytes_grown, 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");
@ -841,9 +839,9 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
int32_t rc = avr_write_byte(pgm, p, mem, addr+i, buf[i]); int32_t rc = avr_write_byte(pgm, p, mem, addr+i, buf[i]);
if (rc) { if (rc) {
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], addr+i, 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, "write operation not supported on memory type %s\n",
mem->desc); mem->desc);
werror = true; werror = true;
} }
@ -852,7 +850,7 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
rc = pgm->read_byte(pgm, p, mem, addr+i, &b); rc = pgm->read_byte(pgm, p, mem, addr+i, &b);
if (b != buf[i]) { if (b != buf[i]) {
avrdude_message(MSG_INFO, "%s (write): error writing 0x%02x at 0x%05lx cell=0x%02x\n", avrdude_message(MSG_INFO, "%s (write): error writing 0x%02x at 0x%05lx cell=0x%02x\n",
progname, buf[i], addr+i, b); progname, buf[i], (long) addr+i, b);
werror = true; werror = true;
} }
@ -879,14 +877,14 @@ static int cmd_send(PROGRAMMER * pgm, struct avrpart * p,
int len; int len;
if (pgm->cmd == NULL) { if (pgm->cmd == NULL) {
avrdude_message(MSG_INFO, "The %s programmer does not support direct ISP commands.\n", avrdude_message(MSG_INFO, "%s (send): the %s programmer does not support direct ISP commands\n",
pgm->type); progname, pgm->type);
return -1; return -1;
} }
if (spi_mode && (pgm->spi == NULL)) { if (spi_mode && (pgm->spi == NULL)) {
avrdude_message(MSG_INFO, "The %s programmer does not support direct SPI transfers.\n", avrdude_message(MSG_INFO, "%s (send): the %s programmer does not support direct SPI transfers\n",
pgm->type); progname, pgm->type);
return -1; return -1;
} }
@ -905,7 +903,7 @@ static int cmd_send(PROGRAMMER * pgm, struct avrpart * p,
for (i=1; i<argc; i++) { for (i=1; i<argc; i++) {
cmd[i-1] = strtoul(argv[i], &e, 0); cmd[i-1] = strtoul(argv[i], &e, 0);
if (*e || (e == argv[i])) { if (*e || (e == argv[i])) {
avrdude_message(MSG_INFO, "%s (send): can't parse byte \"%s\"\n", avrdude_message(MSG_INFO, "%s (send): can't parse byte %s\n",
progname, argv[i]); progname, argv[i]);
return -1; return -1;
} }
@ -961,14 +959,14 @@ static int cmd_sig(PROGRAMMER * pgm, struct avrpart * p,
rc = avr_signature(pgm, p); rc = avr_signature(pgm, p);
if (rc != 0) { if (rc != 0) {
avrdude_message(MSG_INFO, "error reading signature data, rc=%d\n", avrdude_message(MSG_INFO, "%s (sig): error reading signature data, rc=%d\n",
rc); prgname, rc);
} }
m = avr_locate_mem(p, "signature"); m = avr_locate_mem(p, "signature");
if (m == NULL) { if (m == NULL) {
avrdude_message(MSG_INFO, "signature data not defined for device \"%s\"\n", avrdude_message(MSG_INFO, "%s (sig): signature data not defined for device %s\n",
p->desc); progname, p->desc);
} }
else { else {
fprintf(stdout, "Device signature = 0x"); fprintf(stdout, "Device signature = 0x");
@ -997,8 +995,7 @@ static int cmd_parms(PROGRAMMER * pgm, struct avrpart * p,
{ {
if (pgm->print_parms == NULL) { if (pgm->print_parms == NULL) {
avrdude_message(MSG_INFO, "%s (parms): the %s programmer does not support " avrdude_message(MSG_INFO, "%s (parms): the %s programmer does not support "
"adjustable parameters\n", "adjustable parameters\n", progname, pgm->type);
progname, pgm->type);
return -1; return -1;
} }
pgm->print_parms(pgm); pgm->print_parms(pgm);
@ -1020,7 +1017,7 @@ static int cmd_vtarg(PROGRAMMER * pgm, struct avrpart * p,
} }
v = strtod(argv[1], &endp); v = strtod(argv[1], &endp);
if (endp == argv[1]) { if (endp == argv[1]) {
avrdude_message(MSG_INFO, "%s (vtarg): can't parse voltage \"%s\"\n", avrdude_message(MSG_INFO, "%s (vtarg): can't parse voltage %s\n",
progname, argv[1]); progname, argv[1]);
return -1; return -1;
} }
@ -1054,7 +1051,7 @@ static int cmd_fosc(PROGRAMMER * pgm, struct avrpart * p,
if (strcmp(argv[1], "off") == 0) if (strcmp(argv[1], "off") == 0)
v = 0.0; v = 0.0;
else { else {
avrdude_message(MSG_INFO, "%s (fosc): can't parse frequency \"%s\"\n", avrdude_message(MSG_INFO, "%s (fosc): can't parse frequency %s\n",
progname, argv[1]); progname, argv[1]);
return -1; return -1;
} }
@ -1090,7 +1087,7 @@ static int cmd_sck(PROGRAMMER * pgm, struct avrpart * p,
} }
v = strtod(argv[1], &endp); v = strtod(argv[1], &endp);
if (endp == argv[1]) { if (endp == argv[1]) {
avrdude_message(MSG_INFO, "%s (sck): can't parse period \"%s\"\n", avrdude_message(MSG_INFO, "%s (sck): can't parse period %s\n",
progname, argv[1]); progname, argv[1]);
return -1; return -1;
} }
@ -1125,20 +1122,20 @@ static int cmd_varef(PROGRAMMER * pgm, struct avrpart * p,
chan = 0; chan = 0;
v = strtod(argv[1], &endp); v = strtod(argv[1], &endp);
if (endp == argv[1]) { if (endp == argv[1]) {
avrdude_message(MSG_INFO, "%s (varef): can't parse voltage \"%s\"\n", avrdude_message(MSG_INFO, "%s (varef): can't parse voltage %s\n",
progname, argv[1]); progname, argv[1]);
return -1; return -1;
} }
} else { } else {
chan = strtoul(argv[1], &endp, 10); chan = strtoul(argv[1], &endp, 10);
if (endp == argv[1]) { if (endp == argv[1]) {
avrdude_message(MSG_INFO, "%s (varef): can't parse channel \"%s\"\n", avrdude_message(MSG_INFO, "%s (varef): can't parse channel %s\n",
progname, argv[1]); progname, argv[1]);
return -1; return -1;
} }
v = strtod(argv[2], &endp); v = strtod(argv[2], &endp);
if (endp == argv[2]) { if (endp == argv[2]) {
avrdude_message(MSG_INFO, "%s (varef): can't parse voltage \"%s\"\n", avrdude_message(MSG_INFO, "%s (varef): can't parse voltage %s\n",
progname, argv[2]); progname, argv[2]);
return -1; return -1;
} }
@ -1183,7 +1180,8 @@ static int cmd_spi(PROGRAMMER * pgm, struct avrpart * p,
spi_mode = 1; spi_mode = 1;
return 0; return 0;
} }
avrdude_message(MSG_INFO, "`spi' command unavailable for this programmer type\n"); avrdude_message(MSG_INFO, "%s: spi command unavailable for this programmer type\n",
progname);
return -1; return -1;
} }
@ -1196,7 +1194,8 @@ static int cmd_pgm(PROGRAMMER * pgm, struct avrpart * p,
pgm->initialize(pgm, p); pgm->initialize(pgm, p);
return 0; return 0;
} }
avrdude_message(MSG_INFO, "`pgm' command unavailable for this programmer type\n"); avrdude_message(MSG_INFO, "%s: pgm command unavailable for this programmer type\n",
progname);
return -1; return -1;
} }
@ -1216,7 +1215,7 @@ static int cmd_verbose(PROGRAMMER * pgm, struct avrpart * p,
} }
nverb = strtol(argv[1], &endp, 0); nverb = strtol(argv[1], &endp, 0);
if (endp == argv[2]) { if (endp == argv[2]) {
avrdude_message(MSG_INFO, "%s: can't parse verbosity level \"%s\"\n", avrdude_message(MSG_INFO, "%s: can't parse verbosity level %s\n",
progname, argv[2]); progname, argv[2]);
return -1; return -1;
} }
@ -1344,7 +1343,7 @@ static int do_cmd(PROGRAMMER * pgm, struct avrpart * p,
} }
else if (strncasecmp(argv[0], cmd[i].name, len)==0) { else if (strncasecmp(argv[0], cmd[i].name, len)==0) {
if (hold != -1) { if (hold != -1) {
avrdude_message(MSG_INFO, "%s: command \"%s\" is ambiguous\n", avrdude_message(MSG_INFO, "%s (cmd): command %s is ambiguous\n",
progname, argv[0]); progname, argv[0]);
return -1; return -1;
} }
@ -1355,7 +1354,7 @@ static int do_cmd(PROGRAMMER * pgm, struct avrpart * p,
if (hold != -1) if (hold != -1)
return cmd[hold].func(pgm, p, argc, argv); return cmd[hold].func(pgm, p, argc, argv);
avrdude_message(MSG_INFO, "%s: invalid command \"%s\"\n", avrdude_message(MSG_INFO, "%s (cmd): invalid command %s\n",
progname, argv[0]); progname, argv[0]);
return -1; return -1;