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

Contributed by Ned Konz: 

Open the serial port with O_NONBLOCK, and save and restore the port
state before exiting.

patch #5008: Patch for (5.1) ser_posix.c for O_NONBLOCK open and
restoring serial port state on close

Closes bug #12622: avrdude hangs on macosx/darwin with PL-2303
usb-to-serial and Butterfly


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@627 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Joerg Wunsch 2006-08-28 21:17:01 +00:00
parent 840af6b242
commit cd0e455a90
2 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-08-28 Joerg Wunsch <j@uriah.heep.sax.de>
Contributed by Ned Konz:
* ser_posix.c: Open the serial port with O_NONBLOCK, and
save and restore the port state before exiting.
patch #5008: Patch for (5.1) ser_posix.c for O_NONBLOCK open
and restoring serial port state on close
Closes bug #12622: avrdude hangs on macosx/darwin with PL-2303
usb-to-serial and Butterfly
2006-08-22 Joerg Wunsch <j@uriah.heep.sax.de> 2006-08-22 Joerg Wunsch <j@uriah.heep.sax.de>
* bitbang.c: Move the bitbang prerequisite checks out from * bitbang.c: Move the bitbang prerequisite checks out from

58
ser_posix.c
View File

@ -1,6 +1,6 @@
/* /*
* avrdude - A Downloader/Uploader for AVR device programmers * avrdude - A Downloader/Uploader for AVR device programmers
* Copyright (C) 2003-2004 Theodore A. Roth <troth@openavr.org> * Copyright (C) 2003-2004, 2006 Theodore A. Roth <troth@openavr.org>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -65,6 +65,9 @@ static struct baud_mapping baud_lookup_table [] = {
{ 0, 0 } /* Terminator. */ { 0, 0 } /* Terminator. */
}; };
static struct termios original_termios;
static int saved_original_termios;
static speed_t serial_baud_lookup(long baud) static speed_t serial_baud_lookup(long baud)
{ {
struct baud_mapping *map = baud_lookup_table; struct baud_mapping *map = baud_lookup_table;
@ -75,7 +78,7 @@ static speed_t serial_baud_lookup(long baud)
map++; map++;
} }
fprintf(stderr, "%s: serial_baud_lookup(): unknown baud rate: %ld", fprintf(stderr, "%s: serial_baud_lookup(): unknown baud rate: %ld\n",
progname, baud); progname, baud);
exit(1); exit(1);
} }
@ -87,43 +90,49 @@ static int ser_setspeed(int fd, long baud)
speed_t speed = serial_baud_lookup (baud); speed_t speed = serial_baud_lookup (baud);
if (!isatty(fd)) if (!isatty(fd))
return -1; return -ENOTTY;
/* /*
* initialize terminal modes * initialize terminal modes
*/ */
rc = tcgetattr(fd, &termios); rc = tcgetattr(fd, &termios);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "%s: ser_setspeed(): tcgetattr() failed, %s", fprintf(stderr, "%s: ser_setspeed(): tcgetattr() failed",
progname, strerror(errno)); progname);
return -errno; return -errno;
} }
termios.c_iflag = 0; /*
* copy termios for ser_close if we haven't already
*/
if (! saved_original_termios++) {
original_termios = termios;
}
termios.c_iflag = IGNBRK;
termios.c_oflag = 0; termios.c_oflag = 0;
termios.c_cflag = 0;
termios.c_cflag |= (CS8 | CREAD | CLOCAL);
termios.c_lflag = 0; termios.c_lflag = 0;
termios.c_cflag = (CS8 | CREAD | CLOCAL);
termios.c_cc[VMIN] = 1; termios.c_cc[VMIN] = 1;
termios.c_cc[VTIME] = 0; termios.c_cc[VTIME] = 0;
cfsetospeed(&termios, speed); cfsetospeed(&termios, speed);
cfsetispeed(&termios, speed); cfsetispeed(&termios, speed);
rc = tcsetattr(fd, TCSANOW, &termios); rc = tcsetattr(fd, TCSANOW | TCSAFLUSH, &termios);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "%s: ser_setspeed(): tcsetattr() failed, %s", fprintf(stderr, "%s: ser_setspeed(): tcsetattr() failed",
progname, strerror(errno)); progname);
return -errno; return -errno;
} }
#if 0
/* /*
* set non blocking mode * Everything is now set up for a local line without modem control
* or flow control, so clear O_NONBLOCK again.
*/ */
rc = fcntl(fd, F_GETFL, 0); rc = fcntl(fd, F_GETFL, 0);
fcntl(fd, F_SETFL, rc | O_NONBLOCK); if (rc != -1)
#endif fcntl(fd, F_SETFL, rc & ~O_NONBLOCK);
return 0; return 0;
} }
@ -137,7 +146,7 @@ static int ser_open(char * port, long baud)
/* /*
* open the serial port * open the serial port
*/ */
fd = open(port, O_RDWR | O_NOCTTY /*| O_NONBLOCK*/); fd = open(port, O_RDWR | O_NOCTTY | O_NONBLOCK);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "%s: ser_open(): can't open device \"%s\": %s\n", fprintf(stderr, "%s: ser_open(): can't open device \"%s\": %s\n",
progname, port, strerror(errno)); progname, port, strerror(errno));
@ -150,8 +159,8 @@ static int ser_open(char * port, long baud)
rc = ser_setspeed(fd, baud); rc = ser_setspeed(fd, baud);
if (rc) { if (rc) {
fprintf(stderr, fprintf(stderr,
"%s: ser_open(): can't set attributes for device \"%s\"\n", "%s: ser_open(): can't set attributes for device \"%s\": %s\n",
progname, port); progname, port, strerror(-rc));
exit(1); exit(1);
} }
@ -161,7 +170,18 @@ static int ser_open(char * port, long baud)
static void ser_close(int fd) static void ser_close(int fd)
{ {
/* FIXME: Should really restore the terminal to original state here. */ /*
* restore original termios settings from ser_open
*/
if (saved_original_termios) {
int rc = tcsetattr(fd, TCSANOW | TCSADRAIN, &original_termios);
if (rc) {
fprintf(stderr,
"%s: ser_close(): can't reset attributes for device: %s\n",
progname, strerror(errno));
}
saved_original_termios = 0;
}
close(fd); close(fd);
} }