Commit 2f0a3dc2db9986f634e0f6c8d344e6590ee080cf
2012-02-13T21:19:39
Move tcsetattr (and new tcflush) into *nix BFopen to simplify things a bit
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
diff --git a/bitforce.c b/bitforce.c
index efa4c20..196fb5d 100644
--- a/bitforce.c
+++ b/bitforce.c
@@ -47,7 +47,22 @@ static int BFopen(const char *devpath)
static int BFopen(const char *devpath)
{
- return open(devpath, O_RDWR | O_CLOEXEC | O_NOCTTY);
+ int fdDev = open(devpath, O_RDWR | O_CLOEXEC | O_NOCTTY);
+ if (likely(fdDev != -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;
+ tcsetattr(fdDev, TCSANOW, &pattr);
+ }
+ tcflush(fdDev, TCOFLUSH);
+ tcflush(fdDev, TCIFLUSH);
+ return fdDev;
}
#endif
@@ -180,19 +195,6 @@ static bool bitforce_thread_prepare(struct thr_info *thr)
return false;
}
-#ifndef WIN32
- {
- 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;
- tcsetattr(fdDev, TCSANOW, &pattr);
- }
-#endif
bitforce->device_fd = fdDev;
applog(LOG_INFO, "Opened BitForce on %s", bitforce->device_path);