avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-12-16 18:44:17 +00:00
Code Issues Projects Releases Wiki Activity

Submitted by Jan Egil Ruud <janegil.ruud@microchip.com>

Browse Source 
patch #9507: Fix UPDI chip erase
* jtag3.c (jtag3_chip_erase_updi): New function
* jtag3_private.h: More constants




git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1403 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch
2017-12-30 00:05:54 +00:00
parent ecaaa1e1d5
commit 559c20f207
4 changed files with 64 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
jtag3.c
View File

@@ -840,8 +840,14 @@ int jtag3_recv(PROGRAMMER * pgm, unsigned char **msg) {
c = (*resp)[1];
if ((c & RSP3_STATUS_MASK) != RSP3_OK) {
avrdude_message(MSG_INFO, "%s: bad response to %s command: 0x%02x\n",
progname, descr, c);
if ((c == RSP3_FAILED) && ((*resp)[3] == RSP3_FAIL_OCD_LOCKED)) {
avrdude_message(MSG_INFO,
"%s: Device is locked! Chip erase required to unlock.\n",
progname);
} else {
avrdude_message(MSG_INFO, "%s: bad response to %s command: 0x%02x\n",
progname, descr, c);
}
free(*resp);
resp = 0;
return -1;
@@ -895,6 +901,34 @@ static int jtag3_chip_erase(PROGRAMMER * pgm, AVRPART * p)
return 0;
}
/*
* UPDI 'chip erase' -> 'enter progmode' with chip erase key
*/
static int jtag3_chip_erase_updi(PROGRAMMER * pgm, AVRPART * p)
{
unsigned char buf[8], *resp;
buf[0] = 1; /* Enable */
if (jtag3_setparm(pgm, SCOPE_AVR, SET_GET_CTXT_OPTIONS, PARM3_OPT_CHIP_ERASE_TO_ENTER, buf, 1) < 0)
return -1;
buf[0] = SCOPE_AVR;
buf[1] = CMD3_ENTER_PROGMODE;
buf[2] = 0;
if (jtag3_command(pgm, buf, 3, &resp, "enter progmode") < 0)
return -1;
PDATA(pgm)->prog_enabled = 1;
buf[0] = 0; /* Disable */
if (jtag3_setparm(pgm, SCOPE_AVR, SET_GET_CTXT_OPTIONS, PARM3_OPT_CHIP_ERASE_TO_ENTER, buf, 1) < 0)
return -1;
free(resp);
return 0;
}
/*
* There is no chip erase functionality in debugWire mode.
*/
@@ -2378,7 +2412,7 @@ void jtag3_updi_initpgm(PROGRAMMER * pgm)
pgm->enable = jtag3_enable;
pgm->disable = jtag3_disable;
pgm->program_enable = jtag3_program_enable_dummy;
pgm->chip_erase = jtag3_chip_erase;
pgm->chip_erase = jtag3_chip_erase_updi;
pgm->open = jtag3_open_updi;
pgm->close = jtag3_close;
pgm->read_byte = jtag3_read_byte;