Exit non-zero if safe-mode reverts fuse bits that were requested on

the command-line.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@450 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Brian S. Dean 2005-02-11 19:03:53 +00:00
parent 8a2d4aa7f2
commit c8b9561f1e
1 changed files with 10 additions and 0 deletions

View File

@ -711,6 +711,8 @@ int main(int argc, char * argv [])
unsigned char safemode_lfuse = 0xff; unsigned char safemode_lfuse = 0xff;
unsigned char safemode_hfuse = 0xff; unsigned char safemode_hfuse = 0xff;
unsigned char safemode_efuse = 0xff; unsigned char safemode_efuse = 0xff;
int fuses_specified = 0;
int fuses_updated = 0;
#if !defined(WIN32NATIVE) #if !defined(WIN32NATIVE)
char * homedir; char * homedir;
#endif #endif
@ -1249,6 +1251,7 @@ int main(int argc, char * argv [])
if (((strcasecmp(m->desc, "lfuse") == 0) || if (((strcasecmp(m->desc, "lfuse") == 0) ||
(strcasecmp(m->desc, "hfuse") == 0) || (strcasecmp(m->desc, "hfuse") == 0) ||
(strcasecmp(m->desc, "efuse") == 0)) && (upd->op == DEVICE_WRITE)) { (strcasecmp(m->desc, "efuse") == 0)) && (upd->op == DEVICE_WRITE)) {
fuses_specified = 1;
fprintf(stderr, fprintf(stderr,
"%s: NOTE: FUSE memory has been specified, and safemode is ON\n" "%s: NOTE: FUSE memory has been specified, and safemode is ON\n"
"%s: This will not allow you to change the fuse bits.\n" "%s: This will not allow you to change the fuse bits.\n"
@ -1391,6 +1394,7 @@ int main(int argc, char * argv [])
/* Now check what fuses are against what they should be */ /* Now check what fuses are against what they should be */
if (safemodeafter_lfuse != safemode_lfuse) { if (safemodeafter_lfuse != safemode_lfuse) {
fuses_updated = 1;
fprintf(stderr, "%s: safemode: lfuse changed! Read as %x, was %x\n", fprintf(stderr, "%s: safemode: lfuse changed! Read as %x, was %x\n",
progname, safemodeafter_lfuse, safemode_lfuse); progname, safemodeafter_lfuse, safemode_lfuse);
@ -1407,6 +1411,7 @@ int main(int argc, char * argv [])
/* Now check what fuses are against what they should be */ /* Now check what fuses are against what they should be */
if (safemodeafter_hfuse != safemode_hfuse) { if (safemodeafter_hfuse != safemode_hfuse) {
fuses_updated = 1;
fprintf(stderr, "%s: safemode: hfuse changed! Read as %x, was %x\n", fprintf(stderr, "%s: safemode: hfuse changed! Read as %x, was %x\n",
progname, safemodeafter_hfuse, safemode_hfuse); progname, safemodeafter_hfuse, safemode_hfuse);
@ -1423,6 +1428,7 @@ int main(int argc, char * argv [])
/* Now check what fuses are against what they should be */ /* Now check what fuses are against what they should be */
if (safemodeafter_efuse != safemode_efuse) { if (safemodeafter_efuse != safemode_efuse) {
fuses_updated = 1;
fprintf(stderr, "%s: safemode: efuse changed! Read as %x, was %x\n", fprintf(stderr, "%s: safemode: efuse changed! Read as %x, was %x\n",
progname, safemodeafter_efuse, safemode_efuse); progname, safemodeafter_efuse, safemode_efuse);
@ -1445,6 +1451,10 @@ int main(int argc, char * argv [])
fprintf(stderr, "Fuses not recovered, sorry\n"); fprintf(stderr, "Fuses not recovered, sorry\n");
} }
if (fuses_updated && fuses_specified) {
exitrc = 1;
}
} }