Commit cb1634debfa1f0af578a7116cc9eec36fd5d3c1a
2012-06-25T22:35:16
fpgautils.c - linux ordering back to the correct way
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 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/fpgautils.c b/fpgautils.c
index 14c1c79..59eb7bc 100644
--- a/fpgautils.c
+++ b/fpgautils.c
@@ -181,28 +181,33 @@ serial_open(const char*devpath, unsigned long baud, signed short timeout, bool p
if (unlikely(fdDev == -1))
return -1;
- struct termios pattr;
- tcgetattr(fdDev, &pattr);
- pattr.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
- pattr.c_oflag &= ~OPOST;
- pattr.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
- pattr.c_cflag &= ~(CSIZE | PARENB);
- pattr.c_cflag |= CS8;
+ struct termios my_termios;
+
+ tcgetattr(fdDev, &my_termios);
switch (baud) {
case 0: break;
- case 115200: pattr.c_cflag = B115200; break;
+ case 115200: my_termios.c_cflag = B115200; break;
default:
applog(LOG_WARNING, "Unrecognized baud rate: %lu", baud);
}
- pattr.c_cflag |= CREAD | CLOCAL;
+
+ my_termios.c_cflag |= CS8;
+ my_termios.c_cflag |= CREAD;
+ my_termios.c_cflag |= CLOCAL;
+ my_termios.c_cflag &= ~(CSIZE | PARENB);
+
+ my_termios.c_iflag &= ~(IGNBRK | BRKINT | PARMRK |
+ ISTRIP | INLCR | IGNCR | ICRNL | IXON);
+ my_termios.c_oflag &= ~OPOST;
+ my_termios.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
if (timeout >= 0) {
- pattr.c_cc[VTIME] = (cc_t)timeout;
- pattr.c_cc[VMIN] = 0;
+ my_termios.c_cc[VTIME] = (cc_t)timeout;
+ my_termios.c_cc[VMIN] = 0;
}
- tcsetattr(fdDev, TCSANOW, &pattr);
+ tcsetattr(fdDev, TCSANOW, &my_termios);
if (purge)
tcflush(fdDev, TCIOFLUSH);
return fdDev;