X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fols.c;h=a8d9dbea908d11996c341c9183412e90c5cf1902;hb=44fc870c9cc5c0e53b47b9d7fa3dffe81731ee3c;hp=643e2683ac1ecbb2260814075462a778fd856273;hpb=530f201eb8280b343529747107c15e91c2ab0623;p=libsigrok.git diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c index 643e2683..a8d9dbea 100644 --- a/hardware/openbench-logic-sniffer/ols.c +++ b/hardware/openbench-logic-sniffer/ols.c @@ -42,10 +42,6 @@ #include "libsigrok-internal.h" #include "ols.h" -#ifdef _WIN32 -#define O_NONBLOCK FIONBIO -#endif - #define SERIALCOMM "115200/8n1" static const int hwcaps[] = { @@ -409,10 +405,8 @@ static GSList *hw_scan(GSList *options) break; } } - if (!conn) { - sr_err("ols: No serial port specified."); + if (!conn) return NULL; - } if (serialcomm == NULL) serialcomm = SERIALCOMM; @@ -427,7 +421,7 @@ static GSList *hw_scan(GSList *options) * have a match. */ sr_info("ols: probing %s .", conn); - if (serial_open(serial, O_RDWR | O_NONBLOCK) != SR_OK) + if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) return NULL; ret = SR_OK; @@ -505,7 +499,7 @@ static int hw_dev_open(struct sr_dev_inst *sdi) devc = sdi->priv; - if (serial_open(devc->serial, O_RDWR) != SR_OK) + if (serial_open(devc->serial, SERIAL_RDWR) != SR_OK) return SR_ERR; sdi->status = SR_ST_ACTIVE;