Merge pull request #844 from MCUdude/jtagmkii-retry-attempts
jtagmkii: Reduce the number of sync attempts to 10 + print number of attempts
This commit is contained in:
commit
1b8b1d69e7
2
NEWS
2
NEWS
|
@ -846,7 +846,7 @@ Version 4.3.0:
|
||||||
* Added "Troubleshooting"-Appendix to the manual.
|
* Added "Troubleshooting"-Appendix to the manual.
|
||||||
|
|
||||||
* Add ATmega8515 support.
|
* Add ATmega8515 support.
|
||||||
Contributed by: Matthias Weißer <matthias@matwei.de>
|
Contributed by: Matthias Weißer <matthias@matwei.de>
|
||||||
|
|
||||||
* Add ATmega64 support.
|
* Add ATmega64 support.
|
||||||
Contributed by: Erik Christiansen <erik@dd.nec.com.au>
|
Contributed by: Erik Christiansen <erik@dd.nec.com.au>
|
||||||
|
|
|
@ -675,7 +675,7 @@ int jtagmkII_recv(PROGRAMMER * pgm, unsigned char **msg) {
|
||||||
|
|
||||||
int jtagmkII_getsync(PROGRAMMER * pgm, int mode) {
|
int jtagmkII_getsync(PROGRAMMER * pgm, int mode) {
|
||||||
int tries;
|
int tries;
|
||||||
#define MAXTRIES 33
|
#define MAXTRIES 10
|
||||||
unsigned char buf[3], *resp, c = 0xff;
|
unsigned char buf[3], *resp, c = 0xff;
|
||||||
int status;
|
int status;
|
||||||
unsigned int fwver, hwver;
|
unsigned int fwver, hwver;
|
||||||
|
@ -696,15 +696,14 @@ int jtagmkII_getsync(PROGRAMMER * pgm, int mode) {
|
||||||
|
|
||||||
/* Get the sign-on information. */
|
/* Get the sign-on information. */
|
||||||
buf[0] = CMND_GET_SIGN_ON;
|
buf[0] = CMND_GET_SIGN_ON;
|
||||||
avrdude_message(MSG_NOTICE2, "%s: jtagmkII_getsync(): Sending sign-on command: ",
|
avrdude_message(MSG_NOTICE2, "%s: jtagmkII_getsync() attempt %d of %d: Sending sign-on command: ",
|
||||||
progname);
|
progname, tries + 1, MAXTRIES);
|
||||||
jtagmkII_send(pgm, buf, 1);
|
jtagmkII_send(pgm, buf, 1);
|
||||||
|
|
||||||
status = jtagmkII_recv(pgm, &resp);
|
status = jtagmkII_recv(pgm, &resp);
|
||||||
if (status <= 0) {
|
if (status <= 0) {
|
||||||
avrdude_message(MSG_INFO, "%s: jtagmkII_getsync(): sign-on command: "
|
avrdude_message(MSG_INFO, "%s: jtagmkII_getsync() attempt %d of %d: sign-on command: status %d\n",
|
||||||
"status %d\n",
|
progname, tries + 1, MAXTRIES, status);
|
||||||
progname, status);
|
|
||||||
} else if (verbose >= 3) {
|
} else if (verbose >= 3) {
|
||||||
putc('\n', stderr);
|
putc('\n', stderr);
|
||||||
jtagmkII_prmsg(pgm, resp, status);
|
jtagmkII_prmsg(pgm, resp, status);
|
||||||
|
|
Loading…
Reference in New Issue