From c31c06703f4e8ba950cc5ca71ff9f16a78b1c315 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Mon, 13 Feb 2012 21:49:43 -0500 Subject: [PATCH] bitforce: Simplify BFopen WIN32 ifdef/else --- bitforce.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/bitforce.c b/bitforce.c index 10e1cad8..e2beba5b 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) {