avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make the s-record output routine work like the raw and intel hex 

output routines (don't optimize away 0xff data before and after non
0xff data).  Also, fix a bug where the data contents sometimes weren't
written out completely.

Initial bug reported by Tom Harris <TomH@optiscan.com>.  Fixes
provided by Alexey V.Levdikov <tsar@kemford.com>.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@330 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
bdean 2003-05-22 00:46:59 +00:00
parent d62232cf63
commit ae435210a1
1 changed files with 16 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
fileio.c
View File

@ -360,11 +360,10 @@ int b2srec(unsigned char * inbuf, int bufsize,
char * outfile, FILE * outf) char * outfile, FILE * outf)
{ {
unsigned char * buf; unsigned char * buf;
unsigned int nextaddr, stopaddr; unsigned int nextaddr;
int n, nbytes, addr_width; int n, nbytes, addr_width;
int i; int i;
unsigned char cksum; unsigned char cksum;
unsigned char startf, stopf ,emptyf;
char * tmpl=0; char * tmpl=0;
@ -373,39 +372,11 @@ int b2srec(unsigned char * inbuf, int bufsize,
progname, recsize); progname, recsize);
return -1; return -1;
} }
nextaddr = startaddr;
buf = inbuf; buf = inbuf;
nextaddr = 0; nbytes = 0;
stopaddr = 0;
startf = 0;
stopf = 0;
/* search for ranges of 'real' data */
for (i=startaddr; i<bufsize; i++) {
if (buf[i] == 0xff) {
if (startf == 0)
continue;
else if (stopf == 0) {
stopf = 1;
stopaddr = i;
}
}
else {
if (startf == 0) {
startf = 1;
nextaddr = i;
while (nextaddr % recsize != 0)
nextaddr --;
}
else if (stopf == 1) {
stopf = 0;
stopaddr = bufsize;
}
}
}
nbytes = i;
bufsize = stopaddr - nextaddr;
addr_width = 0; addr_width = 0;
while (bufsize) { while (bufsize) {
@ -435,34 +406,23 @@ int b2srec(unsigned char * inbuf, int bufsize,
return -1; return -1;
} }
/* skip the lines filled with 0xff */ fprintf(outf, tmpl, n + addr_width + 1, nextaddr);
emptyf = 1;
cksum += n + addr_width + 1;
for (i=addr_width; i>0; i--)
cksum += (nextaddr >> (i-1) * 8) & 0xff;
for (i=nextaddr; i<nextaddr + n; i++) { for (i=nextaddr; i<nextaddr + n; i++) {
if (buf[i] != 0xff) { fprintf(outf, "%02X", buf[i]);
emptyf=0; cksum += buf[i];
break;
}
} }
if (emptyf != 1) { cksum = 0xff - cksum;
fprintf(outf, "%02X\n", cksum);
fprintf(outf, tmpl, n + addr_width + 1, nextaddr);
cksum += n + addr_width + 1;
for (i=addr_width; i>0; i--)
cksum += (nextaddr >> (i-1) * 8) & 0xff;
for (i=nextaddr; i<nextaddr + n; i++) {
fprintf(outf, "%02X", buf[i]);
cksum += buf[i];
}
cksum = 0xff - cksum;
fprintf(outf, "%02X\n", cksum);
}
nextaddr += n; nextaddr += n;
nbytes +=n;
} }
/* advance to next 'recsize' bytes */ /* advance to next 'recsize' bytes */