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

Merge pull request #902 from MCUdude/terminal-fix 

Minor terminal write improvements
This commit is contained in:
Jörg Wunsch 2022-03-19 23:02:24 +01:00 committed by GitHub
parent 75e4d06463 426ea1fa78
commit 28d1442fc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/term.c
View File

@ -364,7 +364,7 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
return -1; return -1;
} }
uint8_t * buf = malloc(mem->size); uint8_t * buf = malloc(mem->size + 0x10);
if (buf == NULL) { if (buf == NULL) {
avrdude_message(MSG_INFO, "%s (write): out of memory\n", progname); avrdude_message(MSG_INFO, "%s (write): out of memory\n", progname);
return -1; return -1;
@ -378,6 +378,7 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
if (*end_ptr || (end_ptr == argv[3])) { if (*end_ptr || (end_ptr == argv[3])) {
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[3]); progname, argv[3]);
free(buf);
return -1; return -1;
} }
} else { } else {
@ -503,9 +504,16 @@ static int cmd_write(PROGRAMMER * pgm, struct avrpart * p,
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);
return -1; return -1;
} }
avrdude_message(MSG_NOTICE, "Info: Writing %d bytes starting from address 0x%02x",
len + data.bytes_grown, addr);
if (write_mode == WRITE_MODE_FILL)
avrdude_message(MSG_NOTICE, ". Remaining space filled with %s", argv[argc - 2]);
avrdude_message(MSG_NOTICE, "\n");
pgm->err_led(pgm, OFF); pgm->err_led(pgm, OFF);
bool werror = false; bool werror = false;
for (i = 0; i < (len + data.bytes_grown); i++) { for (i = 0; i < (len + data.bytes_grown); i++) {