]> sigrok.org Git - libserialport.git/blobdiff - serialport.c
Use named enums instead of ints for clearer documentation.
[libserialport.git] / serialport.c
index 6a6e305bb2988ecc20d421b9a1f1b576f33dd2b4..7796fce2573f37fa066bbc36e92c6e4868d9ab0b 100644 (file)
 
 #include "libserialport.h"
 
-struct sp_port_data {
+struct port_data {
 #ifdef _WIN32
        DCB dcb;
 #else
        struct termios term;
-       int rts;
-       int cts;
-       int dtr;
-       int dsr;
+       int controlbits;
+#endif
+};
+
+/* Standard baud rates. */
+#ifdef _WIN32
+#define BAUD_TYPE DWORD
+#define BAUD(n) {CBR_##n, n}
+#else
+#define BAUD_TYPE speed_t
+#define BAUD(n) {B##n, n}
+#endif
+
+struct std_baudrate {
+       BAUD_TYPE index;
+       int value;
+};
+
+const struct std_baudrate std_baudrates[] = {
+#ifdef _WIN32
+       /*
+        * The baudrates 50/75/134/150/200/1800/230400/460800 do not seem to
+        * have documented CBR_* macros.
+        */
+       BAUD(110), BAUD(300), BAUD(600), BAUD(1200), BAUD(2400), BAUD(4800),
+       BAUD(9600), BAUD(14400), BAUD(19200), BAUD(38400), BAUD(57600),
+       BAUD(115200), BAUD(128000), BAUD(256000)
+#else
+       BAUD(50), BAUD(75), BAUD(110), BAUD(134), BAUD(150), BAUD(200), BAUD(300),
+       BAUD(600), BAUD(1200), BAUD(1800), BAUD(2400), BAUD(4800), BAUD(9600),
+       BAUD(19200), BAUD(38400), BAUD(57600), BAUD(115200), BAUD(230400),
+#if !defined(__APPLE__) && !defined(__OpenBSD__)
+       BAUD(460800)
+#endif
 #endif
 };
 
-/* Helper functions for configuring ports. */
-static int start_config(struct sp_port *port, struct sp_port_data *data);
-static int set_baudrate(struct sp_port_data *data, int baudrate);
-static int set_bits(struct sp_port_data *data, int bits);
-static int set_parity(struct sp_port_data *data, int parity);
-static int set_stopbits(struct sp_port_data *data, int stopbits);
-static int set_rts(struct sp_port_data *data, int rts);
-static int set_cts(struct sp_port_data *data, int cts);
-static int set_dtr(struct sp_port_data *data, int dtr);
-static int set_dsr(struct sp_port_data *data, int dsr);
-static int set_xon_xoff(struct sp_port_data *data, int xon_xoff);
-static int apply_config(struct sp_port *port, struct sp_port_data *data);
-
-int sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
+#define NUM_STD_BAUDRATES ARRAY_SIZE(std_baudrates)
+
+/* Helper functions. */
+static enum sp_return validate_port(struct sp_port *port);
+static struct sp_port **list_append(struct sp_port **list, const char *portname);
+static enum sp_return get_config(struct sp_port *port, struct port_data *data,
+       struct sp_port_config *config);
+static enum sp_return set_config(struct sp_port *port, struct port_data *data,
+       const struct sp_port_config *config);
+
+enum sp_return sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
 {
        struct sp_port *port;
        int len;
@@ -97,12 +125,18 @@ int sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
 
        memcpy(port->name, portname, len);
 
+#ifdef _WIN32
+       port->hdl = INVALID_HANDLE_VALUE;
+#else
+       port->fd = -1;
+#endif
+
        *port_ptr = port;
 
        return SP_OK;
 }
 
-int sp_copy_port(const struct sp_port *port, struct sp_port **copy_ptr)
+enum sp_return sp_copy_port(const struct sp_port *port, struct sp_port **copy_ptr)
 {
        if (!copy_ptr)
                return SP_ERR_ARG;
@@ -126,7 +160,7 @@ void sp_free_port(struct sp_port *port)
        free(port);
 }
 
-static struct sp_port **sp_list_append(struct sp_port **list, const char *portname)
+static struct sp_port **list_append(struct sp_port **list, const char *portname)
 {
        void *tmp;
        unsigned int count;
@@ -145,7 +179,7 @@ fail:
        return NULL;
 }
 
-int sp_list_ports(struct sp_port ***list_ptr)
+enum sp_return sp_list_ports(struct sp_port ***list_ptr)
 {
        struct sp_port **list;
        int ret = SP_OK;
@@ -210,7 +244,7 @@ int sp_list_ports(struct sp_port ***list_ptr)
 #else
                strcpy(name, data);
 #endif
-               if (type == REG_SZ && !(list = sp_list_append(list, name)))
+               if (type == REG_SZ && !(list = list_append(list, name)))
                {
                        ret = SP_ERR_MEM;
                        goto out;
@@ -268,7 +302,7 @@ out_done:
                        result = CFStringGetCString(cf_path,
                                        path, PATH_MAX, kCFStringEncodingASCII);
                        CFRelease(cf_path);
-                       if (result && !(list = sp_list_append(list, path)))
+                       if (result && !(list = list_append(list, path)))
                        {
                                ret = SP_ERR_MEM;
                                IOObjectRelease(port);
@@ -327,7 +361,7 @@ out_done:
                        if (serial_info.type == PORT_UNKNOWN)
                                goto skip;
                }
-               list = sp_list_append(list, name);
+               list = list_append(list, name);
 skip:
                udev_device_unref(ud_dev);
                if (!list)
@@ -365,7 +399,7 @@ void sp_free_port_list(struct sp_port **list)
        free(list);
 }
 
-static int sp_validate_port(struct sp_port *port)
+static enum sp_return validate_port(struct sp_port *port)
 {
        if (port == NULL)
                return 0;
@@ -379,9 +413,9 @@ static int sp_validate_port(struct sp_port *port)
        return 1;
 }
 
-#define CHECK_PORT() do { if (!sp_validate_port(port)) return SP_ERR_ARG; } while (0)
+#define CHECK_PORT() do { if (!validate_port(port)) return SP_ERR_ARG; } while (0)
 
-int sp_open(struct sp_port *port, int flags)
+enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 {
        if (!port)
                return SP_ERR_ARG;
@@ -412,7 +446,9 @@ int sp_open(struct sp_port *port, int flags)
                return SP_ERR_FAIL;
 #else
        int flags_local = 0;
-       struct sp_port_data data;
+       struct port_data data;
+       struct sp_port_config config;
+       int ret;
 
        /* Map 'flags' to the OS-specific settings. */
        if (flags & SP_MODE_RDWR)
@@ -425,7 +461,13 @@ int sp_open(struct sp_port *port, int flags)
        if ((port->fd = open(port->name, flags_local)) < 0)
                return SP_ERR_FAIL;
 
-       start_config(port, &data);
+       ret = get_config(port, &data, &config);
+
+       if (ret < 0)
+       {
+               sp_close(port);
+               return ret;
+       }
 
        /* Turn off all serial port cooking. */
        data.term.c_iflag &= ~(ISTRIP | INLCR | ICRNL);
@@ -439,13 +481,19 @@ int sp_open(struct sp_port *port, int flags)
        /* Ignore modem status lines; enable receiver */
        data.term.c_cflag |= (CLOCAL | CREAD);
 
-       apply_config(port, &data);
+       ret = set_config(port, &data, &config);
+
+       if (ret < 0)
+       {
+               sp_close(port);
+               return ret;
+       }
 #endif
 
        return SP_OK;
 }
 
-int sp_close(struct sp_port *port)
+enum sp_return sp_close(struct sp_port *port)
 {
        CHECK_PORT();
 
@@ -453,16 +501,18 @@ int sp_close(struct sp_port *port)
        /* Returns non-zero upon success, 0 upon failure. */
        if (CloseHandle(port->hdl) == 0)
                return SP_ERR_FAIL;
+       port->hdl = INVALID_HANDLE_VALUE;
 #else
        /* Returns 0 upon success, -1 upon failure. */
        if (close(port->fd) == -1)
                return SP_ERR_FAIL;
+       port->fd = -1;
 #endif
 
        return SP_OK;
 }
 
-int sp_flush(struct sp_port *port)
+enum sp_return sp_flush(struct sp_port *port)
 {
        CHECK_PORT();
 
@@ -478,7 +528,7 @@ int sp_flush(struct sp_port *port)
        return SP_OK;
 }
 
-int sp_write(struct sp_port *port, const void *buf, size_t count)
+enum sp_return sp_write(struct sp_port *port, const void *buf, size_t count)
 {
        CHECK_PORT();
 
@@ -503,7 +553,7 @@ int sp_write(struct sp_port *port, const void *buf, size_t count)
 #endif
 }
 
-int sp_read(struct sp_port *port, void *buf, size_t count)
+enum sp_return sp_read(struct sp_port *port, void *buf, size_t count)
 {
        CHECK_PORT();
 
@@ -527,457 +577,510 @@ int sp_read(struct sp_port *port, void *buf, size_t count)
 #endif
 }
 
-static int start_config(struct sp_port *port, struct sp_port_data *data)
+static enum sp_return get_config(struct sp_port *port, struct port_data *data,
+       struct sp_port_config *config)
 {
-       CHECK_PORT();
+       unsigned int i;
+
 #ifdef _WIN32
        if (!GetCommState(port->hdl, &data->dcb))
                return SP_ERR_FAIL;
-#else
-       int controlbits;
-
-       if (tcgetattr(port->fd, &data->term) < 0)
-               return SP_ERR_FAIL;
-
-       if (ioctl(port->fd, TIOCMGET, &controlbits) < 0)
-               return SP_ERR_FAIL;
 
-       if (data->term.c_cflag & CRTSCTS) {
-               data->rts = SP_RTS_FLOW_CONTROL;
-               data->cts = SP_CTS_FLOW_CONTROL;
-       } else {
-               data->rts = (controlbits & TIOCM_RTS) ? SP_RTS_ON : SP_RTS_OFF;
-               data->cts = SP_CTS_IGNORE;
+       for (i = 0; i < NUM_STD_BAUDRATES; i++) {
+               if (data->dcb.BaudRate == std_baudrates[i].index) {
+                       config->baudrate = std_baudrates[i].value;
+                       break;
+               }
        }
 
-       data->dtr = (controlbits & TIOCM_DTR) ? SP_DTR_ON : SP_DTR_OFF;
-       data->dsr = SP_DSR_IGNORE;
-#endif
-       return SP_OK;
-}
+       if (i == NUM_STD_BAUDRATES)
+               /* BaudRate field can be either an index or a custom baud rate. */
+               config->baudrate = data->dcb.BaudRate;
+
+       config->bits = data->dcb.ByteSize;
+
+       if (data->dcb.fParity)
+               switch (data->dcb.Parity) {
+               case NOPARITY:
+                       config->parity = SP_PARITY_NONE;
+                       break;
+               case EVENPARITY:
+                       config->parity = SP_PARITY_EVEN;
+                       break;
+               case ODDPARITY:
+                       config->parity = SP_PARITY_ODD;
+                       break;
+               default:
+                       config->parity = -1;
+               }
+       else
+               config->parity = SP_PARITY_NONE;
 
-static int set_baudrate(struct sp_port_data *data, int baudrate)
-{
-#ifdef _WIN32
-       switch (baudrate) {
-       /*
-        * The baudrates 50/75/134/150/200/1800/230400/460800 do not seem to
-        * have documented CBR_* macros.
-        */
-       case 110:
-               data->dcb.BaudRate = CBR_110;
-               break;
-       case 300:
-               data->dcb.BaudRate = CBR_300;
-               break;
-       case 600:
-               data->dcb.BaudRate = CBR_600;
-               break;
-       case 1200:
-               data->dcb.BaudRate = CBR_1200;
-               break;
-       case 2400:
-               data->dcb.BaudRate = CBR_2400;
-               break;
-       case 4800:
-               data->dcb.BaudRate = CBR_4800;
-               break;
-       case 9600:
-               data->dcb.BaudRate = CBR_9600;
-               break;
-       case 14400:
-               data->dcb.BaudRate = CBR_14400; /* Not available on Unix? */
-               break;
-       case 19200:
-               data->dcb.BaudRate = CBR_19200;
+       switch (data->dcb.StopBits) {
+       case ONESTOPBIT:
+               config->stopbits = 1;
                break;
-       case 38400:
-               data->dcb.BaudRate = CBR_38400;
-               break;
-       case 57600:
-               data->dcb.BaudRate = CBR_57600;
-               break;
-       case 115200:
-               data->dcb.BaudRate = CBR_115200;
-               break;
-       case 128000:
-               data->dcb.BaudRate = CBR_128000; /* Not available on Unix? */
-               break;
-       case 256000:
-               data->dcb.BaudRate = CBR_256000; /* Not available on Unix? */
+       case TWOSTOPBITS:
+               config->stopbits = 2;
                break;
        default:
-               return SP_ERR_ARG;
+               config->stopbits = -1;
        }
-#else
-       speed_t baud;
-       switch (baudrate) {
-       case 50:
-               baud = B50;
-               break;
-       case 75:
-               baud = B75;
-               break;
-       case 110:
-               baud = B110;
-               break;
-       case 134:
-               baud = B134;
-               break;
-       case 150:
-               baud = B150;
-               break;
-       case 200:
-               baud = B200;
-               break;
-       case 300:
-               baud = B300;
-               break;
-       case 600:
-               baud = B600;
-               break;
-       case 1200:
-               baud = B1200;
-               break;
-       case 1800:
-               baud = B1800;
-               break;
-       case 2400:
-               baud = B2400;
-               break;
-       case 4800:
-               baud = B4800;
-               break;
-       case 9600:
-               baud = B9600;
-               break;
-       case 19200:
-               baud = B19200;
-               break;
-       case 38400:
-               baud = B38400;
-               break;
-       case 57600:
-               baud = B57600;
-               break;
-       case 115200:
-               baud = B115200;
-               break;
-       case 230400:
-               baud = B230400;
-               break;
-#if !defined(__APPLE__) && !defined(__OpenBSD__)
-       case 460800:
-               baud = B460800;
-               break;
-#endif
-       default:
-               return SP_ERR_ARG;
+
+       switch (data->dcb.fRtsControl) {
+               case RTS_CONTROL_DISABLE:
+                       config->rts = SP_RTS_OFF;
+                       break;
+               case RTS_CONTROL_ENABLE:
+                       config->rts = SP_RTS_ON;
+                       break;
+               case RTS_CONTROL_HANDSHAKE:
+                       config->rts = SP_RTS_FLOW_CONTROL;
+                       break;
+               default:
+                       config->rts = -1;
        }
 
-       if (cfsetospeed(&data->term, baud) < 0)
+       config->cts = data->dcb.fOutxCtsFlow ? SP_CTS_FLOW_CONTROL : SP_CTS_IGNORE;
+
+       switch (data->dcb.fDtrControl) {
+               case DTR_CONTROL_DISABLE:
+                       config->dtr = SP_DTR_OFF;
+                       break;
+               case DTR_CONTROL_ENABLE:
+                       config->dtr = SP_DTR_ON;
+                       break;
+               case DTR_CONTROL_HANDSHAKE:
+                       config->dtr = SP_DTR_FLOW_CONTROL;
+                       break;
+               default:
+                       config->dtr = -1;
+       }
+
+       config->dsr = data->dcb.fOutxDsrFlow ? SP_DSR_FLOW_CONTROL : SP_DSR_IGNORE;
+
+       if (data->dcb.fInX) {
+               if (data->dcb.fOutX)
+                       config->xon_xoff = SP_XONXOFF_INOUT;
+               else
+                       config->xon_xoff = SP_XONXOFF_IN;
+       } else {
+               if (data->dcb.fOutX)
+                       config->xon_xoff = SP_XONXOFF_OUT;
+               else
+                       config->xon_xoff = SP_XONXOFF_DISABLED;
+       }
+
+#else // !_WIN32
+
+       if (tcgetattr(port->fd, &data->term) < 0)
                return SP_ERR_FAIL;
 
-       if (cfsetispeed(&data->term, baud) < 0)
+       if (ioctl(port->fd, TIOCMGET, &data->controlbits) < 0)
                return SP_ERR_FAIL;
+       for (i = 0; i < NUM_STD_BAUDRATES; i++) {
+               if (cfgetispeed(&data->term) == std_baudrates[i].index) {
+                       config->baudrate = std_baudrates[i].value;
+                       break;
+               }
+       }
 
-#endif
-       return SP_OK;
-}
+       if (i == NUM_STD_BAUDRATES)
+               config->baudrate = -1;
 
-static int set_bits(struct sp_port_data *data, int bits)
-{
-#ifdef _WIN32
-       data->dcb.ByteSize = bits;
-#else
-       data->term.c_cflag &= ~CSIZE;
-       switch (bits) {
-       case 8:
-               data->term.c_cflag |= CS8;
-               break;
-       case 7:
-               data->term.c_cflag |= CS7;
-               break;
-       case 6:
-               data->term.c_cflag |= CS6;
+       switch (data->term.c_cflag & CSIZE) {
+       case CS8:
+               config->bits = 8;
                break;
-       default:
-               return SP_ERR_ARG;
-       }
-#endif
-       return SP_OK;
-}
-
-static int set_parity(struct sp_port_data *data, int parity)
-{
-#ifdef _WIN32
-       switch (parity) {
-       /* Note: There's also SPACEPARITY, MARKPARITY (unneeded so far). */
-       case SP_PARITY_NONE:
-               data->dcb.Parity = NOPARITY;
+       case CS7:
+               config->bits = 7;
                break;
-       case SP_PARITY_EVEN:
-               data->dcb.Parity = EVENPARITY;
+       case CS6:
+               config->bits = 6;
                break;
-       case SP_PARITY_ODD:
-               data->dcb.Parity = ODDPARITY;
+       case CS5:
+               config->bits = 5;
                break;
        default:
-               return SP_ERR_ARG;
+               config->bits = -1;
        }
-#else
-       data->term.c_iflag &= ~IGNPAR;
-       data->term.c_cflag &= ~(PARENB | PARODD);
-       switch (parity) {
-       case SP_PARITY_NONE:
-               data->term.c_iflag |= IGNPAR;
-               break;
-       case SP_PARITY_EVEN:
-               data->term.c_cflag |= PARENB;
-               break;
-       case SP_PARITY_ODD:
-               data->term.c_cflag |= PARENB | PARODD;
-               break;
-       default:
-               return SP_ERR_ARG;
+
+       if (!(data->term.c_cflag & PARENB) && (data->term.c_iflag & IGNPAR))
+               config->parity = SP_PARITY_NONE;
+       else if (!(data->term.c_cflag & PARENB) || (data->term.c_iflag & IGNPAR))
+               config->parity = -1;
+       else
+               config->parity = (data->term.c_cflag & PARODD) ? SP_PARITY_ODD : SP_PARITY_EVEN;
+
+       config->stopbits = (data->term.c_cflag & CSTOPB) ? 2 : 1;
+
+       if (data->term.c_cflag & CRTSCTS) {
+               config->rts = SP_RTS_FLOW_CONTROL;
+               config->cts = SP_CTS_FLOW_CONTROL;
+       } else {
+               config->rts = (data->controlbits & TIOCM_RTS) ? SP_RTS_ON : SP_RTS_OFF;
+               config->cts = SP_CTS_IGNORE;
        }
+
+       config->dtr = (data->controlbits & TIOCM_DTR) ? SP_DTR_ON : SP_DTR_OFF;
+       config->dsr = SP_DSR_IGNORE;
 #endif
+
        return SP_OK;
 }
 
-static int set_stopbits(struct sp_port_data *data, int stopbits)
+static enum sp_return set_config(struct sp_port *port, struct port_data *data, 
+       const struct sp_port_config *config)
 {
+       unsigned int i;
+
 #ifdef _WIN32
-       switch (stopbits) {
-       /* Note: There's also ONE5STOPBITS == 1.5 (unneeded so far). */
-       case 1:
-               data->dcb.StopBits = ONESTOPBIT;
-               break;
-       case 2:
-               data->dcb.StopBits = TWOSTOPBITS;
-               break;
-       default:
-               return SP_ERR_ARG;
+       if (config->baudrate >= 0)
+       {
+               for (i = 0; i < NUM_STD_BAUDRATES; i++) {
+                       if (config->baudrate == std_baudrates[i].value) {
+                               data->dcb.BaudRate = std_baudrates[i].index;
+                               break;
+                       }
+               }
+
+               if (i == NUM_STD_BAUDRATES)
+                       data->dcb.BaudRate = config->baudrate;
        }
-#else
-       data->term.c_cflag &= ~CSTOPB;
-       switch (stopbits) {
-       case 1:
-               data->term.c_cflag &= ~CSTOPB;
-               break;
-       case 2:
-               data->term.c_cflag |= CSTOPB;
-               break;
-       default:
-               return SP_ERR_ARG;
+
+       if (config->bits >= 0)
+               data->dcb.ByteSize = config->bits;
+
+       if (config->parity >= 0) {
+               switch (config->parity) {
+               /* Note: There's also SPACEPARITY, MARKPARITY (unneeded so far). */
+               case SP_PARITY_NONE:
+                       data->dcb.Parity = NOPARITY;
+                       break;
+               case SP_PARITY_EVEN:
+                       data->dcb.Parity = EVENPARITY;
+                       break;
+               case SP_PARITY_ODD:
+                       data->dcb.Parity = ODDPARITY;
+                       break;
+               default:
+                       return SP_ERR_ARG;
+               }
        }
-#endif
-       return SP_OK;
-}
 
-static int set_rts(struct sp_port_data *data, int rts)
-{
-#ifdef _WIN32
-       switch (rts) {
-       case SP_RTS_OFF:
-               data->dcb.fRtsControl = RTS_CONTROL_DISABLE;
-               break;
-       case SP_RTS_ON:
-               data->dcb.fRtsControl = RTS_CONTROL_ENABLE;
-               break;
-       case SP_RTS_FLOW_CONTROL:
-               data->dcb.fRtsControl = RTS_CONTROL_HANDSHAKE;
-               break;
-       default:
-               return SP_ERR_ARG;
+       if (config->stopbits >= 0) {
+               switch (config->stopbits) {
+               /* Note: There's also ONE5STOPBITS == 1.5 (unneeded so far). */
+               case 1:
+                       data->dcb.StopBits = ONESTOPBIT;
+                       break;
+               case 2:
+                       data->dcb.StopBits = TWOSTOPBITS;
+                       break;
+               default:
+                       return SP_ERR_ARG;
+               }
        }
-#else
-       data->rts = rts;
-#endif
-       return SP_OK;
-}
 
-static int set_cts(struct sp_port_data *data, int cts)
-{
-#ifdef _WIN32
-       switch (cts) {
-       case SP_CTS_IGNORE:
-               data->dcb.fOutxCtsFlow = FALSE;
-               break;
-       case SP_CTS_FLOW_CONTROL:
-               data->dcb.fOutxCtsFlow = TRUE;
-               break;
-       default:
-               return SP_ERR_ARG;
+       if (config->rts >= 0) {
+               switch (config->rts) {
+               case SP_RTS_OFF:
+                       data->dcb.fRtsControl = RTS_CONTROL_DISABLE;
+                       break;
+               case SP_RTS_ON:
+                       data->dcb.fRtsControl = RTS_CONTROL_ENABLE;
+                       break;
+               case SP_RTS_FLOW_CONTROL:
+                       data->dcb.fRtsControl = RTS_CONTROL_HANDSHAKE;
+                       break;
+               default:
+                       return SP_ERR_ARG;
+               }
        }
-#else
-       data->cts = cts;
-#endif
-       return SP_OK;
-}
 
-static int set_dtr(struct sp_port_data *data, int dtr)
-{
-#ifdef _WIN32
-       switch (dtr) {
-       case SP_DTR_OFF:
-               data->dcb.fDtrControl = DTR_CONTROL_DISABLE;
-               break;
-       case SP_DTR_ON:
-               data->dcb.fDtrControl = DTR_CONTROL_ENABLE;
-               break;
-       case SP_DTR_FLOW_CONTROL:
-               data->dcb.fDtrControl = DTR_CONTROL_HANDSHAKE;
-               break;
-       default:
-               return SP_ERR_ARG;
+       if (config->cts >= 0) {
+               switch (config->cts) {
+               case SP_CTS_IGNORE:
+                       data->dcb.fOutxCtsFlow = FALSE;
+                       break;
+               case SP_CTS_FLOW_CONTROL:
+                       data->dcb.fOutxCtsFlow = TRUE;
+                       break;
+               default:
+                       return SP_ERR_ARG;
+               }
        }
-#else
-       data->dtr = dtr;
-#endif
-       return SP_OK;
-}
 
-static int set_dsr(struct sp_port_data *data, int dsr)
-{
-#ifdef _WIN32
-       switch (dsr) {
-       case SP_DSR_IGNORE:
-               data->dcb.fOutxDsrFlow = FALSE;
-               break;
-       case SP_DSR_FLOW_CONTROL:
-               data->dcb.fOutxDsrFlow = TRUE;
-               break;
-       default:
-               return SP_ERR_ARG;
+       if (config->dtr >= 0) {
+               switch (config->dtr) {
+               case SP_DTR_OFF:
+                       data->dcb.fDtrControl = DTR_CONTROL_DISABLE;
+                       break;
+               case SP_DTR_ON:
+                       data->dcb.fDtrControl = DTR_CONTROL_ENABLE;
+                       break;
+               case SP_DTR_FLOW_CONTROL:
+                       data->dcb.fDtrControl = DTR_CONTROL_HANDSHAKE;
+                       break;
+               default:
+                       return SP_ERR_ARG;
+               }
        }
-#else
-       data->dsr = dsr;
-#endif
-       return SP_OK;
-}
 
-static int set_xon_xoff(struct sp_port_data *data, int xon_xoff)
-{
-#ifdef _WIN32
-       switch (xon_xoff) {
-       case SP_XONXOFF_DISABLED:
-               data->dcb.fInX = FALSE;
-               data->dcb.fOutX = FALSE;
-               break;
-       case SP_XONXOFF_IN:
-               data->dcb.fInX = TRUE;
-               data->dcb.fOutX = FALSE;
-               break;
-       case SP_XONXOFF_OUT:
-               data->dcb.fInX = FALSE;
-               data->dcb.fOutX = TRUE;
-               break;
-       case SP_XONXOFF_INOUT:
-               data->dcb.fInX = TRUE;
-               data->dcb.fOutX = TRUE;
-               break;
-       default:
-               return SP_ERR_ARG;
+       if (config->dsr >= 0) {
+               switch (config->dsr) {
+               case SP_DSR_IGNORE:
+                       data->dcb.fOutxDsrFlow = FALSE;
+                       break;
+               case SP_DSR_FLOW_CONTROL:
+                       data->dcb.fOutxDsrFlow = TRUE;
+                       break;
+               default:
+                       return SP_ERR_ARG;
+               }
        }
-#else
-       data->term.c_iflag &= ~(IXON | IXOFF | IXANY);
-       switch (xon_xoff) {
-       case SP_XONXOFF_DISABLED:
-               break;
-       case SP_XONXOFF_IN:
-               data->term.c_iflag |= IXOFF;
-               break;
-       case SP_XONXOFF_OUT:
-               data->term.c_iflag |= IXON | IXANY;
-               break;
-       case SP_XONXOFF_INOUT:
-               data->term.c_iflag |= IXON | IXOFF | IXANY;
-               break;
-       default:
-               return SP_ERR_ARG;
+
+       if (config->xon_xoff >= 0) {
+               switch (config->xon_xoff) {
+               case SP_XONXOFF_DISABLED:
+                       data->dcb.fInX = FALSE;
+                       data->dcb.fOutX = FALSE;
+                       break;
+               case SP_XONXOFF_IN:
+                       data->dcb.fInX = TRUE;
+                       data->dcb.fOutX = FALSE;
+                       break;
+               case SP_XONXOFF_OUT:
+                       data->dcb.fInX = FALSE;
+                       data->dcb.fOutX = TRUE;
+                       break;
+               case SP_XONXOFF_INOUT:
+                       data->dcb.fInX = TRUE;
+                       data->dcb.fOutX = TRUE;
+                       break;
+               default:
+                       return SP_ERR_ARG;
+               }
        }
-#endif
-       return SP_OK;
-}
 
-static int apply_config(struct sp_port *port, struct sp_port_data *data)
-{
-#ifdef _WIN32
        if (!SetCommState(port->hdl, &data->dcb))
                return SP_ERR_FAIL;
-#else
-       int controlbits;
 
-       /* Asymmetric use of RTS/CTS not supported yet. */
-       if ((data->rts == SP_RTS_FLOW_CONTROL) != (data->cts == SP_CTS_FLOW_CONTROL))
-               return SP_ERR_ARG;
+#else // !_WIN32
 
-       /* DTR/DSR flow control not supported yet. */
-       if (data->dtr == SP_DTR_FLOW_CONTROL || data->dsr == SP_DSR_FLOW_CONTROL)
-               return SP_ERR_ARG;
+       if (config->baudrate >= 0)
+       {
+               for (i = 0; i < NUM_STD_BAUDRATES; i++) {
+                       if (config->baudrate == std_baudrates[i].value) {
+                               if (cfsetospeed(&data->term, std_baudrates[i].index) < 0)
+                                       return SP_ERR_FAIL;
+
+                               if (cfsetispeed(&data->term, std_baudrates[i].index) < 0)
+                                       return SP_ERR_FAIL;
+                               break;
+                       }
+               }
 
-       if (data->rts == SP_RTS_FLOW_CONTROL)
-               data->term.c_iflag |= CRTSCTS;
-       else
+               if (i == NUM_STD_BAUDRATES)
+                       return SP_ERR_ARG;
+       }
+
+       if (config->bits >= 0) {
+               data->term.c_cflag &= ~CSIZE;
+               switch (config->bits) {
+               case 8:
+                       data->term.c_cflag |= CS8;
+                       break;
+               case 7:
+                       data->term.c_cflag |= CS7;
+                       break;
+               case 6:
+                       data->term.c_cflag |= CS6;
+                       break;
+               default:
+                       return SP_ERR_ARG;
+               }
+       }
+
+       if (config->parity >= 0) {
+               data->term.c_iflag &= ~IGNPAR;
+               data->term.c_cflag &= ~(PARENB | PARODD);
+               switch (config->parity) {
+               case SP_PARITY_NONE:
+                       data->term.c_iflag |= IGNPAR;
+                       break;
+               case SP_PARITY_EVEN:
+                       data->term.c_cflag |= PARENB;
+                       break;
+               case SP_PARITY_ODD:
+                       data->term.c_cflag |= PARENB | PARODD;
+                       break;
+               default:
+                       return SP_ERR_ARG;
+               }
+       }
+
+       if (config->stopbits >= 0) {
+               data->term.c_cflag &= ~CSTOPB;
+               switch (config->stopbits) {
+               case 1:
+                       data->term.c_cflag &= ~CSTOPB;
+                       break;
+               case 2:
+                       data->term.c_cflag |= CSTOPB;
+                       break;
+               default:
+                       return SP_ERR_ARG;
+               }
+       }
+
+       if (config->rts >= 0 || config->cts >= 0)
+       {
+               /* Asymmetric use of RTS/CTS not supported yet. */
+
+               if (data->term.c_iflag & CRTSCTS) {
+                       /* Flow control can only be disabled for both RTS & CTS together. */
+                       if (config->rts >= 0 && config->rts != SP_RTS_FLOW_CONTROL) {
+                               if (config->cts != SP_CTS_IGNORE)
+                                       return SP_ERR_ARG;
+                       }
+                       if (config->cts >= 0 && config->cts != SP_CTS_FLOW_CONTROL) {
+                               if (config->rts <= 0 || config->rts == SP_RTS_FLOW_CONTROL)
+                                       return SP_ERR_ARG;
+                       }
+               } else {
+                       /* Flow control can only be enabled for both RTS & CTS together. */
+                       if (((config->rts == SP_RTS_FLOW_CONTROL) && (config->cts != SP_CTS_FLOW_CONTROL)) ||
+                               ((config->cts == SP_CTS_FLOW_CONTROL) && (config->rts != SP_RTS_FLOW_CONTROL)))
+                               return SP_ERR_ARG;
+               }
+
+               if (config->rts >= 0) {
+                       if (config->rts == SP_RTS_FLOW_CONTROL) {
+                               data->term.c_iflag |= CRTSCTS;
+                       } else {
+                               int controlbits = TIOCM_RTS;
+                               if (ioctl(port->fd, config->rts == SP_RTS_ON ? TIOCMBIS : TIOCMBIC,
+                                               &controlbits) < 0)
+                                       return SP_ERR_FAIL;
+                       }
+               }
+       }
+
+       if (config->dtr >= 0 || config->dsr >= 0)
        {
-               controlbits = TIOCM_RTS;
-               if (ioctl(port->fd, data->rts == SP_RTS_ON ? TIOCMBIS : TIOCMBIC,
-                               &controlbits) < 0)
-                       return SP_ERR_FAIL;
+               /* DTR/DSR flow control not supported yet. */
+               if (config->dtr == SP_DTR_FLOW_CONTROL || config->dsr == SP_DSR_FLOW_CONTROL)
+                       return SP_ERR_ARG;
+
+               if (config->dtr >= 0) {
+                       int controlbits = TIOCM_DTR;
+                       if (ioctl(port->fd, config->dtr == SP_DTR_ON ? TIOCMBIS : TIOCMBIC,
+                                       &controlbits) < 0)
+                               return SP_ERR_FAIL;
+               }
        }
 
-       controlbits = TIOCM_DTR;
-       if (ioctl(port->fd, data->dtr == SP_DTR_ON ? TIOCMBIS : TIOCMBIC,
-                       &controlbits) < 0)
-               return SP_ERR_FAIL;
+       if (config->xon_xoff >= 0) {
+               data->term.c_iflag &= ~(IXON | IXOFF | IXANY);
+               switch (config->xon_xoff) {
+               case SP_XONXOFF_DISABLED:
+                       break;
+               case SP_XONXOFF_IN:
+                       data->term.c_iflag |= IXOFF;
+                       break;
+               case SP_XONXOFF_OUT:
+                       data->term.c_iflag |= IXON | IXANY;
+                       break;
+               case SP_XONXOFF_INOUT:
+                       data->term.c_iflag |= IXON | IXOFF | IXANY;
+                       break;
+               default:
+                       return SP_ERR_ARG;
+               }
+       }
 
-       /* Write the configured settings. */
        if (tcsetattr(port->fd, TCSADRAIN, &data->term) < 0)
                return SP_ERR_FAIL;
 #endif
+
        return SP_OK;
 }
 
 #define TRY(x) do { int ret = x; if (ret != SP_OK) return ret; } while (0)
-#define TRY_SET(x) do { if (config->x >= 0) TRY(set_##x(&data, config->x)); } while (0)
 
-int sp_set_config(struct sp_port *port, struct sp_port_config *config)
+enum sp_return sp_set_config(struct sp_port *port, const struct sp_port_config *config)
 {
-       struct sp_port_data data;
-
-       TRY(start_config(port, &data));
-       TRY_SET(baudrate);
-       TRY_SET(bits);
-       TRY_SET(parity);
-       TRY_SET(stopbits);
-       TRY_SET(rts);
-       TRY_SET(cts);
-       TRY_SET(dtr);
-       TRY_SET(dsr);
-       TRY_SET(xon_xoff);
-       TRY(apply_config(port, &data));
+       struct port_data data;
+       struct sp_port_config prev_config;
+
+       CHECK_PORT();
+
+       if (!config)
+               return SP_ERR_ARG;
+
+       TRY(get_config(port, &data, &prev_config));
+       TRY(set_config(port, &data, config));
 
        return SP_OK;
 }
 
-#define CREATE_SETTER(x) int sp_set_##x(struct sp_port *port, int x) { \
-       struct sp_port_data data; \
-       TRY(start_config(port, &data)); \
-       TRY(set_##x(&data, x)); \
-       TRY(apply_config(port, &data)); \
+#define CREATE_SETTER(x, type) int sp_set_##x(struct sp_port *port, type x) { \
+       struct port_data data; \
+       struct sp_port_config config; \
+       CHECK_PORT(); \
+       TRY(get_config(port, &data, &config)); \
+       config.x = x; \
+       TRY(set_config(port, &data, &config)); \
        return SP_OK; \
 }
 
-CREATE_SETTER(baudrate)
-CREATE_SETTER(bits)
-CREATE_SETTER(parity)
-CREATE_SETTER(stopbits)
-CREATE_SETTER(rts)
-CREATE_SETTER(cts)
-CREATE_SETTER(dtr)
-CREATE_SETTER(dsr)
-CREATE_SETTER(xon_xoff)
+CREATE_SETTER(baudrate, int)
+CREATE_SETTER(bits, int)
+CREATE_SETTER(parity, enum sp_parity)
+CREATE_SETTER(stopbits, int)
+CREATE_SETTER(rts, enum sp_rts)
+CREATE_SETTER(cts, enum sp_cts)
+CREATE_SETTER(dtr, enum sp_dtr)
+CREATE_SETTER(dsr, enum sp_dsr)
+CREATE_SETTER(xon_xoff, enum sp_xonxoff)
+
+enum sp_return sp_set_flowcontrol(struct sp_port *port, enum sp_flowcontrol flowcontrol)
+{
+       struct port_data data;
+       struct sp_port_config config;
+
+       CHECK_PORT();
+
+       TRY(get_config(port, &data, &config));
+
+       if (flowcontrol == SP_FLOWCONTROL_XONXOFF)
+               config.xon_xoff = SP_XONXOFF_INOUT;
+       else
+               config.xon_xoff = SP_XONXOFF_DISABLED;
+
+       if (flowcontrol == SP_FLOWCONTROL_RTSCTS) {
+               config.rts = SP_RTS_FLOW_CONTROL;
+               config.cts = SP_CTS_FLOW_CONTROL;
+       } else {
+               if (config.rts == SP_RTS_FLOW_CONTROL)
+                       config.rts = SP_RTS_ON;
+               config.cts = SP_CTS_IGNORE;
+       }
+
+       if (flowcontrol == SP_FLOWCONTROL_DTRDSR) {
+               config.dtr = SP_DTR_FLOW_CONTROL;
+               config.dsr = SP_DSR_FLOW_CONTROL;
+       } else {
+               if (config.dtr == SP_DTR_FLOW_CONTROL)
+                       config.dtr = SP_DTR_ON;
+               config.dsr = SP_DSR_IGNORE;
+       }
+
+       TRY(set_config(port, &data, &config));
+
+       return SP_OK;
+}
 
 int sp_last_error_code(void)
 {