avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-09-27 22:45:27 +00:00
Code Issues Projects Releases Wiki Activity

Return error codes instead of exiting, thus making sure that we exit

Browse Source 
only via main() so that the exitspecs are properly applied.

When reading input data from a file, remember how many bytes were read
and write and verify only that many bytes.

Don't complain when an input file size is smaller than the memory size
we are programming.  This is normal.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@44 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Brian S. Dean
2001-01-20 16:34:28 +00:00
parent 3d43a61bcc
commit c06319e33c
5 changed files with 104 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
fileio.c
View File

@@ -81,7 +81,7 @@ int b2ihex ( unsigned char * inbuf, int bufsize,
{
unsigned char * buf;
unsigned int nextaddr;
int n;
int n, nbytes;
int i;
unsigned char cksum;
@@ -92,8 +92,9 @@ int b2ihex ( unsigned char * inbuf, int bufsize,
}
nextaddr = startaddr;
buf = inbuf;
nbytes = 0;
buf = inbuf;
while (bufsize) {
n = recsize;
if (n > bufsize)
@@ -111,6 +112,7 @@ int b2ihex ( unsigned char * inbuf, int bufsize,
fprintf ( outf, "%02X\n", cksum );
nextaddr += n;
nbytes += n;
}
/* advance to next 'recsize' bytes */
@@ -129,7 +131,7 @@ int b2ihex ( unsigned char * inbuf, int bufsize,
cksum = -cksum;
fprintf ( outf, "%02X\n", cksum );
return 0;
return nbytes;
}
@@ -138,16 +140,16 @@ int ihex2b ( char * infile, FILE * inf,
{
unsigned char buffer [ MAX_LINE_LEN ];
unsigned char * buf;
unsigned int prevaddr, nextaddr;
unsigned int nextaddr;
unsigned int b;
int n;
int n, nbytes;
int i, j;
unsigned int cksum, rectype;
int lineno;
lineno = 0;
prevaddr = 0;
buf = outbuf;
nbytes = 0;
while (fgets((char *)buffer,MAX_LINE_LEN,inf)!=NULL) {
lineno++;
@@ -194,6 +196,8 @@ int ihex2b ( char * infile, FILE * inf,
cksum += b;
}
nbytes += n;
/*-----------------------------------------------------------------
read the cksum value from the record and compare it with our
computed value
@@ -221,13 +225,12 @@ int ihex2b ( char * infile, FILE * inf,
if (rectype == 1) {
/* end of record */
return 0;
return nbytes;
}
prevaddr = nextaddr + n;
}
} /* while */
return 0;
return nbytes;
}
@@ -250,7 +253,7 @@ int fileio_rbin ( struct fioparms * fio,
return -1;
}
if (rc < size) {
if (rc < 0 || (fio->op == FIO_WRITE && rc < size)) {
fprintf(stderr,
"%s: %s error %s %s: %s; %s %d of the expected %d bytes\n",
progname, fio->iodesc, fio->dir, filename, strerror(errno),
@@ -270,14 +273,14 @@ int fileio_ihex ( struct fioparms * fio,
switch (fio->op) {
case FIO_WRITE:
rc = b2ihex(buf, size, 32, 0, filename, f);
if (rc) {
if (rc < 0) {
return -1;
}
break;
case FIO_READ:
rc = ihex2b(filename, f, buf, size);
if (rc)
if (rc < 0)
return -1;
break;
@@ -288,7 +291,7 @@ int fileio_ihex ( struct fioparms * fio,
break;
}
return 0;
return rc;
}
@@ -397,13 +400,12 @@ int fmt_autodetect ( char * fname )
int fileio ( int op, char * filename, FILEFMT format,
struct avrpart * p, AVRMEM memtype )
struct avrpart * p, AVRMEM memtype, int size )
{
int rc;
FILE * f;
char * fname;
unsigned char * buf;
int size;
struct fioparms fio;
int i;
@@ -434,12 +436,14 @@ int fileio ( int op, char * filename, FILEFMT format,
switch (memtype) {
case AVR_EEPROM:
buf = p->eeprom;
size = p->eeprom_size;
if (fio.op == FIO_READ)
size = p->eeprom_size;
break;
case AVR_FLASH:
buf = p->flash;
size = p->flash_size;
if (fio.op == FIO_READ)
size = p->flash_size;
break;
default: