Browse Source

bitforce: Simplify BFopen WIN32 ifdef/else

nfactor-troky
Luke Dashjr 13 years ago committed by Con Kolivas
parent
commit
c31c06703f
  1. 11
      bitforce.c

11
bitforce.c

@ -33,20 +33,14 @@
struct device_api bitforce_api; struct device_api bitforce_api;
#ifdef WIN32
static int BFopen(const char *devpath) static int BFopen(const char *devpath)
{ {
#ifdef WIN32
HANDLE hSerial = CreateFile(devpath, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); HANDLE hSerial = CreateFile(devpath, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
if (unlikely(hSerial == INVALID_HANDLE_VALUE)) if (unlikely(hSerial == INVALID_HANDLE_VALUE))
return -1; return -1;
return _open_osfhandle((LONG)hSerial, 0); return _open_osfhandle((LONG)hSerial, 0);
}
#else #else
static int BFopen(const char *devpath)
{
int fdDev = open(devpath, O_RDWR | O_CLOEXEC | O_NOCTTY); int fdDev = open(devpath, O_RDWR | O_CLOEXEC | O_NOCTTY);
if (likely(fdDev != -1)) if (likely(fdDev != -1))
{ {
@ -63,9 +57,8 @@ static int BFopen(const char *devpath)
tcflush(fdDev, TCOFLUSH); tcflush(fdDev, TCOFLUSH);
tcflush(fdDev, TCIFLUSH); tcflush(fdDev, TCIFLUSH);
return fdDev; return fdDev;
}
#endif #endif
}
static void BFgets(char *buf, size_t bufLen, int fd) static void BFgets(char *buf, size_t bufLen, int fd)
{ {

Loading…
Cancel
Save