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

Make the code compile warning-free: 

- 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ChangeLog
View File

@ -1,3 +1,34 @@
2006-12-11 Joerg Wunsch <j@uriah.heep.sax.de>
* avr910.c: Make the code compile warning-free:
- 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.
* butterfly.c: (Ditto.)
* jtagmkI.c: (Ditto.)
* jtagmkII.c: (Ditto.)
* lists.c: (Ditto.)
* par.c: (Ditto.)
* pgm.h: (Ditto.)
* ppi.c: (Ditto.)
* ppi.h: (Ditto.)
* ppiwin.c: (Ditto.)
* ser_posix.c: (Ditto.)
* ser_win32.c: (Ditto.)
* serbb_posix.c: (Ditto.)
* serbb_win32.c: (Ditto.)
* serial.h: (Ditto.)
* stk500.c: (Ditto.)
* stk500v2.c: (Ditto.)
* usb_libusb.c: (Ditto.)
2006-11-23 Joerg Wunsch <j@uriah.heep.sax.de> 2006-11-23 Joerg Wunsch <j@uriah.heep.sax.de>
Implement EEPROM access through debugWire. Implement EEPROM access through debugWire.

12
avr910.c
View File

@ -47,7 +47,7 @@ static char has_auto_incr_addr;
static int avr910_send(PROGRAMMER * pgm, char * buf, size_t len) static int avr910_send(PROGRAMMER * pgm, char * buf, size_t len)
{ {
return serial_send(pgm->fd, (unsigned char *)buf, len); return serial_send(&pgm->fd, (unsigned char *)buf, len);
} }
@ -55,7 +55,7 @@ static int avr910_recv(PROGRAMMER * pgm, char * buf, size_t len)
{ {
int rv; int rv;
rv = serial_recv(pgm->fd, (unsigned char *)buf, len); rv = serial_recv(&pgm->fd, (unsigned char *)buf, len);
if (rv < 0) { if (rv < 0) {
fprintf(stderr, fprintf(stderr,
"%s: avr910_recv(): programmer is not responding\n", "%s: avr910_recv(): programmer is not responding\n",
@ -68,7 +68,7 @@ static int avr910_recv(PROGRAMMER * pgm, char * buf, size_t len)
static int avr910_drain(PROGRAMMER * pgm, int display) static int avr910_drain(PROGRAMMER * pgm, int display)
{ {
return serial_drain(pgm->fd, display); return serial_drain(&pgm->fd, display);
} }
@ -271,7 +271,7 @@ static int avr910_open(PROGRAMMER * pgm, char * port)
} }
strcpy(pgm->port, port); strcpy(pgm->port, port);
pgm->fd = serial_open(port, pgm->baudrate); serial_open(port, pgm->baudrate, &pgm->fd);
/* /*
* drain any extraneous input * drain any extraneous input
@ -285,8 +285,8 @@ static void avr910_close(PROGRAMMER * pgm)
{ {
avr910_leave_prog_mode(pgm); avr910_leave_prog_mode(pgm);
serial_close(pgm->fd); serial_close(&pgm->fd);
pgm->fd = -1; pgm->fd.ifd = -1;
} }

12
butterfly.c
View File

@ -69,7 +69,7 @@ static int butterfly_send(PROGRAMMER * pgm, char * buf, size_t len)
{ {
no_show_func_info(); no_show_func_info();
return serial_send(pgm->fd, (unsigned char *)buf, len); return serial_send(&pgm->fd, (unsigned char *)buf, len);
} }
@ -79,7 +79,7 @@ static int butterfly_recv(PROGRAMMER * pgm, char * buf, size_t len)
no_show_func_info(); no_show_func_info();
rv = serial_recv(pgm->fd, (unsigned char *)buf, len); rv = serial_recv(&pgm->fd, (unsigned char *)buf, len);
if (rv < 0) { if (rv < 0) {
fprintf(stderr, fprintf(stderr,
"%s: butterfly_recv(): programmer is not responding\n", "%s: butterfly_recv(): programmer is not responding\n",
@ -94,7 +94,7 @@ static int butterfly_drain(PROGRAMMER * pgm, int display)
{ {
no_show_func_info(); no_show_func_info();
return serial_drain(pgm->fd, display); return serial_drain(&pgm->fd, display);
} }
@ -359,7 +359,7 @@ static int butterfly_open(PROGRAMMER * pgm, char * port)
if(pgm->baudrate == 0) { if(pgm->baudrate == 0) {
pgm->baudrate = 19200; pgm->baudrate = 19200;
} }
pgm->fd = serial_open(port, pgm->baudrate); serial_open(port, pgm->baudrate, &pgm->fd);
/* /*
* drain any extraneous input * drain any extraneous input
@ -378,8 +378,8 @@ static void butterfly_close(PROGRAMMER * pgm)
butterfly_send(pgm, "E", 1); butterfly_send(pgm, "E", 1);
butterfly_vfy_cmd_sent(pgm, "exit bootloader"); butterfly_vfy_cmd_sent(pgm, "exit bootloader");
serial_close(pgm->fd); serial_close(&pgm->fd);
pgm->fd = -1; pgm->fd.ifd = -1;
} }

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

24
jtagmkII.c
View File

@ -359,7 +359,7 @@ int jtagmkII_send(PROGRAMMER * pgm, unsigned char * data, size_t len)
crcappend(buf, len + 8); crcappend(buf, len + 8);
if (serial_send(pgm->fd, buf, len + 10) != 0) { if (serial_send(&pgm->fd, buf, len + 10) != 0) {
fprintf(stderr, fprintf(stderr,
"%s: jtagmkII_send(): failed to send command to serial port\n", "%s: jtagmkII_send(): failed to send command to serial port\n",
progname); progname);
@ -374,7 +374,7 @@ int jtagmkII_send(PROGRAMMER * pgm, unsigned char * data, size_t len)
static int jtagmkII_drain(PROGRAMMER * pgm, int display) static int jtagmkII_drain(PROGRAMMER * pgm, int display)
{ {
return serial_drain(pgm->fd, display); return serial_drain(&pgm->fd, display);
} }
@ -423,9 +423,9 @@ static int jtagmkII_recv_frame(PROGRAMMER * pgm, unsigned char **msg,
if (ignorpkt) { if (ignorpkt) {
/* skip packet's contents */ /* skip packet's contents */
for(l = 0; l < msglen; l++) for(l = 0; l < msglen; l++)
rv += serial_recv(pgm->fd, &c, 1); rv += serial_recv(&pgm->fd, &c, 1);
} else { } else {
rv += serial_recv(pgm->fd, buf + 8, msglen); rv += serial_recv(&pgm->fd, buf + 8, msglen);
} }
if (rv != 0) { if (rv != 0) {
timedout: timedout:
@ -438,7 +438,7 @@ static int jtagmkII_recv_frame(PROGRAMMER * pgm, unsigned char **msg,
return -1; return -1;
} }
} else { } else {
if (serial_recv(pgm->fd, &c, 1) != 0) if (serial_recv(&pgm->fd, &c, 1) != 0)
goto timedout; goto timedout;
} }
checksum ^= c; checksum ^= c;
@ -1099,7 +1099,7 @@ static int jtagmkII_initialize(PROGRAMMER * pgm, AVRPART * p)
"trying to set baudrate to %d\n", "trying to set baudrate to %d\n",
progname, pgm->baudrate); progname, pgm->baudrate);
if (jtagmkII_setparm(pgm, PAR_BAUD_RATE, &b) == 0) if (jtagmkII_setparm(pgm, PAR_BAUD_RATE, &b) == 0)
serial_setspeed(pgm->fd, pgm->baudrate); serial_setspeed(&pgm->fd, pgm->baudrate);
} }
} }
if (!(pgm->flag & PGM_FL_IS_DW) && pgm->bitclock != 0.0) { if (!(pgm->flag & PGM_FL_IS_DW) && pgm->bitclock != 0.0) {
@ -1199,7 +1199,7 @@ static int jtagmkII_open(PROGRAMMER * pgm, char * port)
} }
strcpy(pgm->port, port); strcpy(pgm->port, port);
pgm->fd = serial_open(port, baud); serial_open(port, baud, &pgm->fd);
/* /*
* drain any extraneous input * drain any extraneous input
@ -1244,7 +1244,7 @@ static int jtagmkII_open_dw(PROGRAMMER * pgm, char * port)
} }
strcpy(pgm->port, port); strcpy(pgm->port, port);
pgm->fd = serial_open(port, baud); serial_open(port, baud, &pgm->fd);
/* /*
* drain any extraneous input * drain any extraneous input
@ -1289,7 +1289,7 @@ static int jtagmkII_dragon_open(PROGRAMMER * pgm, char * port)
} }
strcpy(pgm->port, port); strcpy(pgm->port, port);
pgm->fd = serial_open(port, baud); serial_open(port, baud, &pgm->fd);
/* /*
* drain any extraneous input * drain any extraneous input
@ -1334,7 +1334,7 @@ static int jtagmkII_dragon_open_dw(PROGRAMMER * pgm, char * port)
} }
strcpy(pgm->port, port); strcpy(pgm->port, port);
pgm->fd = serial_open(port, baud); serial_open(port, baud, &pgm->fd);
/* /*
* drain any extraneous input * drain any extraneous input
@ -1418,8 +1418,8 @@ void jtagmkII_close(PROGRAMMER * pgm)
progname, jtagmkII_get_rc(c)); progname, jtagmkII_get_rc(c));
} }
serial_close(pgm->fd); serial_close(&pgm->fd);
pgm->fd = -1; pgm->fd.ifd = -1;
} }

4
lists.c
View File

@ -1290,8 +1290,8 @@ int lprint ( FILE * f, LISTID lid )
l = (LIST *)lid; l = (LIST *)lid;
fprintf ( f, "list id 0x%08x internal data structures:\n", fprintf ( f, "list id %p internal data structures:\n",
(unsigned int)lid ); lid );
#if CHECK_MAGIC #if CHECK_MAGIC
if ((l->magic1 != MAGIC) || (l->magic2 != MAGIC)) { if ((l->magic1 != MAGIC) || (l->magic2 != MAGIC)) {
fprintf ( f, " *** WARNING: LIST MAGIC IS CORRUPT ***\n" ); fprintf ( f, " *** WARNING: LIST MAGIC IS CORRUPT ***\n" );

30
par.c
View File

@ -96,9 +96,9 @@ static int par_setpin(PROGRAMMER * pgm, int pin, int value)
value = !value; value = !value;
if (value) if (value)
ppi_set(pgm->fd, ppipins[pin].reg, ppipins[pin].bit); ppi_set(&pgm->fd, ppipins[pin].reg, ppipins[pin].bit);
else else
ppi_clr(pgm->fd, ppipins[pin].reg, ppipins[pin].bit); ppi_clr(&pgm->fd, ppipins[pin].reg, ppipins[pin].bit);
if (pgm->ispdelay > 1) if (pgm->ispdelay > 1)
bitbang_delay(pgm->ispdelay); bitbang_delay(pgm->ispdelay);
@ -129,7 +129,7 @@ static int par_getpin(PROGRAMMER * pgm, int pin)
pin--; pin--;
value = ppi_get(pgm->fd, ppipins[pin].reg, ppipins[pin].bit); value = ppi_get(&pgm->fd, ppipins[pin].reg, ppipins[pin].bit);
if (value) if (value)
value = 1; value = 1;
@ -160,19 +160,19 @@ static int par_highpulsepin(PROGRAMMER * pgm, int pin)
inverted = !inverted; inverted = !inverted;
if (inverted) { if (inverted) {
ppi_clr(pgm->fd, ppipins[pin].reg, ppipins[pin].bit); ppi_clr(&pgm->fd, ppipins[pin].reg, ppipins[pin].bit);
if (pgm->ispdelay > 1) if (pgm->ispdelay > 1)
bitbang_delay(pgm->ispdelay); bitbang_delay(pgm->ispdelay);
ppi_set(pgm->fd, ppipins[pin].reg, ppipins[pin].bit); ppi_set(&pgm->fd, ppipins[pin].reg, ppipins[pin].bit);
if (pgm->ispdelay > 1) if (pgm->ispdelay > 1)
bitbang_delay(pgm->ispdelay); bitbang_delay(pgm->ispdelay);
} else { } else {
ppi_set(pgm->fd, ppipins[pin].reg, ppipins[pin].bit); ppi_set(&pgm->fd, ppipins[pin].reg, ppipins[pin].bit);
if (pgm->ispdelay > 1) if (pgm->ispdelay > 1)
bitbang_delay(pgm->ispdelay); bitbang_delay(pgm->ispdelay);
ppi_clr(pgm->fd, ppipins[pin].reg, ppipins[pin].bit); ppi_clr(&pgm->fd, ppipins[pin].reg, ppipins[pin].bit);
if (pgm->ispdelay > 1) if (pgm->ispdelay > 1)
bitbang_delay(pgm->ispdelay); bitbang_delay(pgm->ispdelay);
} }
@ -250,8 +250,8 @@ static int par_open(PROGRAMMER * pgm, char * port)
bitbang_check_prerequisites(pgm); bitbang_check_prerequisites(pgm);
pgm->fd = ppi_open(port); ppi_open(port, &pgm->fd);
if (pgm->fd < 0) { if (pgm->fd.ifd < 0) {
fprintf(stderr, "%s: failed to open parallel port \"%s\"\n\n", fprintf(stderr, "%s: failed to open parallel port \"%s\"\n\n",
progname, port); progname, port);
exit(1); exit(1);
@ -260,14 +260,14 @@ static int par_open(PROGRAMMER * pgm, char * port)
/* /*
* save pin values, so they can be restored when device is closed * save pin values, so they can be restored when device is closed
*/ */
rc = ppi_getall(pgm->fd, PPIDATA); rc = ppi_getall(&pgm->fd, PPIDATA);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "%s: error reading status of ppi data port\n", progname); fprintf(stderr, "%s: error reading status of ppi data port\n", progname);
return -1; return -1;
} }
pgm->ppidata = rc; pgm->ppidata = rc;
rc = ppi_getall(pgm->fd, PPICTRL); rc = ppi_getall(&pgm->fd, PPICTRL);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "%s: error reading status of ppi ctrl port\n", progname); fprintf(stderr, "%s: error reading status of ppi ctrl port\n", progname);
return -1; return -1;
@ -285,8 +285,8 @@ static void par_close(PROGRAMMER * pgm)
* Restore pin values before closing, * Restore pin values before closing,
* but ensure that buffers are turned off. * but ensure that buffers are turned off.
*/ */
ppi_setall(pgm->fd, PPIDATA, pgm->ppidata); ppi_setall(&pgm->fd, PPIDATA, pgm->ppidata);
ppi_setall(pgm->fd, PPICTRL, pgm->ppictrl); ppi_setall(&pgm->fd, PPICTRL, pgm->ppictrl);
par_setpin(pgm, pgm->pinno[PPI_AVR_BUFF], 1); par_setpin(pgm, pgm->pinno[PPI_AVR_BUFF], 1);
@ -320,8 +320,8 @@ static void par_close(PROGRAMMER * pgm)
break; break;
} }
ppi_close(pgm->fd); ppi_close(&pgm->fd);
pgm->fd = -1; pgm->fd.ifd = -1;
} }
static void par_display(PROGRAMMER * pgm, char * p) static void par_display(PROGRAMMER * pgm, char * p)

5
pgm.h
View File

@ -27,7 +27,7 @@
#include "avrpart.h" #include "avrpart.h"
#include "lists.h" #include "lists.h"
#include "pindefs.h" #include "pindefs.h"
#include "serial.h"
#define ON 1 #define ON 1
#define OFF 0 #define OFF 0
@ -63,7 +63,7 @@ typedef struct programmer_t {
int baudrate; int baudrate;
double bitclock; /* JTAG ICE clock period in microseconds */ double bitclock; /* JTAG ICE clock period in microseconds */
int ispdelay; /* ISP clock delay */ int ispdelay; /* ISP clock delay */
int fd; union filedescriptor fd;
int page_size; /* page size if the programmer supports paged write/load */ int page_size; /* page size if the programmer supports paged write/load */
int (*rdy_led) (struct programmer_t * pgm, int value); int (*rdy_led) (struct programmer_t * pgm, int value);
int (*err_led) (struct programmer_t * pgm, int value); int (*err_led) (struct programmer_t * pgm, int value);
@ -124,6 +124,7 @@ PROGRAMMER * pgm_new(void);
void usleep(unsigned long us); void usleep(unsigned long us);
#if !defined(HAVE_GETTIMEOFDAY) #if !defined(HAVE_GETTIMEOFDAY)
struct timezone;
int gettimeofday(struct timeval *tv, struct timezone *tz); int gettimeofday(struct timeval *tv, struct timezone *tz);
#endif /* HAVE_GETTIMEOFDAY */ #endif /* HAVE_GETTIMEOFDAY */

55
ppi.c
View File

@ -54,7 +54,7 @@ enum {
PPI_SHADOWREAD PPI_SHADOWREAD
}; };
int ppi_shadow_access(int fd, int reg, unsigned char *v, unsigned char action) int ppi_shadow_access(union filedescriptor *fdp, int reg, unsigned char *v, unsigned char action)
{ {
static unsigned char shadow[3]; static unsigned char shadow[3];
int shadow_num; int shadow_num;
@ -81,12 +81,12 @@ int ppi_shadow_access(int fd, int reg, unsigned char *v, unsigned char action)
*v = shadow[shadow_num]; *v = shadow[shadow_num];
break; break;
case PPI_READ: case PPI_READ:
DO_PPI_READ(fd, reg, v); DO_PPI_READ(fdp->ifd, reg, v);
shadow[shadow_num]=*v; shadow[shadow_num]=*v;
break; break;
case PPI_WRITE: case PPI_WRITE:
shadow[shadow_num]=*v; shadow[shadow_num]=*v;
DO_PPI_WRITE(fd, reg, v); DO_PPI_WRITE(fdp->ifd, reg, v);
break; break;
} }
return 0; return 0;
@ -95,14 +95,14 @@ int ppi_shadow_access(int fd, int reg, unsigned char *v, unsigned char action)
/* /*
* set the indicated bit of the specified register. * set the indicated bit of the specified register.
*/ */
int ppi_set(int fd, int reg, int bit) int ppi_set(union filedescriptor *fdp, int reg, int bit)
{ {
unsigned char v; unsigned char v;
int rc; int rc;
rc = ppi_shadow_access(fd, reg, &v, PPI_SHADOWREAD); rc = ppi_shadow_access(fdp, reg, &v, PPI_SHADOWREAD);
v |= bit; v |= bit;
rc |= ppi_shadow_access(fd, reg, &v, PPI_WRITE); rc |= ppi_shadow_access(fdp, reg, &v, PPI_WRITE);
if (rc) if (rc)
return -1; return -1;
@ -114,14 +114,14 @@ int ppi_set(int fd, int reg, int bit)
/* /*
* clear the indicated bit of the specified register. * clear the indicated bit of the specified register.
*/ */
int ppi_clr(int fd, int reg, int bit) int ppi_clr(union filedescriptor *fdp, int reg, int bit)
{ {
unsigned char v; unsigned char v;
int rc; int rc;
rc = ppi_shadow_access(fd, reg, &v, PPI_SHADOWREAD); rc = ppi_shadow_access(fdp, reg, &v, PPI_SHADOWREAD);
v &= ~bit; v &= ~bit;
rc |= ppi_shadow_access(fd, reg, &v, PPI_WRITE); rc |= ppi_shadow_access(fdp, reg, &v, PPI_WRITE);
if (rc) if (rc)
return -1; return -1;
@ -133,12 +133,12 @@ int ppi_clr(int fd, int reg, int bit)
/* /*
* get the indicated bit of the specified register. * get the indicated bit of the specified register.
*/ */
int ppi_get(int fd, int reg, int bit) int ppi_get(union filedescriptor *fdp, int reg, int bit)
{ {
unsigned char v; unsigned char v;
int rc; int rc;
rc = ppi_shadow_access(fd, reg, &v, PPI_READ); rc = ppi_shadow_access(fdp, reg, &v, PPI_READ);
v &= bit; v &= bit;
if (rc) if (rc)
@ -150,14 +150,14 @@ int ppi_get(int fd, int reg, int bit)
/* /*
* toggle the indicated bit of the specified register. * toggle the indicated bit of the specified register.
*/ */
int ppi_toggle(int fd, int reg, int bit) int ppi_toggle(union filedescriptor *fdp, int reg, int bit)
{ {
unsigned char v; unsigned char v;
int rc; int rc;
rc = ppi_shadow_access(fd, reg, &v, PPI_SHADOWREAD); rc = ppi_shadow_access(fdp, reg, &v, PPI_SHADOWREAD);
v ^= bit; v ^= bit;
rc |= ppi_shadow_access(fd, reg, &v, PPI_WRITE); rc |= ppi_shadow_access(fdp, reg, &v, PPI_WRITE);
if (rc) if (rc)
return -1; return -1;
@ -169,12 +169,12 @@ int ppi_toggle(int fd, int reg, int bit)
/* /*
* get all bits of the specified register. * get all bits of the specified register.
*/ */
int ppi_getall(int fd, int reg) int ppi_getall(union filedescriptor *fdp, int reg)
{ {
unsigned char v; unsigned char v;
int rc; int rc;
rc = ppi_shadow_access(fd, reg, &v, PPI_READ); rc = ppi_shadow_access(fdp, reg, &v, PPI_READ);
if (rc) if (rc)
return -1; return -1;
@ -185,13 +185,13 @@ int ppi_getall(int fd, int reg)
/* /*
* set all bits of the specified register to val. * set all bits of the specified register to val.
*/ */
int ppi_setall(int fd, int reg, int val) int ppi_setall(union filedescriptor *fdp, int reg, int val)
{ {
unsigned char v; unsigned char v;
int rc; int rc;
v = val; v = val;
rc = ppi_shadow_access(fd, reg, &v, PPI_WRITE); rc = ppi_shadow_access(fdp, reg, &v, PPI_WRITE);
if (rc) if (rc)
return -1; return -1;
@ -200,7 +200,7 @@ int ppi_setall(int fd, int reg, int val)
} }
int ppi_open(char * port) void ppi_open(char * port, union filedescriptor *fdp)
{ {
int fd; int fd;
unsigned char v; unsigned char v;
@ -209,7 +209,8 @@ int ppi_open(char * port)
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "%s: can't open device \"%s\": %s\n", fprintf(stderr, "%s: can't open device \"%s\": %s\n",
progname, port, strerror(errno)); progname, port, strerror(errno));
return -1; fdp->ifd = -1;
return;
} }
ppi_claim (fd); ppi_claim (fd);
@ -218,18 +219,18 @@ int ppi_open(char * port)
* Initialize shadow registers * Initialize shadow registers
*/ */
ppi_shadow_access (fd, PPIDATA, &v, PPI_READ); ppi_shadow_access (fdp, PPIDATA, &v, PPI_READ);
ppi_shadow_access (fd, PPICTRL, &v, PPI_READ); ppi_shadow_access (fdp, PPICTRL, &v, PPI_READ);
ppi_shadow_access (fd, PPISTATUS, &v, PPI_READ); ppi_shadow_access (fdp, PPISTATUS, &v, PPI_READ);
return fd; fdp->ifd = fd;
} }
void ppi_close(int fd) void ppi_close(union filedescriptor *fdp)
{ {
ppi_release (fd); ppi_release (fdp->ifd);
close(fd); close(fdp->ifd);
} }
#endif /* HAVE_PARPORT */ #endif /* HAVE_PARPORT */

16
ppi.h
View File

@ -33,21 +33,21 @@ enum {
int ppi_get (int fd, int reg, int bit); int ppi_get (union filedescriptor *fdp, int reg, int bit);
int ppi_set (int fd, int reg, int bit); int ppi_set (union filedescriptor *fdp, int reg, int bit);
int ppi_clr (int fd, int reg, int bit); int ppi_clr (union filedescriptor *fdp, int reg, int bit);
int ppi_getall (int fd, int reg); int ppi_getall (union filedescriptor *fdp, int reg);
int ppi_setall (int fd, int reg, int val); int ppi_setall (union filedescriptor *fdp, int reg, int val);
int ppi_toggle (int fd, int reg, int bit); int ppi_toggle (union filedescriptor *fdp, int reg, int bit);
int ppi_open (char * port); void ppi_open (char * port, union filedescriptor *fdp);
void ppi_close (int fd); void ppi_close (union filedescriptor *fdp);
#endif #endif

44
ppiwin.c
View File

@ -43,6 +43,7 @@ reg = register as defined in an enum in ppi.h. This must be converted
#include <windows.h> #include <windows.h>
#include <sys/time.h> #include <sys/time.h>
#include <windows.h> #include <windows.h>
#include "serial.h"
#include "ppi.h" #include "ppi.h"
extern char *progname; extern char *progname;
@ -74,7 +75,7 @@ static const winpp winports[DEVICE_MAX] =
/* FUNCTION PROTOTYPES */ /* FUNCTION PROTOTYPES */
static int winnt_pp_open(void); static int winnt_pp_open(void);
static unsigned short port_get(int fd, int reg); static unsigned short port_get(union filedescriptor *fdp, int reg);
static unsigned char reg2offset(int reg); static unsigned char reg2offset(int reg);
static unsigned char inb(unsigned short port); static unsigned char inb(unsigned short port);
static void outb(unsigned char value, unsigned short port); static void outb(unsigned char value, unsigned short port);
@ -83,7 +84,7 @@ static void outb(unsigned char value, unsigned short port);
/* FUNCTION DEFINITIONS */ /* FUNCTION DEFINITIONS */
int ppi_open(char *port) void ppi_open(char *port, union filedescriptor *fdp)
{ {
unsigned char i; unsigned char i;
int fd; int fd;
@ -93,7 +94,8 @@ int ppi_open(char *port)
if(fd < 0) if(fd < 0)
{ {
fprintf(stderr, "%s: can't open device \"giveio\"\n\n", progname); fprintf(stderr, "%s: can't open device \"giveio\"\n\n", progname);
return(-1); fdp->ifd = -1;
return;
} }
/* Search the windows port names for a match */ /* Search the windows port names for a match */
@ -110,10 +112,11 @@ int ppi_open(char *port)
if(fd < 0) if(fd < 0)
{ {
fprintf(stderr, "%s: can't open device \"%s\"\n\n", progname, port); fprintf(stderr, "%s: can't open device \"%s\"\n\n", progname, port);
return(-1); fdp->ifd = -1;
return;
} }
return(fd); fdp->ifd = fd;
} }
@ -158,7 +161,7 @@ static int winnt_pp_open(void)
void ppi_close(int fd) void ppi_close(union filedescriptor *fdp)
{ {
return; return;
} }
@ -168,12 +171,12 @@ void ppi_close(int fd)
/* /*
* set the indicated bit of the specified register. * set the indicated bit of the specified register.
*/ */
int ppi_set(int fd, int reg, int bit) int ppi_set(union filedescriptor *fdp, int reg, int bit)
{ {
unsigned char v; unsigned char v;
unsigned short port; unsigned short port;
port = port_get(fd, reg); port = port_get(fdp, reg);
v = inb(port); v = inb(port);
v |= bit; v |= bit;
outb(v, port); outb(v, port);
@ -184,12 +187,12 @@ int ppi_set(int fd, int reg, int bit)
/* /*
* clear the indicated bit of the specified register. * clear the indicated bit of the specified register.
*/ */
int ppi_clr(int fd, int reg, int bit) int ppi_clr(union filedescriptor *fdp, int reg, int bit)
{ {
unsigned char v; unsigned char v;
unsigned short port; unsigned short port;
port = port_get(fd, reg); port = port_get(fdp, reg);
v = inb(port); v = inb(port);
v &= ~bit; v &= ~bit;
outb(v, port); outb(v, port);
@ -201,11 +204,11 @@ int ppi_clr(int fd, int reg, int bit)
/* /*
* get the indicated bit of the specified register. * get the indicated bit of the specified register.
*/ */
int ppi_get(int fd, int reg, int bit) int ppi_get(union filedescriptor *fdp, int reg, int bit)
{ {
unsigned char v; unsigned char v;
v = inb(port_get(fd, reg)); v = inb(port_get(fdp, reg));
v &= bit; v &= bit;
return(v); return(v);
@ -217,12 +220,12 @@ int ppi_get(int fd, int reg, int bit)
/* /*
* toggle the indicated bit of the specified register. * toggle the indicated bit of the specified register.
*/ */
int ppi_toggle(int fd, int reg, int bit) int ppi_toggle(union filedescriptor *fdp, int reg, int bit)
{ {
unsigned char v; unsigned char v;
unsigned short port; unsigned short port;
port = port_get(fd, reg); port = port_get(fdp, reg);
v = inb(port); v = inb(port);
v ^= bit; v ^= bit;
@ -235,11 +238,11 @@ int ppi_toggle(int fd, int reg, int bit)
/* /*
* get all bits of the specified register. * get all bits of the specified register.
*/ */
int ppi_getall(int fd, int reg) int ppi_getall(union filedescriptor *fdp, int reg)
{ {
unsigned char v; unsigned char v;
v = inb(port_get(fd, reg)); v = inb(port_get(fdp, reg));
return((int)v); return((int)v);
} }
@ -250,9 +253,9 @@ int ppi_getall(int fd, int reg)
/* /*
* set all bits of the specified register to val. * set all bits of the specified register to val.
*/ */
int ppi_setall(int fd, int reg, int val) int ppi_setall(union filedescriptor *fdp, int reg, int val)
{ {
outb((unsigned char)val, port_get(fd, reg)); outb((unsigned char)val, port_get(fdp, reg));
return 0; return 0;
} }
@ -260,9 +263,9 @@ int ppi_setall(int fd, int reg, int val)
/* Calculate port address to access. */ /* Calculate port address to access. */
static unsigned short port_get(int fd, int reg) static unsigned short port_get(union filedescriptor *fdp, int reg)
{ {
return((unsigned short)(fd + reg2offset(reg))); return((unsigned short)(fdp->ifd + reg2offset(reg)));
} }
@ -318,6 +321,7 @@ static void outb(unsigned char value, unsigned short port)
} }
#if !defined(HAVE_GETTIMEOFDAY) #if !defined(HAVE_GETTIMEOFDAY)
struct timezone;
int gettimeofday(struct timeval *tv, struct timezone *unused){ int gettimeofday(struct timeval *tv, struct timezone *unused){
// i've found only ms resolution, avrdude expects us // i've found only ms resolution, avrdude expects us

57
ser_posix.c
View File

@ -87,19 +87,19 @@ static speed_t serial_baud_lookup(long baud)
exit(1); exit(1);
} }
static int ser_setspeed(int fd, long baud) static int ser_setspeed(union filedescriptor *fd, long baud)
{ {
int rc; int rc;
struct termios termios; struct termios termios;
speed_t speed = serial_baud_lookup (baud); speed_t speed = serial_baud_lookup (baud);
if (!isatty(fd)) if (!isatty(fd->ifd))
return -ENOTTY; return -ENOTTY;
/* /*
* initialize terminal modes * initialize terminal modes
*/ */
rc = tcgetattr(fd, &termios); rc = tcgetattr(fd->ifd, &termios);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "%s: ser_setspeed(): tcgetattr() failed", fprintf(stderr, "%s: ser_setspeed(): tcgetattr() failed",
progname); progname);
@ -123,7 +123,7 @@ static int ser_setspeed(int fd, long baud)
cfsetospeed(&termios, speed); cfsetospeed(&termios, speed);
cfsetispeed(&termios, speed); cfsetispeed(&termios, speed);
rc = tcsetattr(fd, TCSANOW | TCSAFLUSH, &termios); rc = tcsetattr(fd->ifd, TCSANOW | TCSAFLUSH, &termios);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "%s: ser_setspeed(): tcsetattr() failed", fprintf(stderr, "%s: ser_setspeed(): tcsetattr() failed",
progname); progname);
@ -134,9 +134,9 @@ static int ser_setspeed(int fd, long baud)
* Everything is now set up for a local line without modem control * Everything is now set up for a local line without modem control
* or flow control, so clear O_NONBLOCK again. * or flow control, so clear O_NONBLOCK again.
*/ */
rc = fcntl(fd, F_GETFL, 0); rc = fcntl(fd->ifd, F_GETFL, 0);
if (rc != -1) if (rc != -1)
fcntl(fd, F_SETFL, rc & ~O_NONBLOCK); fcntl(fd->ifd, F_SETFL, rc & ~O_NONBLOCK);
return 0; return 0;
} }
@ -147,8 +147,8 @@ static int ser_setspeed(int fd, long baud)
* terminal/console server with serial parameters configured * terminal/console server with serial parameters configured
* appropriately (e. g. 115200-8-N-1 for a STK500.) * appropriately (e. g. 115200-8-N-1 for a STK500.)
*/ */
static int static void
net_open(const char *port) net_open(const char *port, union filedescriptor *fdp)
{ {
char *hstr, *pstr, *end; char *hstr, *pstr, *end;
unsigned int pnum; unsigned int pnum;
@ -209,10 +209,10 @@ net_open(const char *port)
exit(1); exit(1);
} }
return fd; fdp->ifd = fd;
} }
static int ser_open(char * port, long baud) static void ser_open(char * port, long baud, union filedescriptor *fdp)
{ {
int rc; int rc;
int fd; int fd;
@ -222,7 +222,8 @@ static int ser_open(char * port, long baud)
* handle it as a TCP connection to a terminal server. * handle it as a TCP connection to a terminal server.
*/ */
if (strncmp(port, "net:", strlen("net:")) == 0) { if (strncmp(port, "net:", strlen("net:")) == 0) {
return net_open(port + strlen("net:")); net_open(port + strlen("net:"), fdp);
return;
} }
/* /*
@ -238,7 +239,7 @@ static int ser_open(char * port, long baud)
/* /*
* set serial line attributes * set serial line attributes
*/ */
rc = ser_setspeed(fd, baud); rc = ser_setspeed(fdp, baud);
if (rc) { if (rc) {
fprintf(stderr, fprintf(stderr,
"%s: ser_open(): can't set attributes for device \"%s\": %s\n", "%s: ser_open(): can't set attributes for device \"%s\": %s\n",
@ -246,17 +247,17 @@ static int ser_open(char * port, long baud)
exit(1); exit(1);
} }
return fd; fdp->ifd = fd;
} }
static void ser_close(int fd) static void ser_close(union filedescriptor *fd)
{ {
/* /*
* restore original termios settings from ser_open * restore original termios settings from ser_open
*/ */
if (saved_original_termios) { if (saved_original_termios) {
int rc = tcsetattr(fd, TCSANOW | TCSADRAIN, &original_termios); int rc = tcsetattr(fd->ifd, TCSANOW | TCSADRAIN, &original_termios);
if (rc) { if (rc) {
fprintf(stderr, fprintf(stderr,
"%s: ser_close(): can't reset attributes for device: %s\n", "%s: ser_close(): can't reset attributes for device: %s\n",
@ -265,11 +266,11 @@ static void ser_close(int fd)
saved_original_termios = 0; saved_original_termios = 0;
} }
close(fd); close(fd->ifd);
} }
static int ser_send(int fd, unsigned char * buf, size_t buflen) static int ser_send(union filedescriptor *fd, unsigned char * buf, size_t buflen)
{ {
struct timeval timeout, to2; struct timeval timeout, to2;
fd_set wfds; fd_set wfds;
@ -309,9 +310,9 @@ static int ser_send(int fd, unsigned char * buf, size_t buflen)
while (len) { while (len) {
reselect: reselect:
FD_ZERO(&wfds); FD_ZERO(&wfds);
FD_SET(fd, &wfds); FD_SET(fd->ifd, &wfds);
nfds = select(fd+1, NULL, &wfds, NULL, &to2); nfds = select(fd->ifd + 1, NULL, &wfds, NULL, &to2);
if (nfds == 0) { if (nfds == 0) {
if (verbose >= 1) if (verbose >= 1)
fprintf(stderr, fprintf(stderr,
@ -330,7 +331,7 @@ static int ser_send(int fd, unsigned char * buf, size_t buflen)
} }
} }
rc = write(fd, p, (len > 1024) ? 1024 : len); rc = write(fd->ifd, p, (len > 1024) ? 1024 : len);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "%s: ser_send(): write error: %s\n", fprintf(stderr, "%s: ser_send(): write error: %s\n",
progname, strerror(errno)); progname, strerror(errno));
@ -344,7 +345,7 @@ static int ser_send(int fd, unsigned char * buf, size_t buflen)
} }
static int ser_recv(int fd, unsigned char * buf, size_t buflen) static int ser_recv(union filedescriptor *fd, unsigned char * buf, size_t buflen)
{ {
struct timeval timeout, to2; struct timeval timeout, to2;
fd_set rfds; fd_set rfds;
@ -360,9 +361,9 @@ static int ser_recv(int fd, unsigned char * buf, size_t buflen)
while (len < buflen) { while (len < buflen) {
reselect: reselect:
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_SET(fd, &rfds); FD_SET(fd->ifd, &rfds);
nfds = select(fd+1, &rfds, NULL, NULL, &to2); nfds = select(fd->ifd + 1, &rfds, NULL, NULL, &to2);
if (nfds == 0) { if (nfds == 0) {
if (verbose > 1) if (verbose > 1)
fprintf(stderr, fprintf(stderr,
@ -384,7 +385,7 @@ static int ser_recv(int fd, unsigned char * buf, size_t buflen)
} }
} }
rc = read(fd, p, (buflen - len > 1024) ? 1024 : buflen - len); rc = read(fd->ifd, p, (buflen - len > 1024) ? 1024 : buflen - len);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "%s: ser_recv(): read error: %s\n", fprintf(stderr, "%s: ser_recv(): read error: %s\n",
progname, strerror(errno)); progname, strerror(errno));
@ -420,7 +421,7 @@ static int ser_recv(int fd, unsigned char * buf, size_t buflen)
} }
static int ser_drain(int fd, int display) static int ser_drain(union filedescriptor *fd, int display)
{ {
struct timeval timeout; struct timeval timeout;
fd_set rfds; fd_set rfds;
@ -437,10 +438,10 @@ static int ser_drain(int fd, int display)
while (1) { while (1) {
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_SET(fd, &rfds); FD_SET(fd->ifd, &rfds);
reselect: reselect:
nfds = select(fd+1, &rfds, NULL, NULL, &timeout); nfds = select(fd->ifd + 1, &rfds, NULL, NULL, &timeout);
if (nfds == 0) { if (nfds == 0) {
if (display) { if (display) {
fprintf(stderr, "<drain\n"); fprintf(stderr, "<drain\n");
@ -459,7 +460,7 @@ static int ser_drain(int fd, int display)
} }
} }
rc = read(fd, &buf, 1); rc = read(fd->ifd, &buf, 1);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "%s: ser_drain(): read error: %s\n", fprintf(stderr, "%s: ser_drain(): read error: %s\n",
progname, strerror(errno)); progname, strerror(errno));

32
ser_win32.c
View File

@ -84,10 +84,10 @@ static BOOL serial_w32SetTimeOut(HANDLE hComPort, DWORD timeout) // in ms
return SetCommTimeouts(hComPort, &ctmo); return SetCommTimeouts(hComPort, &ctmo);
} }
static int ser_setspeed(int fd, long baud) static int ser_setspeed(union filedescriptor *fd, long baud)
{ {
DCB dcb; DCB dcb;
HANDLE hComPort = (HANDLE)fd; HANDLE hComPort = (HANDLE)fd->pfd;
ZeroMemory (&dcb, sizeof(DCB)); ZeroMemory (&dcb, sizeof(DCB));
dcb.DCBlength = sizeof(DCB); dcb.DCBlength = sizeof(DCB);
@ -106,7 +106,7 @@ static int ser_setspeed(int fd, long baud)
} }
static int ser_open(char * port, long baud) static void ser_open(char * port, long baud, union filedescriptor *fdp)
{ {
LPVOID lpMsgBuf; LPVOID lpMsgBuf;
HANDLE hComPort=INVALID_HANDLE_VALUE; HANDLE hComPort=INVALID_HANDLE_VALUE;
@ -158,8 +158,8 @@ static int ser_open(char * port, long baud)
exit(1); exit(1);
} }
fdp->pfd = (void *)hComPort;
if (ser_setspeed((int)hComPort, baud) != 0) if (ser_setspeed(fdp, baud) != 0)
{ {
CloseHandle(hComPort); CloseHandle(hComPort);
fprintf(stderr, "%s: ser_open(): can't set com-state for \"%s\"\n", fprintf(stderr, "%s: ser_open(): can't set com-state for \"%s\"\n",
@ -174,14 +174,12 @@ static int ser_open(char * port, long baud)
progname, port); progname, port);
exit(1); exit(1);
} }
return (int)hComPort;
} }
static void ser_close(int fd) static void ser_close(union filedescriptor *fd)
{ {
HANDLE hComPort=(HANDLE)fd; HANDLE hComPort=(HANDLE)fd->pfd;
if (hComPort != INVALID_HANDLE_VALUE) if (hComPort != INVALID_HANDLE_VALUE)
CloseHandle (hComPort); CloseHandle (hComPort);
@ -189,14 +187,14 @@ static void ser_close(int fd)
} }
static int ser_send(int fd, char * buf, size_t buflen) static int ser_send(union filedescriptor *fd, unsigned char * buf, size_t buflen)
{ {
size_t len = buflen; size_t len = buflen;
unsigned char c='\0'; unsigned char c='\0';
DWORD written; DWORD written;
char * b = buf; unsigned char * b = buf;
HANDLE hComPort=(HANDLE)fd; HANDLE hComPort=(HANDLE)fd->pfd;
if (hComPort == INVALID_HANDLE_VALUE) { if (hComPort == INVALID_HANDLE_VALUE) {
fprintf(stderr, "%s: ser_send(): port not open\n", fprintf(stderr, "%s: ser_send(): port not open\n",
@ -244,14 +242,14 @@ static int ser_send(int fd, char * buf, size_t buflen)
} }
static int ser_recv(int fd, char * buf, size_t buflen) static int ser_recv(union filedescriptor *fd, unsigned char * buf, size_t buflen)
{ {
unsigned char c; unsigned char c;
char * p = buf; unsigned char * p = buf;
size_t len = 0; size_t len = 0;
DWORD read; DWORD read;
HANDLE hComPort=(HANDLE)fd; HANDLE hComPort=(HANDLE)fd->pfd;
if (hComPort == INVALID_HANDLE_VALUE) { if (hComPort == INVALID_HANDLE_VALUE) {
fprintf(stderr, "%s: ser_read(): port not open\n", fprintf(stderr, "%s: ser_read(): port not open\n",
@ -304,14 +302,14 @@ static int ser_recv(int fd, char * buf, size_t buflen)
} }
static int ser_drain(int fd, int display) static int ser_drain(union filedescriptor *fd, int display)
{ {
// int rc; // int rc;
unsigned char buf[10]; unsigned char buf[10];
BOOL readres; BOOL readres;
DWORD read; DWORD read;
HANDLE hComPort=(HANDLE)fd; HANDLE hComPort=(HANDLE)fd->pfd;
if (hComPort == INVALID_HANDLE_VALUE) { if (hComPort == INVALID_HANDLE_VALUE) {
fprintf(stderr, "%s: ser_drain(): port not open\n", fprintf(stderr, "%s: ser_drain(): port not open\n",

26
serbb_posix.c
View File

@ -92,7 +92,7 @@ static int serbb_setpin(PROGRAMMER * pgm, int pin, int value)
switch ( pin ) switch ( pin )
{ {
case 3: /* txd */ case 3: /* txd */
r = ioctl(pgm->fd, value ? TIOCSBRK : TIOCCBRK, 0); r = ioctl(pgm->fd.ifd, value ? TIOCSBRK : TIOCCBRK, 0);
if (r < 0) { if (r < 0) {
perror("ioctl(\"TIOCxBRK\")"); perror("ioctl(\"TIOCxBRK\")");
return -1; return -1;
@ -101,7 +101,7 @@ static int serbb_setpin(PROGRAMMER * pgm, int pin, int value)
case 4: /* dtr */ case 4: /* dtr */
case 7: /* rts */ case 7: /* rts */
r = ioctl(pgm->fd, TIOCMGET, &ctl); r = ioctl(pgm->fd.ifd, TIOCMGET, &ctl);
if (r < 0) { if (r < 0) {
perror("ioctl(\"TIOCMGET\")"); perror("ioctl(\"TIOCMGET\")");
return -1; return -1;
@ -110,7 +110,7 @@ static int serbb_setpin(PROGRAMMER * pgm, int pin, int value)
ctl |= serregbits[pin]; ctl |= serregbits[pin];
else else
ctl &= ~(serregbits[pin]); ctl &= ~(serregbits[pin]);
r = ioctl(pgm->fd, TIOCMSET, &ctl); r = ioctl(pgm->fd.ifd, TIOCMSET, &ctl);
if (r < 0) { if (r < 0) {
perror("ioctl(\"TIOCMSET\")"); perror("ioctl(\"TIOCMSET\")");
return -1; return -1;
@ -147,7 +147,7 @@ static int serbb_getpin(PROGRAMMER * pgm, int pin)
case 6: /* dsr */ case 6: /* dsr */
case 8: /* cts */ case 8: /* cts */
case 9: /* ri */ case 9: /* ri */
r = ioctl(pgm->fd, TIOCMGET, &ctl); r = ioctl(pgm->fd.ifd, TIOCMGET, &ctl);
if (r < 0) { if (r < 0) {
perror("ioctl(\"TIOCMGET\")"); perror("ioctl(\"TIOCMGET\")");
return -1; return -1;
@ -225,14 +225,14 @@ static int serbb_open(PROGRAMMER *pgm, char *port)
/* adapted from uisp code */ /* adapted from uisp code */
pgm->fd = open(port, O_RDWR | O_NOCTTY | O_NONBLOCK); pgm->fd.ifd = open(port, O_RDWR | O_NOCTTY | O_NONBLOCK);
if (pgm->fd < 0) { if (pgm->fd.ifd < 0) {
perror(port); perror(port);
return(-1); return(-1);
} }
r = tcgetattr(pgm->fd, &mode); r = tcgetattr(pgm->fd.ifd, &mode);
if (r < 0) { if (r < 0) {
fprintf(stderr, "%s: ", port); fprintf(stderr, "%s: ", port);
perror("tcgetattr"); perror("tcgetattr");
@ -246,7 +246,7 @@ static int serbb_open(PROGRAMMER *pgm, char *port)
mode.c_cc [VMIN] = 1; mode.c_cc [VMIN] = 1;
mode.c_cc [VTIME] = 0; mode.c_cc [VTIME] = 0;
r = tcsetattr(pgm->fd, TCSANOW, &mode); r = tcsetattr(pgm->fd.ifd, TCSANOW, &mode);
if (r < 0) { if (r < 0) {
fprintf(stderr, "%s: ", port); fprintf(stderr, "%s: ", port);
perror("tcsetattr"); perror("tcsetattr");
@ -254,7 +254,7 @@ static int serbb_open(PROGRAMMER *pgm, char *port)
} }
/* Clear O_NONBLOCK flag. */ /* Clear O_NONBLOCK flag. */
flags = fcntl(pgm->fd, F_GETFL, 0); flags = fcntl(pgm->fd.ifd, F_GETFL, 0);
if (flags == -1) if (flags == -1)
{ {
fprintf(stderr, "%s: Can not get flags: %s\n", fprintf(stderr, "%s: Can not get flags: %s\n",
@ -262,7 +262,7 @@ static int serbb_open(PROGRAMMER *pgm, char *port)
return(-1); return(-1);
} }
flags &= ~O_NONBLOCK; flags &= ~O_NONBLOCK;
if (fcntl(pgm->fd, F_SETFL, flags) == -1) if (fcntl(pgm->fd.ifd, F_SETFL, flags) == -1)
{ {
fprintf(stderr, "%s: Can not clear nonblock flag: %s\n", fprintf(stderr, "%s: Can not clear nonblock flag: %s\n",
progname, strerror(errno)); progname, strerror(errno));
@ -274,11 +274,11 @@ static int serbb_open(PROGRAMMER *pgm, char *port)
static void serbb_close(PROGRAMMER *pgm) static void serbb_close(PROGRAMMER *pgm)
{ {
if (pgm->fd != -1) if (pgm->fd.ifd != -1)
{ {
(void)tcsetattr(pgm->fd, TCSANOW, &oldmode); (void)tcsetattr(pgm->fd.ifd, TCSANOW, &oldmode);
pgm->setpin(pgm, pgm->pinno[PIN_AVR_RESET], 1); pgm->setpin(pgm, pgm->pinno[PIN_AVR_RESET], 1);
close(pgm->fd); close(pgm->fd.ifd);
} }
return; return;
} }

8
serbb_win32.c
View File

@ -63,7 +63,7 @@ static int dtr, rts, txd;
static int serbb_setpin(PROGRAMMER * pgm, int pin, int value) static int serbb_setpin(PROGRAMMER * pgm, int pin, int value)
{ {
HANDLE hComPort = (HANDLE)pgm->fd; HANDLE hComPort = (HANDLE)pgm->fd.pfd;
LPVOID lpMsgBuf; LPVOID lpMsgBuf;
DWORD dwFunc; DWORD dwFunc;
const char *name; const char *name;
@ -131,7 +131,7 @@ static int serbb_setpin(PROGRAMMER * pgm, int pin, int value)
static int serbb_getpin(PROGRAMMER * pgm, int pin) static int serbb_getpin(PROGRAMMER * pgm, int pin)
{ {
HANDLE hComPort = (HANDLE)pgm->fd; HANDLE hComPort = (HANDLE)pgm->fd.pfd;
LPVOID lpMsgBuf; LPVOID lpMsgBuf;
int invert, rv; int invert, rv;
const char *name; const char *name;
@ -323,7 +323,7 @@ static int serbb_open(PROGRAMMER *pgm, char *port)
"%s: ser_open(): opened comm port \"%s\", handle 0x%x\n", "%s: ser_open(): opened comm port \"%s\", handle 0x%x\n",
progname, port, (int)hComPort); progname, port, (int)hComPort);
pgm->fd = (int)hComPort; pgm->fd.pfd = (void *)hComPort;
dtr = rts = txd = 0; dtr = rts = txd = 0;
@ -332,7 +332,7 @@ static int serbb_open(PROGRAMMER *pgm, char *port)
static void serbb_close(PROGRAMMER *pgm) static void serbb_close(PROGRAMMER *pgm)
{ {
HANDLE hComPort=(HANDLE)pgm->fd; HANDLE hComPort=(HANDLE)pgm->fd.pfd;
if (hComPort != INVALID_HANDLE_VALUE) if (hComPort != INVALID_HANDLE_VALUE)
{ {
pgm->setpin(pgm, pgm->pinno[PIN_AVR_RESET], 1); pgm->setpin(pgm, pgm->pinno[PIN_AVR_RESET], 1);

17
serial.h
View File

@ -31,16 +31,21 @@
#define __serial_h__ #define __serial_h__
extern long serial_recv_timeout; extern long serial_recv_timeout;
union filedescriptor
{
int ifd;
void *pfd;
};
struct serial_device struct serial_device
{ {
int (*open)(char * port, long baud); void (*open)(char * port, long baud, union filedescriptor *fd);
int (*setspeed)(int fd, long baud); int (*setspeed)(union filedescriptor *fd, long baud);
void (*close)(int fd); void (*close)(union filedescriptor *fd);
int (*send)(int fd, unsigned char * buf, size_t buflen); int (*send)(union filedescriptor *fd, unsigned char * buf, size_t buflen);
int (*recv)(int fd, unsigned char * buf, size_t buflen); int (*recv)(union filedescriptor *fd, unsigned char * buf, size_t buflen);
int (*drain)(int fd, int display); int (*drain)(union filedescriptor *fd, int display);
int flags; int flags;
#define SERDEV_FL_NONE 0x0000 /* no flags */ #define SERDEV_FL_NONE 0x0000 /* no flags */

15
stk500.c
View File

@ -57,7 +57,7 @@ static int stk500_is_page_empty(unsigned int address, int page_size,
static int stk500_send(PROGRAMMER * pgm, unsigned char * buf, size_t len) static int stk500_send(PROGRAMMER * pgm, unsigned char * buf, size_t len)
{ {
return serial_send(pgm->fd, buf, len); return serial_send(&pgm->fd, buf, len);
} }
@ -65,7 +65,7 @@ static int stk500_recv(PROGRAMMER * pgm, unsigned char * buf, size_t len)
{ {
int rv; int rv;
rv = serial_recv(pgm->fd, buf, len); rv = serial_recv(&pgm->fd, buf, len);
if (rv < 0) { if (rv < 0) {
fprintf(stderr, fprintf(stderr,
"%s: stk500_recv(): programmer is not responding\n", "%s: stk500_recv(): programmer is not responding\n",
@ -78,7 +78,7 @@ static int stk500_recv(PROGRAMMER * pgm, unsigned char * buf, size_t len)
static int stk500_drain(PROGRAMMER * pgm, int display) static int stk500_drain(PROGRAMMER * pgm, int display)
{ {
return serial_drain(pgm->fd, display); return serial_drain(&pgm->fd, display);
} }
@ -585,10 +585,7 @@ static void stk500_enable(PROGRAMMER * pgm)
static int stk500_open(PROGRAMMER * pgm, char * port) static int stk500_open(PROGRAMMER * pgm, char * port)
{ {
strcpy(pgm->port, port); strcpy(pgm->port, port);
if (pgm->baudrate) serial_open(port, pgm->baudrate? pgm->baudrate: 115200, &pgm->fd);
pgm->fd = serial_open(port, pgm->baudrate);
else
pgm->fd = serial_open(port, 115200);
/* /*
* drain any extraneous input * drain any extraneous input
@ -604,8 +601,8 @@ static int stk500_open(PROGRAMMER * pgm, char * port)
static void stk500_close(PROGRAMMER * pgm) static void stk500_close(PROGRAMMER * pgm)
{ {
serial_close(pgm->fd); serial_close(&pgm->fd);
pgm->fd = -1; pgm->fd.ifd = -1;
} }

22
stk500v2.c
View File

@ -205,7 +205,7 @@ b2_to_u16(unsigned char *b)
static int stk500v2_send_mk2(PROGRAMMER * pgm, unsigned char * data, size_t len) static int stk500v2_send_mk2(PROGRAMMER * pgm, unsigned char * data, size_t len)
{ {
if (serial_send(pgm->fd, data, len) != 0) { if (serial_send(&pgm->fd, data, len) != 0) {
fprintf(stderr,"%s: stk500_send_mk2(): failed to send command to serial port\n",progname); fprintf(stderr,"%s: stk500_send_mk2(): failed to send command to serial port\n",progname);
exit(1); exit(1);
} }
@ -298,7 +298,7 @@ static int stk500v2_send(PROGRAMMER * pgm, unsigned char * data, size_t len)
for (i=0;i<len+6;i++) DEBUG("0x%02x ",buf[i]); for (i=0;i<len+6;i++) DEBUG("0x%02x ",buf[i]);
DEBUG(", %d)\n",len+6); DEBUG(", %d)\n",len+6);
if (serial_send(pgm->fd, buf, len+6) != 0) { if (serial_send(&pgm->fd, buf, len+6) != 0) {
fprintf(stderr,"%s: stk500_send(): failed to send command to serial port\n",progname); fprintf(stderr,"%s: stk500_send(): failed to send command to serial port\n",progname);
exit(1); exit(1);
} }
@ -309,7 +309,7 @@ static int stk500v2_send(PROGRAMMER * pgm, unsigned char * data, size_t len)
static int stk500v2_drain(PROGRAMMER * pgm, int display) static int stk500v2_drain(PROGRAMMER * pgm, int display)
{ {
return serial_drain(pgm->fd, display); return serial_drain(&pgm->fd, display);
} }
static int stk500v2_recv_mk2(PROGRAMMER * pgm, unsigned char msg[], static int stk500v2_recv_mk2(PROGRAMMER * pgm, unsigned char msg[],
@ -317,7 +317,7 @@ static int stk500v2_recv_mk2(PROGRAMMER * pgm, unsigned char msg[],
{ {
int rv; int rv;
rv = serial_recv(pgm->fd, msg, maxsize); rv = serial_recv(&pgm->fd, msg, maxsize);
if (rv < 0) { if (rv < 0) {
fprintf(stderr, "%s: stk500v2_recv_mk2: error in USB receive\n", progname); fprintf(stderr, "%s: stk500v2_recv_mk2: error in USB receive\n", progname);
return -1; return -1;
@ -386,7 +386,7 @@ static int stk500v2_recv(PROGRAMMER * pgm, unsigned char msg[], size_t maxsize)
tstart = tv.tv_sec; tstart = tv.tv_sec;
while ( (state != sDONE ) && (!timeout) ) { while ( (state != sDONE ) && (!timeout) ) {
if (serial_recv(pgm->fd, &c, 1) < 0) if (serial_recv(&pgm->fd, &c, 1) < 0)
goto timedout; goto timedout;
DEBUG("0x%02x ",c); DEBUG("0x%02x ",c);
checksum ^= c; checksum ^= c;
@ -979,7 +979,7 @@ static int stk500v2_open(PROGRAMMER * pgm, char * port)
} }
strcpy(pgm->port, port); strcpy(pgm->port, port);
pgm->fd = serial_open(port, baud); serial_open(port, baud, &pgm->fd);
/* /*
* drain any extraneous input * drain any extraneous input
@ -1003,8 +1003,8 @@ static void stk500v2_close(PROGRAMMER * pgm)
{ {
DEBUG("STK500V2: stk500v2_close()\n"); DEBUG("STK500V2: stk500v2_close()\n");
serial_close(pgm->fd); serial_close(&pgm->fd);
pgm->fd = -1; pgm->fd.ifd = -1;
} }
@ -2190,7 +2190,7 @@ static int stk500v2_jtagmkII_open(PROGRAMMER * pgm, char * port)
} }
strcpy(pgm->port, port); strcpy(pgm->port, port);
pgm->fd = serial_open(port, baud); serial_open(port, baud, &pgm->fd);
/* /*
* drain any extraneous input * drain any extraneous input
@ -2257,7 +2257,7 @@ static int stk500v2_dragon_isp_open(PROGRAMMER * pgm, char * port)
} }
strcpy(pgm->port, port); strcpy(pgm->port, port);
pgm->fd = serial_open(port, baud); serial_open(port, baud, &pgm->fd);
/* /*
* drain any extraneous input * drain any extraneous input
@ -2324,7 +2324,7 @@ static int stk500v2_dragon_hv_open(PROGRAMMER * pgm, char * port)
} }
strcpy(pgm->port, port); strcpy(pgm->port, port);
pgm->fd = serial_open(port, baud); serial_open(port, baud, &pgm->fd);
/* /*
* drain any extraneous input * drain any extraneous input

27
usb_libusb.c
View File

@ -53,7 +53,7 @@ static int usb_interface;
* The "baud" parameter is meaningless for USB devices, so we reuse it * The "baud" parameter is meaningless for USB devices, so we reuse it
* to pass the desired USB device ID. * to pass the desired USB device ID.
*/ */
static int usbdev_open(char * port, long baud) static void usbdev_open(char * port, long baud, union filedescriptor *fd)
{ {
char string[256]; char string[256];
char product[256]; char product[256];
@ -189,7 +189,8 @@ static int usbdev_open(char * port, long baud)
goto trynext; goto trynext;
} }
return (int)udev; fd->pfd = udev;
return;
} }
trynext: trynext:
usb_close(udev); usb_close(udev);
@ -202,9 +203,9 @@ static int usbdev_open(char * port, long baud)
exit(1); exit(1);
} }
static void usbdev_close(int fd) static void usbdev_close(union filedescriptor *fd)
{ {
usb_dev_handle *udev = (usb_dev_handle *)fd; usb_dev_handle *udev = (usb_dev_handle *)fd->pfd;
(void)usb_release_interface(udev, usb_interface); (void)usb_release_interface(udev, usb_interface);
@ -218,10 +219,10 @@ static void usbdev_close(int fd)
} }
static int usbdev_send(int fd, unsigned char *bp, size_t mlen) static int usbdev_send(union filedescriptor *fd, unsigned char *bp, size_t mlen)
{ {
usb_dev_handle *udev = (usb_dev_handle *)fd; usb_dev_handle *udev = (usb_dev_handle *)fd->pfd;
size_t rv; int rv;
int i = mlen; int i = mlen;
unsigned char * p = bp; unsigned char * p = bp;
int tx_size; int tx_size;
@ -296,9 +297,9 @@ usb_fill_buf(usb_dev_handle *udev)
return 0; return 0;
} }
static int usbdev_recv(int fd, unsigned char *buf, size_t nbytes) static int usbdev_recv(union filedescriptor *fd, unsigned char *buf, size_t nbytes)
{ {
usb_dev_handle *udev = (usb_dev_handle *)fd; usb_dev_handle *udev = (usb_dev_handle *)fd->pfd;
int i, amnt; int i, amnt;
unsigned char * p = buf; unsigned char * p = buf;
@ -348,9 +349,9 @@ static int usbdev_recv(int fd, unsigned char *buf, size_t nbytes)
* *
* This is used for the AVRISP mkII device. * This is used for the AVRISP mkII device.
*/ */
static int usbdev_recv_frame(int fd, unsigned char *buf, size_t nbytes) static int usbdev_recv_frame(union filedescriptor *fd, unsigned char *buf, size_t nbytes)
{ {
usb_dev_handle *udev = (usb_dev_handle *)fd; usb_dev_handle *udev = (usb_dev_handle *)fd->pfd;
int rv, n; int rv, n;
int i; int i;
unsigned char * p = buf; unsigned char * p = buf;
@ -405,9 +406,9 @@ static int usbdev_recv_frame(int fd, unsigned char *buf, size_t nbytes)
return n; return n;
} }
static int usbdev_drain(int fd, int display) static int usbdev_drain(union filedescriptor *fd, int display)
{ {
usb_dev_handle *udev = (usb_dev_handle *)fd; usb_dev_handle *udev = (usb_dev_handle *)fd->pfd;
int rv; int rv;
do { do {