avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-12-16 10:41:07 +00:00
Code Issues Projects Releases Wiki Activity

Make the code compile warning-free:

Browse Source 
- declare a dummy "struct timezone" for some Win32 systems (MinGW)
- fix a few printf() argument types
- get rid off the prevailing "all filedescriptors are of type int"
  attitude

The last item required a large sweep across the code, in order to
replace all "int fd"s by "struct filedescriptor *fd"s, and pass
pointers (as we cannot pass a union directly).  In return, the
code is now supposed to be fully 64-bit safe, rather than relying
on a 64-bit pointer being converted to a (32-bit) int and back
to a pointer as we did previously.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@694 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
joerg_wunsch
2006-12-11 12:47:35 +00:00
parent 8bd117dccf
commit 31fa98b708
19 changed files with 253 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
jtagmkI.c
View File

@@ -194,7 +194,7 @@ static int jtagmkI_send(PROGRAMMER * pgm, unsigned char * data, size_t len)
buf[len] = ' '; /* "CRC" */
buf[len + 1] = ' '; /* EOP */
if (serial_send(pgm->fd, buf, len + 2) != 0) {
if (serial_send(&pgm->fd, buf, len + 2) != 0) {
fprintf(stderr,
"%s: jtagmkI_send(): failed to send command to serial port\n",
progname);
@@ -208,7 +208,7 @@ static int jtagmkI_send(PROGRAMMER * pgm, unsigned char * data, size_t len)
static void jtagmkI_recv(PROGRAMMER * pgm, unsigned char * buf, size_t len)
{
if (serial_recv(pgm->fd, buf, len) != 0) {
if (serial_recv(&pgm->fd, buf, len) != 0) {
fprintf(stderr,
"\n%s: jtagmkI_recv(): failed to send command to serial port\n",
progname);
@@ -223,7 +223,7 @@ static void jtagmkI_recv(PROGRAMMER * pgm, unsigned char * buf, size_t len)
static int jtagmkI_drain(PROGRAMMER * pgm, int display)
{
return serial_drain(pgm->fd, display);
return serial_drain(&pgm->fd, display);
}
@@ -248,14 +248,14 @@ static int jtagmkI_resync(PROGRAMMER * pgm, int maxtries, int signon)
fprintf(stderr, "%s: jtagmkI_resync(): Sending sync command: ",
progname);
if (serial_send(pgm->fd, buf, 1) != 0) {
if (serial_send(&pgm->fd, buf, 1) != 0) {
fprintf(stderr,
"\n%s: jtagmkI_resync(): failed to send command to serial port\n",
progname);
serial_recv_timeout = otimeout;
return -1;
}
if (serial_recv(pgm->fd, resp, 1) == 0 && resp[0] == RESP_OK) {
if (serial_recv(&pgm->fd, resp, 1) == 0 && resp[0] == RESP_OK) {
if (verbose >= 2)
fprintf(stderr, "got RESP_OK\n");
break;
@@ -280,14 +280,14 @@ static int jtagmkI_resync(PROGRAMMER * pgm, int maxtries, int signon)
fprintf(stderr, "%s: jtagmkI_resync(): Sending sign-on command: ",
progname);
if (serial_send(pgm->fd, buf, 4) != 0) {
if (serial_send(&pgm->fd, buf, 4) != 0) {
fprintf(stderr,
"\n%s: jtagmkI_resync(): failed to send command to serial port\n",
progname);
serial_recv_timeout = otimeout;
return -1;
}
if (serial_recv(pgm->fd, resp, 9) == 0 && resp[0] == RESP_OK) {
if (serial_recv(&pgm->fd, resp, 9) == 0 && resp[0] == RESP_OK) {
if (verbose >= 2)
fprintf(stderr, "got RESP_OK\n");
break;
@@ -486,7 +486,7 @@ static int jtagmkI_program_disable(PROGRAMMER * pgm)
if (!prog_enabled)
return 0;
if (pgm->fd != -1) {
if (pgm->fd.ifd != -1) {
buf[0] = CMD_LEAVE_PROGMODE;
if (verbose >= 2)
fprintf(stderr, "%s: jtagmkI_program_disable(): "
@@ -552,7 +552,7 @@ static int jtagmkI_initialize(PROGRAMMER * pgm, AVRPART * p)
progname, pgm->baudrate);
if (jtagmkI_setparm(pgm, PARM_BITRATE, b) == 0) {
initial_baudrate = pgm->baudrate; /* don't adjust again later */
serial_setspeed(pgm->fd, pgm->baudrate);
serial_setspeed(&pgm->fd, pgm->baudrate);
}
}
}
@@ -653,7 +653,7 @@ static int jtagmkI_open(PROGRAMMER * pgm, char * port)
fprintf(stderr,
"%s: jtagmkI_open(): trying to sync at baud rate %ld:\n",
progname, baudtab[i].baud);
pgm->fd = serial_open(port, baudtab[i].baud);
serial_open(port, baudtab[i].baud, &pgm->fd);
/*
* drain any extraneous input
@@ -667,13 +667,13 @@ static int jtagmkI_open(PROGRAMMER * pgm, char * port)
return 0;
}
serial_close(pgm->fd);
serial_close(&pgm->fd);
}
fprintf(stderr,
"%s: jtagmkI_open(): failed to synchronize to ICE\n",
progname);
pgm->fd = -1;
pgm->fd.ifd = -1;
return -1;
}
@@ -685,11 +685,11 @@ static void jtagmkI_close(PROGRAMMER * pgm)
if (verbose >= 2)
fprintf(stderr, "%s: jtagmkI_close()\n", progname);
if (pgm->fd != -1) {
serial_close(pgm->fd);
if (pgm->fd.ifd != -1) {
serial_close(&pgm->fd);
}
pgm->fd = -1;
pgm->fd.ifd = -1;
}