Commit c31c06703f4e8ba950cc5ca71ff9f16a78b1c315
2012-02-13T21:49:43
bitforce: Simplify BFopen WIN32 ifdef/else
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
diff --git a/bitforce.c b/bitforce.c
index 10e1cad..e2beba5 100644
--- a/bitforce.c
+++ b/bitforce.c
@@ -33,20 +33,14 @@
struct device_api bitforce_api;
-#ifdef WIN32
-
static int BFopen(const char *devpath)
{
+#ifdef WIN32
HANDLE hSerial = CreateFile(devpath, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
if (unlikely(hSerial == INVALID_HANDLE_VALUE))
return -1;
return _open_osfhandle((LONG)hSerial, 0);
-}
-
#else
-
-static int BFopen(const char *devpath)
-{
int fdDev = open(devpath, O_RDWR | O_CLOEXEC | O_NOCTTY);
if (likely(fdDev != -1))
{
@@ -63,9 +57,8 @@ static int BFopen(const char *devpath)
tcflush(fdDev, TCOFLUSH);
tcflush(fdDev, TCIFLUSH);
return fdDev;
-}
-
#endif
+}
static void BFgets(char *buf, size_t bufLen, int fd)
{