Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-22 17:16:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2195 from stefanrueger/fix-jtag3-command

Browse Source 
Fix jtag3_command()
This commit is contained in:
Stefan Rueger
2026-08-24 23:04:43 +02:00
committed by GitHub
parent 246c39d47f 4c138edff7
commit 04d4e95b99
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/jtag3.c
View File

@@ -805,7 +805,7 @@ int jtag3_command(const PROGRAMMER *pgm, unsigned char *cmd, unsigned int cmdlen
return LIBAVRDUDE_GENERAL_FAILURE;
}
if(status < 4 || !resp) {
if(status < 3 || !resp) {
pmsg_error("%s(%s) failed owing to unexpected return\n", __func__, descr);
mmt_free(*resp);
*resp = NULL;
@@ -820,7 +820,7 @@ int jtag3_command(const PROGRAMMER *pgm, unsigned char *cmd, unsigned int cmdlen
}
unsigned char code = (*resp)[1] & RSP3_STATUS_MASK;
int softfail = (*resp)[3] == RSP3_FAIL_OCD_LOCKED || (*resp)[3] == RSP3_FAIL_CRC_FAILURE;
int softfail = status > 3 && ((*resp)[3] == RSP3_FAIL_OCD_LOCKED || (*resp)[3] == RSP3_FAIL_CRC_FAILURE);
if(code != RSP3_OK) {
if(code == RSP3_FAILED && softfail)
pmsg_error("device is locked; chip erase required to unlock\n");