serial: Don't hardcode parity and stop bits on Windows.

[libsigrok.git] / hardware / common / serial.c

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index 6c8f63b0fe75d8289e7840d9bf59717b546e527f..a18ad0b494073962f1bc7fb182b4e1c95db3b2e3 100644 (file)
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -325,38 +325,100 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
 #ifdef _WIN32
        DCB dcb;
 
-       if (!GetCommState(hdl, &dcb))
+       if (!GetCommState(hdl, &dcb)) {
+               sr_err("Failed to get comm state on port %s (fd %d): %d.",
+                      serial->port, serial->fd, GetLastError());
                return SR_ERR;
+       }
 
        switch (baudrate) {
-       case 115200:
-               dcb.BaudRate = CBR_115200;
+       /*
+        * The baudrates 50/75/134/150/200/1800/230400/460800 do not seem to
+        * have documented CBR_* macros.
+        */
+       case 110:
+               dcb.BaudRate = CBR_110;
                break;
-       case 57600:
-               dcb.BaudRate = CBR_57600;
+       case 300:
+               dcb.BaudRate = CBR_300;
                break;
-       case 38400:
-               dcb.BaudRate = CBR_38400;
+       case 600:
+               dcb.BaudRate = CBR_600;
                break;
-       case 19200:
-               dcb.BaudRate = CBR_19200;
+       case 1200:
+               dcb.BaudRate = CBR_1200;
                break;
-       case 9600:
-               dcb.BaudRate = CBR_9600;
+       case 2400:
+               dcb.BaudRate = CBR_2400;
                break;
        case 4800:
                dcb.BaudRate = CBR_4800;
                break;
-       case 2400:
-               dcb.BaudRate = CBR_2400;
+       case 9600:
+               dcb.BaudRate = CBR_9600;
+               break;
+       case 14400:
+               dcb.BaudRate = CBR_14400; /* Not available on Unix? */
+               break;
+       case 19200:
+               dcb.BaudRate = CBR_19200;
+               break;
+       case 38400:
+               dcb.BaudRate = CBR_38400;
+               break;
+       case 57600:
+               dcb.BaudRate = CBR_57600;
+               break;
+       case 115200:
+               dcb.BaudRate = CBR_115200;
+               break;
+       case 128000:
+               dcb.BaudRate = CBR_128000; /* Not available on Unix? */
+               break;
+       case 256000:
+               dcb.BaudRate = CBR_256000; /* Not available on Unix? */
                break;
        default:
-               sr_err("Unsupported baudrate %d.", baudrate);
+               sr_err("Unsupported baudrate: %d.", baudrate);
                return SR_ERR;
        }
+       sr_spew("Configuring baudrate to %d (%d).", baudrate, dcb.BaudRate);
+
+       sr_spew("Configuring %d data bits.", bits);
        dcb.ByteSize = bits;
-       dcb.Parity = NOPARITY; /* TODO: Don't hardcode. */
-       dcb.StopBits = ONESTOPBIT; /* TODO: Don't hardcode. */
+
+       sr_spew("Configuring %d stop bits.", stopbits);
+       switch (stopbits) {
+       /* Note: There's also ONE5STOPBITS == 1.5 (unneeded so far). */
+       case 1:
+               dcb.StopBits = ONESTOPBIT;
+               break;
+       case 2:
+               dcb.StopBits = TWOSTOPBITS;
+               break;
+       default:
+               sr_err("Unsupported stopbits number: %d.", stopbits);
+               return SR_ERR;
+       }
+
+       switch (parity) {
+       /* Note: There's also SPACEPARITY, MARKPARITY (unneeded so far). */
+       case SERIAL_PARITY_NONE:
+               sr_spew("Configuring no parity.");
+               dcb.Parity = NOPARITY;
+               break;
+       case SERIAL_PARITY_EVEN:
+               sr_spew("Configuring even parity.");
+               dcb.Parity = EVENPARITY;
+               break;
+       case SERIAL_PARITY_ODD:
+               sr_spew("Configuring odd parity.");
+               dcb.Parity = ODDPARITY;
+               break;
+       default:
+               sr_err("Unsupported parity setting: %d.", parity);
+               return SR_ERR;
+       }
 
        if (rts != -1) {
                sr_spew("Setting RTS %s.", rts ? "high" : "low");
@@ -374,8 +436,11 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
                        dcb.fDtrControl = DTR_CONTROL_DISABLE;
        }
 
-       if (!SetCommState(hdl, &dcb))
+       if (!SetCommState(hdl, &dcb)) {
+               sr_err("Failed to set comm state on port %s (fd %d): %d.",
+                      serial->port, serial->fd, GetLastError());
                return SR_ERR;
+       }
 #else
        struct termios term;
        speed_t baud;
@@ -448,7 +513,7 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
                break;
 #endif
        default:
-               sr_err("Unsupported baudrate %d.", baudrate);
+               sr_err("Unsupported baudrate: %d.", baudrate);
                return SR_ERR;
        }