From bcd52759b130371d32a7a25d272a274aa6ee1e03 Mon Sep 17 00:00:00 2001 From: "Brian S. Dean" Date: Fri, 11 Feb 2005 19:03:53 +0000 Subject: [PATCH] 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/avrdude@450 81a1dc3b-b13d-400b-aceb-764788c761c2 --- main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/main.c b/main.c index a13745d0..9827d378 100644 --- a/main.c +++ b/main.c @@ -711,6 +711,8 @@ int main(int argc, char * argv []) unsigned char safemode_lfuse = 0xff; unsigned char safemode_hfuse = 0xff; unsigned char safemode_efuse = 0xff; + int fuses_specified = 0; + int fuses_updated = 0; #if !defined(WIN32NATIVE) char * homedir; #endif @@ -1249,6 +1251,7 @@ int main(int argc, char * argv []) if (((strcasecmp(m->desc, "lfuse") == 0) || (strcasecmp(m->desc, "hfuse") == 0) || (strcasecmp(m->desc, "efuse") == 0)) && (upd->op == DEVICE_WRITE)) { + fuses_specified = 1; fprintf(stderr, "%s: NOTE: FUSE memory has been specified, and safemode is ON\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 */ if (safemodeafter_lfuse != safemode_lfuse) { + fuses_updated = 1; fprintf(stderr, "%s: safemode: lfuse changed! Read as %x, was %x\n", 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 */ if (safemodeafter_hfuse != safemode_hfuse) { + fuses_updated = 1; fprintf(stderr, "%s: safemode: hfuse changed! Read as %x, was %x\n", 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 */ if (safemodeafter_efuse != safemode_efuse) { + fuses_updated = 1; fprintf(stderr, "%s: safemode: efuse changed! Read as %x, was %x\n", progname, safemodeafter_efuse, safemode_efuse); @@ -1445,6 +1451,10 @@ int main(int argc, char * argv []) fprintf(stderr, "Fuses not recovered, sorry\n"); } + if (fuses_updated && fuses_specified) { + exitrc = 1; + } + }