2003-03-13 03:52:19 +00:00
|
|
|
/*
|
|
|
|
* avrdude - A Downloader/Uploader for AVR device programmers
|
2006-08-31 20:52:47 +00:00
|
|
|
* Copyright (C) 2003-2004 Theodore A. Roth <troth@openavr.org>
|
|
|
|
* Copyright (C) 2006 Joerg Wunsch <j@uriah.heep.sax.de>
|
2003-03-13 03:52:19 +00:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2012-11-20 14:03:50 +00:00
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2003-03-13 03:52:19 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/* $Id$ */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Posix serial interface for avrdude.
|
|
|
|
*/
|
|
|
|
|
2004-06-24 11:05:07 +00:00
|
|
|
#if !defined(WIN32NATIVE)
|
|
|
|
|
|
|
|
|
2003-08-25 15:55:48 +00:00
|
|
|
#include <ctype.h>
|
2003-03-13 03:52:19 +00:00
|
|
|
#include <stdio.h>
|
2003-08-25 15:55:48 +00:00
|
|
|
#include <stdlib.h>
|
2003-03-13 03:52:19 +00:00
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
2009-10-10 01:41:40 +00:00
|
|
|
#include <sys/ioctl.h>
|
2003-03-13 04:44:46 +00:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/time.h>
|
2006-08-31 20:52:47 +00:00
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <netdb.h>
|
|
|
|
#include <netinet/in.h>
|
2003-03-13 03:52:19 +00:00
|
|
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <termios.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
2007-01-24 21:07:54 +00:00
|
|
|
#include "avrdude.h"
|
2005-06-19 21:38:03 +00:00
|
|
|
#include "serial.h"
|
|
|
|
|
Mega-commit to bring in both, the STK500v2 support from Erik
Walthinsen, as well as JTAG ICE mkII support (by me).
Erik's submission has been cleaned up a little bit, mostly to add his
name and the current year to the copyright of the new file, remove
trailing white space before importing the files, and fix the minor
syntax errors in his avrdude.conf.in additions (missing semicolons).
The JTAG ICE mkII support should be considered alpha to beta quality
at this point. Few things are still to be done, like defering the
hfuse (OCDEN) tweaks until they are really required. Also, for
reasons not yet known, the target MCU doesn't start to run after
signing off from the ICE, it needs a power-cycle first (at least on my
STK500).
Note that for the JTAG ICE, I did change a few things in the internal
API. Notably I made the serial receive timeout configurable by the
backends via an exported variable (done in both the Posix and the
Win32 implementation), and I made the serial_recv() function return a
-1 instead of bailing out with exit(1) upon encountering a receive
timeout (currently only done in the Posix implementation). Both
measures together allow me to receive a datastreem from the ICE at 115
kbps on a somewhat lossy PCI multi-UART card that occasionally drops a
character. The JTAG ICE mkII protocol has enough of safety layers to
allow recovering from these events, but the previous code wasn't
prepared for any kind of recovery. The Win32 change for this still
has to be done, and the traditional drivers need to be converted to
exit(1) upon encountering a timeout (as they're now getting a -1
returned they didn't see before in that case).
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@451 81a1dc3b-b13d-400b-aceb-764788c761c2
2005-05-10 19:17:12 +00:00
|
|
|
long serial_recv_timeout = 5000; /* ms */
|
|
|
|
|
2003-03-13 03:52:19 +00:00
|
|
|
struct baud_mapping {
|
2003-03-13 19:25:27 +00:00
|
|
|
long baud;
|
2003-03-13 03:52:19 +00:00
|
|
|
speed_t speed;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* There are a lot more baud rates we could handle, but what's the point? */
|
|
|
|
|
|
|
|
static struct baud_mapping baud_lookup_table [] = {
|
|
|
|
{ 1200, B1200 },
|
|
|
|
{ 2400, B2400 },
|
|
|
|
{ 4800, B4800 },
|
|
|
|
{ 9600, B9600 },
|
|
|
|
{ 19200, B19200 },
|
|
|
|
{ 38400, B38400 },
|
2011-12-30 16:38:58 +00:00
|
|
|
#ifdef B57600
|
2003-03-13 03:52:19 +00:00
|
|
|
{ 57600, B57600 },
|
2011-12-30 16:38:58 +00:00
|
|
|
#endif
|
|
|
|
#ifdef B115200
|
2003-03-13 03:52:19 +00:00
|
|
|
{ 115200, B115200 },
|
2011-12-30 16:38:58 +00:00
|
|
|
#endif
|
|
|
|
#ifdef B230400
|
2003-03-13 03:52:19 +00:00
|
|
|
{ 230400, B230400 },
|
2011-12-30 16:38:58 +00:00
|
|
|
#endif
|
2003-03-13 03:52:19 +00:00
|
|
|
{ 0, 0 } /* Terminator. */
|
|
|
|
};
|
|
|
|
|
2006-08-28 21:17:01 +00:00
|
|
|
static struct termios original_termios;
|
|
|
|
static int saved_original_termios;
|
|
|
|
|
2003-03-13 19:25:27 +00:00
|
|
|
static speed_t serial_baud_lookup(long baud)
|
2003-03-13 03:52:19 +00:00
|
|
|
{
|
|
|
|
struct baud_mapping *map = baud_lookup_table;
|
|
|
|
|
|
|
|
while (map->baud) {
|
|
|
|
if (map->baud == baud)
|
|
|
|
return map->speed;
|
|
|
|
map++;
|
|
|
|
}
|
|
|
|
|
2010-01-08 10:39:18 +00:00
|
|
|
/*
|
|
|
|
* If a non-standard BAUD rate is used, issue
|
|
|
|
* a warning (if we are verbose) and return the raw rate
|
|
|
|
*/
|
|
|
|
if (verbose > 0)
|
|
|
|
fprintf(stderr, "%s: serial_baud_lookup(): Using non-standard baud rate: %ld",
|
|
|
|
progname, baud);
|
|
|
|
|
|
|
|
return baud;
|
2003-03-13 03:52:19 +00:00
|
|
|
}
|
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
static int ser_setspeed(union filedescriptor *fd, long baud)
|
2003-03-13 03:52:19 +00:00
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
struct termios termios;
|
|
|
|
speed_t speed = serial_baud_lookup (baud);
|
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
if (!isatty(fd->ifd))
|
2006-08-28 21:17:01 +00:00
|
|
|
return -ENOTTY;
|
2003-03-13 03:52:19 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* initialize terminal modes
|
|
|
|
*/
|
2006-12-11 12:47:35 +00:00
|
|
|
rc = tcgetattr(fd->ifd, &termios);
|
2003-03-13 03:52:19 +00:00
|
|
|
if (rc < 0) {
|
2006-08-28 21:17:01 +00:00
|
|
|
fprintf(stderr, "%s: ser_setspeed(): tcgetattr() failed",
|
|
|
|
progname);
|
2003-03-13 03:52:19 +00:00
|
|
|
return -errno;
|
|
|
|
}
|
|
|
|
|
2006-08-28 21:17:01 +00:00
|
|
|
/*
|
|
|
|
* copy termios for ser_close if we haven't already
|
|
|
|
*/
|
|
|
|
if (! saved_original_termios++) {
|
|
|
|
original_termios = termios;
|
|
|
|
}
|
|
|
|
|
|
|
|
termios.c_iflag = IGNBRK;
|
2003-03-13 03:52:19 +00:00
|
|
|
termios.c_oflag = 0;
|
|
|
|
termios.c_lflag = 0;
|
2006-08-28 21:17:01 +00:00
|
|
|
termios.c_cflag = (CS8 | CREAD | CLOCAL);
|
2003-03-13 03:52:19 +00:00
|
|
|
termios.c_cc[VMIN] = 1;
|
|
|
|
termios.c_cc[VTIME] = 0;
|
|
|
|
|
|
|
|
cfsetospeed(&termios, speed);
|
|
|
|
cfsetispeed(&termios, speed);
|
2009-07-02 10:31:13 +00:00
|
|
|
|
|
|
|
rc = tcsetattr(fd->ifd, TCSANOW, &termios);
|
2003-03-13 03:52:19 +00:00
|
|
|
if (rc < 0) {
|
2009-07-02 10:31:13 +00:00
|
|
|
fprintf(stderr, "%s: ser_setspeed(): tcsetattr() failed\n",
|
2006-08-28 21:17:01 +00:00
|
|
|
progname);
|
2003-03-13 03:52:19 +00:00
|
|
|
return -errno;
|
|
|
|
}
|
|
|
|
|
2005-05-11 17:00:11 +00:00
|
|
|
/*
|
2006-08-28 21:17:01 +00:00
|
|
|
* Everything is now set up for a local line without modem control
|
|
|
|
* or flow control, so clear O_NONBLOCK again.
|
2005-05-11 17:00:11 +00:00
|
|
|
*/
|
2006-12-11 12:47:35 +00:00
|
|
|
rc = fcntl(fd->ifd, F_GETFL, 0);
|
2006-08-28 21:17:01 +00:00
|
|
|
if (rc != -1)
|
2006-12-11 12:47:35 +00:00
|
|
|
fcntl(fd->ifd, F_SETFL, rc & ~O_NONBLOCK);
|
2005-05-11 17:00:11 +00:00
|
|
|
|
2003-03-13 03:52:19 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-08-31 20:52:47 +00:00
|
|
|
/*
|
|
|
|
* Given a port description of the form <host>:<port>, open a TCP
|
|
|
|
* connection to the specified destination, which is assumed to be a
|
|
|
|
* terminal/console server with serial parameters configured
|
|
|
|
* appropriately (e. g. 115200-8-N-1 for a STK500.)
|
|
|
|
*/
|
2010-10-22 14:44:53 +00:00
|
|
|
static int
|
2006-12-11 12:47:35 +00:00
|
|
|
net_open(const char *port, union filedescriptor *fdp)
|
2006-08-31 20:52:47 +00:00
|
|
|
{
|
|
|
|
char *hstr, *pstr, *end;
|
|
|
|
unsigned int pnum;
|
|
|
|
int fd;
|
|
|
|
struct sockaddr_in sockaddr;
|
|
|
|
struct hostent *hp;
|
|
|
|
|
|
|
|
if ((hstr = strdup(port)) == NULL) {
|
|
|
|
fprintf(stderr, "%s: net_open(): Out of memory!\n",
|
|
|
|
progname);
|
2010-10-22 14:44:53 +00:00
|
|
|
return -1;
|
2006-08-31 20:52:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (((pstr = strchr(hstr, ':')) == NULL) || (pstr == hstr)) {
|
|
|
|
fprintf(stderr, "%s: net_open(): Mangled host:port string \"%s\"\n",
|
|
|
|
progname, hstr);
|
|
|
|
free(hstr);
|
2010-10-22 14:44:53 +00:00
|
|
|
return -1;
|
2006-08-31 20:52:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Terminate the host section of the description.
|
|
|
|
*/
|
|
|
|
*pstr++ = '\0';
|
|
|
|
|
|
|
|
pnum = strtoul(pstr, &end, 10);
|
|
|
|
|
|
|
|
if ((*pstr == '\0') || (*end != '\0') || (pnum == 0) || (pnum > 65535)) {
|
|
|
|
fprintf(stderr, "%s: net_open(): Bad port number \"%s\"\n",
|
|
|
|
progname, pstr);
|
|
|
|
free(hstr);
|
2010-10-22 14:44:53 +00:00
|
|
|
return -1;
|
2006-08-31 20:52:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if ((hp = gethostbyname(hstr)) == NULL) {
|
|
|
|
fprintf(stderr, "%s: net_open(): unknown host \"%s\"\n",
|
|
|
|
progname, hstr);
|
|
|
|
free(hstr);
|
2010-10-22 14:44:53 +00:00
|
|
|
return -1;
|
2006-08-31 20:52:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
free(hstr);
|
|
|
|
|
|
|
|
if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
|
|
|
|
fprintf(stderr, "%s: net_open(): Cannot open socket: %s\n",
|
|
|
|
progname, strerror(errno));
|
2010-10-22 14:44:53 +00:00
|
|
|
return -1;
|
2006-08-31 20:52:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
memset(&sockaddr, 0, sizeof(struct sockaddr_in));
|
|
|
|
sockaddr.sin_family = AF_INET;
|
|
|
|
sockaddr.sin_port = htons(pnum);
|
|
|
|
memcpy(&(sockaddr.sin_addr.s_addr), hp->h_addr, sizeof(struct in_addr));
|
|
|
|
|
|
|
|
if (connect(fd, (struct sockaddr *)&sockaddr, sizeof(sockaddr))) {
|
|
|
|
fprintf(stderr, "%s: net_open(): Connect failed: %s\n",
|
|
|
|
progname, strerror(errno));
|
2010-10-22 14:44:53 +00:00
|
|
|
return -1;
|
2006-08-31 20:52:47 +00:00
|
|
|
}
|
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
fdp->ifd = fd;
|
2010-10-22 14:44:53 +00:00
|
|
|
return 0;
|
2006-08-31 20:52:47 +00:00
|
|
|
}
|
2003-03-13 03:52:19 +00:00
|
|
|
|
2009-10-10 01:41:40 +00:00
|
|
|
|
|
|
|
static int ser_set_dtr_rts(union filedescriptor *fdp, int is_on)
|
|
|
|
{
|
|
|
|
unsigned int ctl;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
r = ioctl(fdp->ifd, TIOCMGET, &ctl);
|
|
|
|
if (r < 0) {
|
|
|
|
perror("ioctl(\"TIOCMGET\")");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (is_on) {
|
|
|
|
/* Set DTR and RTS */
|
|
|
|
ctl |= (TIOCM_DTR | TIOCM_RTS);
|
|
|
|
}
|
2010-03-07 21:27:22 +00:00
|
|
|
else {
|
|
|
|
/* Clear DTR and RTS */
|
|
|
|
ctl &= ~(TIOCM_DTR | TIOCM_RTS);
|
|
|
|
}
|
2009-10-10 01:41:40 +00:00
|
|
|
|
|
|
|
r = ioctl(fdp->ifd, TIOCMSET, &ctl);
|
|
|
|
if (r < 0) {
|
|
|
|
perror("ioctl(\"TIOCMSET\")");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-02-21 13:44:11 +00:00
|
|
|
static int ser_open(char * port, union pinfo pinfo, union filedescriptor *fdp)
|
2003-03-13 03:52:19 +00:00
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
int fd;
|
|
|
|
|
2006-08-31 20:52:47 +00:00
|
|
|
/*
|
|
|
|
* If the port is of the form "net:<host>:<port>", then
|
|
|
|
* handle it as a TCP connection to a terminal server.
|
|
|
|
*/
|
|
|
|
if (strncmp(port, "net:", strlen("net:")) == 0) {
|
2010-10-22 14:44:53 +00:00
|
|
|
return net_open(port + strlen("net:"), fdp);
|
2006-08-31 20:52:47 +00:00
|
|
|
}
|
|
|
|
|
2003-03-13 03:52:19 +00:00
|
|
|
/*
|
|
|
|
* open the serial port
|
|
|
|
*/
|
2006-08-28 21:17:01 +00:00
|
|
|
fd = open(port, O_RDWR | O_NOCTTY | O_NONBLOCK);
|
2003-03-13 03:52:19 +00:00
|
|
|
if (fd < 0) {
|
2005-06-19 21:38:03 +00:00
|
|
|
fprintf(stderr, "%s: ser_open(): can't open device \"%s\": %s\n",
|
2003-03-13 03:52:19 +00:00
|
|
|
progname, port, strerror(errno));
|
2010-10-22 14:29:56 +00:00
|
|
|
return -1;
|
2003-03-13 03:52:19 +00:00
|
|
|
}
|
|
|
|
|
2006-12-11 16:02:45 +00:00
|
|
|
fdp->ifd = fd;
|
|
|
|
|
2003-03-13 03:52:19 +00:00
|
|
|
/*
|
|
|
|
* set serial line attributes
|
|
|
|
*/
|
2014-02-21 13:44:11 +00:00
|
|
|
rc = ser_setspeed(fdp, pinfo.baud);
|
2003-03-13 03:52:19 +00:00
|
|
|
if (rc) {
|
|
|
|
fprintf(stderr,
|
2006-08-28 21:17:01 +00:00
|
|
|
"%s: ser_open(): can't set attributes for device \"%s\": %s\n",
|
|
|
|
progname, port, strerror(-rc));
|
2010-10-22 14:29:56 +00:00
|
|
|
close(fd);
|
|
|
|
return -1;
|
2003-03-13 03:52:19 +00:00
|
|
|
}
|
2010-10-22 14:29:56 +00:00
|
|
|
return 0;
|
2003-03-13 03:52:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
static void ser_close(union filedescriptor *fd)
|
2003-03-13 03:52:19 +00:00
|
|
|
{
|
2006-08-28 21:17:01 +00:00
|
|
|
/*
|
|
|
|
* restore original termios settings from ser_open
|
|
|
|
*/
|
|
|
|
if (saved_original_termios) {
|
2006-12-11 12:47:35 +00:00
|
|
|
int rc = tcsetattr(fd->ifd, TCSANOW | TCSADRAIN, &original_termios);
|
2006-08-28 21:17:01 +00:00
|
|
|
if (rc) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"%s: ser_close(): can't reset attributes for device: %s\n",
|
|
|
|
progname, strerror(errno));
|
|
|
|
}
|
|
|
|
saved_original_termios = 0;
|
|
|
|
}
|
2003-03-13 03:52:19 +00:00
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
close(fd->ifd);
|
2003-03-13 03:52:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
static int ser_send(union filedescriptor *fd, unsigned char * buf, size_t buflen)
|
2003-03-13 03:52:19 +00:00
|
|
|
{
|
|
|
|
int rc;
|
2005-08-30 01:30:05 +00:00
|
|
|
unsigned char * p = buf;
|
2003-03-24 01:57:31 +00:00
|
|
|
size_t len = buflen;
|
|
|
|
|
|
|
|
if (!len)
|
2003-03-13 03:52:19 +00:00
|
|
|
return 0;
|
|
|
|
|
2003-03-24 01:57:31 +00:00
|
|
|
if (verbose > 3)
|
|
|
|
{
|
|
|
|
fprintf(stderr, "%s: Send: ", progname);
|
|
|
|
|
|
|
|
while (buflen) {
|
2003-03-24 07:09:16 +00:00
|
|
|
unsigned char c = *buf;
|
2003-03-24 01:57:31 +00:00
|
|
|
if (isprint(c)) {
|
|
|
|
fprintf(stderr, "%c ", c);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
fprintf(stderr, ". ");
|
|
|
|
}
|
2003-03-24 07:09:16 +00:00
|
|
|
fprintf(stderr, "[%02x] ", c);
|
2003-03-24 01:57:31 +00:00
|
|
|
|
|
|
|
buf++;
|
|
|
|
buflen--;
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(stderr, "\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
while (len) {
|
2006-12-11 12:47:35 +00:00
|
|
|
rc = write(fd->ifd, p, (len > 1024) ? 1024 : len);
|
2003-03-13 03:52:19 +00:00
|
|
|
if (rc < 0) {
|
2005-06-19 21:38:03 +00:00
|
|
|
fprintf(stderr, "%s: ser_send(): write error: %s\n",
|
2003-03-13 03:52:19 +00:00
|
|
|
progname, strerror(errno));
|
|
|
|
exit(1);
|
|
|
|
}
|
2005-05-11 17:00:11 +00:00
|
|
|
p += rc;
|
|
|
|
len -= rc;
|
2003-03-13 03:52:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
static int ser_recv(union filedescriptor *fd, unsigned char * buf, size_t buflen)
|
2003-03-13 03:52:19 +00:00
|
|
|
{
|
2005-05-11 17:00:11 +00:00
|
|
|
struct timeval timeout, to2;
|
2003-03-13 03:52:19 +00:00
|
|
|
fd_set rfds;
|
|
|
|
int nfds;
|
|
|
|
int rc;
|
2005-08-30 01:30:05 +00:00
|
|
|
unsigned char * p = buf;
|
2003-03-24 01:57:31 +00:00
|
|
|
size_t len = 0;
|
|
|
|
|
Mega-commit to bring in both, the STK500v2 support from Erik
Walthinsen, as well as JTAG ICE mkII support (by me).
Erik's submission has been cleaned up a little bit, mostly to add his
name and the current year to the copyright of the new file, remove
trailing white space before importing the files, and fix the minor
syntax errors in his avrdude.conf.in additions (missing semicolons).
The JTAG ICE mkII support should be considered alpha to beta quality
at this point. Few things are still to be done, like defering the
hfuse (OCDEN) tweaks until they are really required. Also, for
reasons not yet known, the target MCU doesn't start to run after
signing off from the ICE, it needs a power-cycle first (at least on my
STK500).
Note that for the JTAG ICE, I did change a few things in the internal
API. Notably I made the serial receive timeout configurable by the
backends via an exported variable (done in both the Posix and the
Win32 implementation), and I made the serial_recv() function return a
-1 instead of bailing out with exit(1) upon encountering a receive
timeout (currently only done in the Posix implementation). Both
measures together allow me to receive a datastreem from the ICE at 115
kbps on a somewhat lossy PCI multi-UART card that occasionally drops a
character. The JTAG ICE mkII protocol has enough of safety layers to
allow recovering from these events, but the previous code wasn't
prepared for any kind of recovery. The Win32 change for this still
has to be done, and the traditional drivers need to be converted to
exit(1) upon encountering a timeout (as they're now getting a -1
returned they didn't see before in that case).
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@451 81a1dc3b-b13d-400b-aceb-764788c761c2
2005-05-10 19:17:12 +00:00
|
|
|
timeout.tv_sec = serial_recv_timeout / 1000L;
|
|
|
|
timeout.tv_usec = (serial_recv_timeout % 1000L) * 1000;
|
2005-05-11 17:00:11 +00:00
|
|
|
to2 = timeout;
|
2003-03-13 03:52:19 +00:00
|
|
|
|
2003-03-24 01:57:31 +00:00
|
|
|
while (len < buflen) {
|
2005-05-11 17:00:11 +00:00
|
|
|
reselect:
|
2003-03-13 03:52:19 +00:00
|
|
|
FD_ZERO(&rfds);
|
2006-12-11 12:47:35 +00:00
|
|
|
FD_SET(fd->ifd, &rfds);
|
2003-03-13 03:52:19 +00:00
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
nfds = select(fd->ifd + 1, &rfds, NULL, NULL, &to2);
|
2003-03-13 03:52:19 +00:00
|
|
|
if (nfds == 0) {
|
Mega-commit to bring in both, the STK500v2 support from Erik
Walthinsen, as well as JTAG ICE mkII support (by me).
Erik's submission has been cleaned up a little bit, mostly to add his
name and the current year to the copyright of the new file, remove
trailing white space before importing the files, and fix the minor
syntax errors in his avrdude.conf.in additions (missing semicolons).
The JTAG ICE mkII support should be considered alpha to beta quality
at this point. Few things are still to be done, like defering the
hfuse (OCDEN) tweaks until they are really required. Also, for
reasons not yet known, the target MCU doesn't start to run after
signing off from the ICE, it needs a power-cycle first (at least on my
STK500).
Note that for the JTAG ICE, I did change a few things in the internal
API. Notably I made the serial receive timeout configurable by the
backends via an exported variable (done in both the Posix and the
Win32 implementation), and I made the serial_recv() function return a
-1 instead of bailing out with exit(1) upon encountering a receive
timeout (currently only done in the Posix implementation). Both
measures together allow me to receive a datastreem from the ICE at 115
kbps on a somewhat lossy PCI multi-UART card that occasionally drops a
character. The JTAG ICE mkII protocol has enough of safety layers to
allow recovering from these events, but the previous code wasn't
prepared for any kind of recovery. The Win32 change for this still
has to be done, and the traditional drivers need to be converted to
exit(1) upon encountering a timeout (as they're now getting a -1
returned they didn't see before in that case).
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@451 81a1dc3b-b13d-400b-aceb-764788c761c2
2005-05-10 19:17:12 +00:00
|
|
|
if (verbose > 1)
|
|
|
|
fprintf(stderr,
|
2005-06-19 21:38:03 +00:00
|
|
|
"%s: ser_recv(): programmer is not responding\n",
|
Mega-commit to bring in both, the STK500v2 support from Erik
Walthinsen, as well as JTAG ICE mkII support (by me).
Erik's submission has been cleaned up a little bit, mostly to add his
name and the current year to the copyright of the new file, remove
trailing white space before importing the files, and fix the minor
syntax errors in his avrdude.conf.in additions (missing semicolons).
The JTAG ICE mkII support should be considered alpha to beta quality
at this point. Few things are still to be done, like defering the
hfuse (OCDEN) tweaks until they are really required. Also, for
reasons not yet known, the target MCU doesn't start to run after
signing off from the ICE, it needs a power-cycle first (at least on my
STK500).
Note that for the JTAG ICE, I did change a few things in the internal
API. Notably I made the serial receive timeout configurable by the
backends via an exported variable (done in both the Posix and the
Win32 implementation), and I made the serial_recv() function return a
-1 instead of bailing out with exit(1) upon encountering a receive
timeout (currently only done in the Posix implementation). Both
measures together allow me to receive a datastreem from the ICE at 115
kbps on a somewhat lossy PCI multi-UART card that occasionally drops a
character. The JTAG ICE mkII protocol has enough of safety layers to
allow recovering from these events, but the previous code wasn't
prepared for any kind of recovery. The Win32 change for this still
has to be done, and the traditional drivers need to be converted to
exit(1) upon encountering a timeout (as they're now getting a -1
returned they didn't see before in that case).
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@451 81a1dc3b-b13d-400b-aceb-764788c761c2
2005-05-10 19:17:12 +00:00
|
|
|
progname);
|
|
|
|
return -1;
|
2003-03-13 03:52:19 +00:00
|
|
|
}
|
|
|
|
else if (nfds == -1) {
|
2005-05-11 17:00:11 +00:00
|
|
|
if (errno == EINTR || errno == EAGAIN) {
|
|
|
|
fprintf(stderr,
|
2005-06-19 21:38:03 +00:00
|
|
|
"%s: ser_recv(): programmer is not responding,reselecting\n",
|
2005-05-11 17:00:11 +00:00
|
|
|
progname);
|
2003-03-13 03:52:19 +00:00
|
|
|
goto reselect;
|
|
|
|
}
|
|
|
|
else {
|
2005-06-19 21:38:03 +00:00
|
|
|
fprintf(stderr, "%s: ser_recv(): select(): %s\n",
|
2003-03-13 03:52:19 +00:00
|
|
|
progname, strerror(errno));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
rc = read(fd->ifd, p, (buflen - len > 1024) ? 1024 : buflen - len);
|
2003-03-13 03:52:19 +00:00
|
|
|
if (rc < 0) {
|
2005-06-19 21:38:03 +00:00
|
|
|
fprintf(stderr, "%s: ser_recv(): read error: %s\n",
|
2003-03-13 03:52:19 +00:00
|
|
|
progname, strerror(errno));
|
|
|
|
exit(1);
|
|
|
|
}
|
2005-05-11 17:00:11 +00:00
|
|
|
p += rc;
|
|
|
|
len += rc;
|
2003-03-24 01:57:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
p = buf;
|
|
|
|
|
|
|
|
if (verbose > 3)
|
|
|
|
{
|
|
|
|
fprintf(stderr, "%s: Recv: ", progname);
|
|
|
|
|
|
|
|
while (len) {
|
2003-03-24 07:09:16 +00:00
|
|
|
unsigned char c = *p;
|
2003-03-24 01:57:31 +00:00
|
|
|
if (isprint(c)) {
|
|
|
|
fprintf(stderr, "%c ", c);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
fprintf(stderr, ". ");
|
|
|
|
}
|
2003-03-24 07:09:16 +00:00
|
|
|
fprintf(stderr, "[%02x] ", c);
|
2003-03-24 01:57:31 +00:00
|
|
|
|
|
|
|
p++;
|
|
|
|
len--;
|
|
|
|
}
|
|
|
|
fprintf(stderr, "\n");
|
2003-03-13 03:52:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
static int ser_drain(union filedescriptor *fd, int display)
|
2003-03-13 03:52:19 +00:00
|
|
|
{
|
|
|
|
struct timeval timeout;
|
|
|
|
fd_set rfds;
|
|
|
|
int nfds;
|
|
|
|
int rc;
|
|
|
|
unsigned char buf;
|
|
|
|
|
|
|
|
timeout.tv_sec = 0;
|
|
|
|
timeout.tv_usec = 250000;
|
|
|
|
|
|
|
|
if (display) {
|
|
|
|
fprintf(stderr, "drain>");
|
|
|
|
}
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
FD_ZERO(&rfds);
|
2006-12-11 12:47:35 +00:00
|
|
|
FD_SET(fd->ifd, &rfds);
|
2003-03-13 03:52:19 +00:00
|
|
|
|
|
|
|
reselect:
|
2006-12-11 12:47:35 +00:00
|
|
|
nfds = select(fd->ifd + 1, &rfds, NULL, NULL, &timeout);
|
2003-03-13 03:52:19 +00:00
|
|
|
if (nfds == 0) {
|
|
|
|
if (display) {
|
|
|
|
fprintf(stderr, "<drain\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (nfds == -1) {
|
|
|
|
if (errno == EINTR) {
|
|
|
|
goto reselect;
|
|
|
|
}
|
|
|
|
else {
|
2005-06-19 21:38:03 +00:00
|
|
|
fprintf(stderr, "%s: ser_drain(): select(): %s\n",
|
2003-03-13 03:52:19 +00:00
|
|
|
progname, strerror(errno));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-12-11 12:47:35 +00:00
|
|
|
rc = read(fd->ifd, &buf, 1);
|
2003-03-13 03:52:19 +00:00
|
|
|
if (rc < 0) {
|
2005-06-19 21:38:03 +00:00
|
|
|
fprintf(stderr, "%s: ser_drain(): read error: %s\n",
|
2003-03-13 03:52:19 +00:00
|
|
|
progname, strerror(errno));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (display) {
|
|
|
|
fprintf(stderr, "%02x ", buf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2004-06-24 11:05:07 +00:00
|
|
|
|
2005-06-19 21:38:03 +00:00
|
|
|
struct serial_device serial_serdev =
|
|
|
|
{
|
|
|
|
.open = ser_open,
|
|
|
|
.setspeed = ser_setspeed,
|
|
|
|
.close = ser_close,
|
|
|
|
.send = ser_send,
|
|
|
|
.recv = ser_recv,
|
|
|
|
.drain = ser_drain,
|
2009-10-10 01:41:40 +00:00
|
|
|
.set_dtr_rts = ser_set_dtr_rts,
|
2006-10-27 08:45:47 +00:00
|
|
|
.flags = SERDEV_FL_CANSETSPEED,
|
2005-06-19 21:38:03 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct serial_device *serdev = &serial_serdev;
|
|
|
|
|
2004-06-24 11:05:07 +00:00
|
|
|
#endif /* WIN32NATIVE */
|