examples/send_receive: Fix receive check.

[libserialport.git] / serialport.c

diff --git a/serialport.c b/serialport.c
index 422b767a50366aeae3682b5a6124ecc5c06bcdcc..c22e94fa4bbbf52f988855378c0297585a5cd8dd 100644 (file)
--- a/serialport.c
+++ b/serialport.c
@@ -1307,6 +1307,11 @@ SP_API enum sp_return sp_output_waiting(struct sp_port *port)
 {
        TRACE("%p", port);
 
+#ifdef __CYGWIN__
+       /* TIOCOUTQ is not defined in Cygwin headers */
+       RETURN_ERROR(SP_ERR_SUPP,
+                       "Getting output bytes waiting is not supported on Cygwin");
+#else
        CHECK_OPEN_PORT();
 
        DEBUG_FMT("Checking output bytes waiting on port %s", port->name);
@@ -1324,6 +1329,7 @@ SP_API enum sp_return sp_output_waiting(struct sp_port *port)
                RETURN_FAIL("TIOCOUTQ ioctl failed");
        RETURN_INT(bytes_waiting);
 #endif
+#endif
 }
 
 SP_API enum sp_return sp_new_event_set(struct sp_event_set **result_ptr)
@@ -1442,6 +1448,7 @@ SP_API enum sp_return sp_wait(struct sp_event_set *event_set,
        RETURN_OK();
 #else
        struct timeout timeout;
+       int poll_timeout;
        int result;
        struct pollfd *pollfds;
        unsigned int i;
@@ -1472,7 +1479,11 @@ SP_API enum sp_return sp_wait(struct sp_event_set *event_set,
                        break;
                }
 
-               result = poll(pollfds, event_set->count, timeout_remaining_ms(&timeout) || -1);
+               poll_timeout = (int) timeout_remaining_ms(&timeout);
+               if (poll_timeout == 0)
+                       poll_timeout = -1;
+
+               result = poll(pollfds, event_set->count, poll_timeout);
 
                timeout_update(&timeout);
 
@@ -1637,28 +1648,25 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
 
        config->bits = data->dcb.ByteSize;
 
-       if (data->dcb.fParity)
-               switch (data->dcb.Parity) {
-               case NOPARITY:
-                       config->parity = SP_PARITY_NONE;
-                       break;
-               case ODDPARITY:
-                       config->parity = SP_PARITY_ODD;
-                       break;
-               case EVENPARITY:
-                       config->parity = SP_PARITY_EVEN;
-                       break;
-               case MARKPARITY:
-                       config->parity = SP_PARITY_MARK;
-                       break;
-               case SPACEPARITY:
-                       config->parity = SP_PARITY_SPACE;
-                       break;
-               default:
-                       config->parity = -1;
-               }
-       else
+       switch (data->dcb.Parity) {
+       case NOPARITY:
                config->parity = SP_PARITY_NONE;
+               break;
+       case ODDPARITY:
+               config->parity = SP_PARITY_ODD;
+               break;
+       case EVENPARITY:
+               config->parity = SP_PARITY_EVEN;
+               break;
+       case MARKPARITY:
+               config->parity = SP_PARITY_MARK;
+               break;
+       case SPACEPARITY:
+               config->parity = SP_PARITY_SPACE;
+               break;
+       default:
+               config->parity = -1;
+       }
 
        switch (data->dcb.StopBits) {
        case ONESTOPBIT: