1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
$NetBSD: patch-ab,v 1.1 2003/06/25 15:12:17 tsarna Exp $
--- icd.c.orig Sat Jun 21 17:05:22 2003
+++ icd.c Sat Jun 21 17:30:45 2003
@@ -278,7 +278,7 @@
{
struct termios oldtio, newtio;
- if((icd_fd=open(port, O_NOCTTY | O_RDWR | O_SYNC)) == -1) {
+ if((icd_fd=open(port, O_NOCTTY | O_RDWR | O_SYNC | O_NONBLOCK)) == -1) {
perror("Error opening device:");
return -1;
}
@@ -286,10 +286,11 @@
tcgetattr(icd_fd, &oldtio);
memset(&newtio,0, sizeof(newtio));
- newtio.c_cflag = BAUDRATE | CS8 | CLOCAL | CREAD;
+ newtio.c_cflag = CS8 | CLOCAL | CREAD;
newtio.c_iflag = IGNPAR;
newtio.c_oflag = 0;
newtio.c_lflag = 0;
+ newtio.c_ispeed = newtio.c_ospeed = BAUDRATE;
newtio.c_cc[VTIME] = 20;
newtio.c_cc[VMIN] = 0;
@@ -297,6 +298,8 @@
tcflush(icd_fd, TCIFLUSH);
tcsetattr(icd_fd, TCSANOW, &newtio);
+ fcntl(icd_fd, F_SETFL, 0); /* clear nonblock */
+
icd_hw_reset();
rts_set();
|
