]> sigrok.org Git - libserialport.git/blobdiff - serialport.c
Replace sp_set_params with sp_set_config, which takes a struct.
[libserialport.git] / serialport.c
index 3c81f9ef097af937f250f2a5ef7a23789493327f..3f6b35c8655564ac1fbf226a196f9fa6e1f70ae1 100644 (file)
@@ -29,6 +29,7 @@
 #ifdef _WIN32
 #include <windows.h>
 #include <tchar.h>
+#include <stdio.h>
 #else
 #include <termios.h>
 #include <sys/ioctl.h>
 #include "linux/serial.h"
 #endif
 
-#include "serialport.h"
+#include "libserialport.h"
 
-static struct sp_port *sp_port_new(const char *portname)
+struct sp_port_data {
+#ifdef _WIN32
+       DCB dcb;
+#else
+       struct termios term;
+       speed_t baud;
+       int rts;
+       int dtr;
+#endif
+};
+
+int sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
 {
        struct sp_port *port;
        int len;
 
+       if (!port_ptr)
+               return SP_ERR_ARG;
+
+       *port_ptr = NULL;
+
+       if (!portname)
+               return SP_ERR_ARG;
+
        if (!(port = malloc(sizeof(struct sp_port))))
-               return NULL;
+               return SP_ERR_MEM;
 
        len = strlen(portname) + 1;
 
        if (!(port->name = malloc(len)))
        {
                free(port);
-               return NULL;
+               return SP_ERR_MEM;
        }
 
        memcpy(port->name, portname, len);
 
-       return port;
+       *port_ptr = port;
+
+       return SP_OK;
+}
+
+int sp_copy_port(const struct sp_port *port, struct sp_port **copy_ptr)
+{
+       if (!copy_ptr)
+               return SP_ERR_ARG;
+
+       *copy_ptr = NULL;
+
+       if (!port || !port->name)
+               return SP_ERR_ARG;
+
+       return sp_get_port_by_name(port->name, copy_ptr);
+}
+
+void sp_free_port(struct sp_port *port)
+{
+       if (!port)
+               return;
+
+       if (port->name)
+               free(port->name);
+
+       free(port);
 }
 
 static struct sp_port **sp_list_append(struct sp_port **list, const char *portname)
 {
        void *tmp;
        unsigned int count;
+
        for (count = 0; list[count]; count++);
        if (!(tmp = realloc(list, sizeof(struct sp_port *) * (count + 2))))
                goto fail;
        list = tmp;
-       if (!(list[count] = sp_port_new(portname)))
+       if (sp_get_port_by_name(portname, &list[count]) != SP_OK)
                goto fail;
        list[count + 1] = NULL;
        return list;
+
 fail:
        sp_free_port_list(list);
        return NULL;
 }
 
-/**
- * List the serial ports available on the system.
- *
- * @return A null-terminated array of port name strings.
- */
-struct sp_port **sp_list_ports(void)
+int sp_list_ports(struct sp_port ***list_ptr)
 {
        struct sp_port **list;
+       int ret = SP_OK;
 
        if (!(list = malloc(sizeof(struct sp_port **))))
-               return NULL;
+               return SP_ERR_MEM;
 
        list[0] = NULL;
 
@@ -108,17 +152,29 @@ struct sp_port **sp_list_ports(void)
 
        if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("HARDWARE\\DEVICEMAP\\SERIALCOMM"),
                        0, KEY_QUERY_VALUE, &key) != ERROR_SUCCESS)
-               return NULL;
+       {
+               ret = SP_ERR_FAIL;
+               goto out_done;
+       }
        if (RegQueryInfoKey(key, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                                &max_value_len, &max_data_size, NULL, NULL) != ERROR_SUCCESS)
+       {
+               ret = SP_ERR_FAIL;
                goto out_close;
+       }
        max_data_len = max_data_size / sizeof(TCHAR);
        if (!(value = malloc((max_value_len + 1) * sizeof(TCHAR))))
+       {
+               ret = SP_ERR_MEM;
                goto out_close;
+       }
        if (!(data = malloc((max_data_len + 1) * sizeof(TCHAR))))
+       {
+               ret = SP_ERR_MEM;
                goto out_free_value;
+       }
        while (
-               value_len = max_value_len,
+               value_len = max_value_len + 1,
                data_size = max_data_size,
                RegEnumValue(key, index, value, &value_len,
                        NULL, &type, (LPBYTE)data, &data_size) == ERROR_SUCCESS)
@@ -131,15 +187,20 @@ struct sp_port **sp_list_ports(void)
                name_len = data_len + 1;
 #endif
                if (!(name = malloc(name_len)))
+               {
+                       ret = SP_ERR_MEM;
                        goto out;
+               }
 #ifdef UNICODE
                WideCharToMultiByte(CP_ACP, 0, data, -1, name, name_len, NULL, NULL);
 #else
                strcpy(name, data);
 #endif
-               if (type == REG_SZ)
-                       if (!(list = sp_list_append(list, name)))
-                               goto out;
+               if (type == REG_SZ && !(list = sp_list_append(list, name)))
+               {
+                       ret = SP_ERR_MEM;
+                       goto out;
+               }
                index++;
        }
 out:
@@ -148,7 +209,7 @@ out_free_value:
        free(value);
 out_close:
        RegCloseKey(key);
-       return list;
+out_done:
 #endif
 #ifdef __APPLE__
        mach_port_t master;
@@ -160,19 +221,31 @@ out_close:
        Boolean result;
 
        if (IOMasterPort(MACH_PORT_NULL, &master) != KERN_SUCCESS)
-               return NULL;
+       {
+               ret = SP_ERR_FAIL;
+               goto out_done;
+       }
 
        if (!(classes = IOServiceMatching(kIOSerialBSDServiceValue)))
-               return NULL;
+       {
+               ret = SP_ERR_FAIL;
+               goto out_done;
+       }
 
        CFDictionarySetValue(classes,
                        CFSTR(kIOSerialBSDTypeKey), CFSTR(kIOSerialBSDAllTypes));
 
-       if (!(IOServiceGetMatchingServices(master, classes, &iter)))
-               return NULL;
+       if (IOServiceGetMatchingServices(master, classes, &iter) != KERN_SUCCESS)
+       {
+               ret = SP_ERR_FAIL;
+               goto out_done;
+       }
 
        if (!(path = malloc(PATH_MAX)))
+       {
+               ret = SP_ERR_MEM;
                goto out_release;
+       }
 
        while ((port = IOIteratorNext(iter))) {
                cf_path = IORegistryEntryCreateCFProperty(port,
@@ -181,21 +254,20 @@ out_close:
                        result = CFStringGetCString(cf_path,
                                        path, PATH_MAX, kCFStringEncodingASCII);
                        CFRelease(cf_path);
-                       if (result)
-                               if (!(list = sp_list_append(list, path)))
-                               {
-                                       IOObjectRelease(port);
-                                       goto out;
-                               }
+                       if (result && !(list = sp_list_append(list, path)))
+                       {
+                               ret = SP_ERR_MEM;
+                               IOObjectRelease(port);
+                               goto out;
+                       }
                }
                IOObjectRelease(port);
        }
-
 out:
        free(path);
 out_release:
        IOObjectRelease(iter);
-       return list;
+out_done:
 #endif
 #ifdef __linux__
        struct udev *ud;
@@ -245,23 +317,37 @@ out_release:
 skip:
                udev_device_unref(ud_dev);
                if (!list)
+               {
+                       ret = SP_ERR_MEM;
                        goto out;
+               }
        }
 out:
        udev_enumerate_unref(ud_enumerate);
        udev_unref(ud);
-       return list;
 #endif
+
+       if (ret == SP_OK)
+       {
+               *list_ptr = list;
+       }
+       else
+       {
+               if (list)
+                       sp_free_port_list(list);
+
+               *list_ptr = NULL;
+       }
+
+       return ret;
 }
 
-/**
- * Free a port list returned by sp_list_ports.
- */
 void sp_free_port_list(struct sp_port **list)
 {
        unsigned int i;
+
        for (i = 0; list[i]; i++)
-               free(list[i]);
+               sp_free_port(list[i]);
        free(list);
 }
 
@@ -281,17 +367,6 @@ static int sp_validate_port(struct sp_port *port)
 
 #define CHECK_PORT() do { if (!sp_validate_port(port)) return SP_ERR_ARG; } while (0)
 
-/**
- * Open the specified serial port.
- *
- * @param port Pointer to empty port structure allocated by caller.
- * @param portname Name of port to open.
- * @param flags Flags to use when opening the serial port. Possible flags
- *              are: SP_MODE_RDWR, SP_MODE_RDONLY, SP_MODE_NONBLOCK.
- *
- * @return SP_OK on success, SP_ERR_FAIL on failure,
- *         or SP_ERR_ARG if an invalid port or name is passed.
- */
 int sp_open(struct sp_port *port, int flags)
 {
        if (!port)
@@ -299,6 +374,13 @@ int sp_open(struct sp_port *port, int flags)
 
 #ifdef _WIN32
        DWORD desired_access = 0, flags_and_attributes = 0;
+       char *escaped_port_name;
+
+       /* Prefix port name with '\\.\' to work with ports above COM9. */
+       if (!(escaped_port_name = malloc(strlen(port->name + 5))))
+               return SP_ERR_MEM;
+       sprintf(escaped_port_name, "\\\\.\\%s", port->name);
+
        /* Map 'flags' to the OS-specific settings. */
        desired_access |= GENERIC_READ;
        flags_and_attributes = FILE_ATTRIBUTE_NORMAL;
@@ -307,12 +389,16 @@ int sp_open(struct sp_port *port, int flags)
        if (flags & SP_MODE_NONBLOCK)
                flags_and_attributes |= FILE_FLAG_OVERLAPPED;
 
-       port->hdl = CreateFile(port->name, desired_access, 0, 0,
+       port->hdl = CreateFile(escaped_port_name, desired_access, 0, 0,
                         OPEN_EXISTING, flags_and_attributes, 0);
+
+       free(escaped_port_name);
+
        if (port->hdl == INVALID_HANDLE_VALUE)
                return SP_ERR_FAIL;
 #else
        int flags_local = 0;
+
        /* Map 'flags' to the OS-specific settings. */
        if (flags & SP_MODE_RDWR)
                flags_local |= O_RDWR;
@@ -328,14 +414,6 @@ int sp_open(struct sp_port *port, int flags)
        return SP_OK;
 }
 
-/**
- * Close the specified serial port.
- *
- * @param port Pointer to port structure.
- *
- * @return SP_OK on success, SP_ERR_FAIL on failure,
- *         or SP_ERR_ARG if an invalid port is passed.
- */
 int sp_close(struct sp_port *port)
 {
        CHECK_PORT();
@@ -353,14 +431,6 @@ int sp_close(struct sp_port *port)
        return SP_OK;
 }
 
-/**
- * Flush serial port buffers.
- *
- * @param port Pointer to port structure.
- *
- * @return SP_OK on success, SP_ERR_FAIL on failure,
- *         or SP_ERR_ARG if an invalid port is passed.
- */
 int sp_flush(struct sp_port *port)
 {
        CHECK_PORT();
@@ -377,16 +447,6 @@ int sp_flush(struct sp_port *port)
        return SP_OK;
 }
 
-/**
- * Write a number of bytes to the specified serial port.
- *
- * @param port Pointer to port structure.
- * @param buf Buffer containing the bytes to write.
- * @param count Number of bytes to write.
- *
- * @return The number of bytes written, SP_ERR_FAIL on failure,
- *         or SP_ERR_ARG if an invalid port is passed.
- */
 int sp_write(struct sp_port *port, const void *buf, size_t count)
 {
        CHECK_PORT();
@@ -396,6 +456,7 @@ int sp_write(struct sp_port *port, const void *buf, size_t count)
 
 #ifdef _WIN32
        DWORD written = 0;
+
        /* Returns non-zero upon success, 0 upon failure. */
        if (WriteFile(port->hdl, buf, count, &written, NULL) == 0)
                return SP_ERR_FAIL;
@@ -403,23 +464,14 @@ int sp_write(struct sp_port *port, const void *buf, size_t count)
 #else
        /* Returns the number of bytes written, or -1 upon failure. */
        ssize_t written = write(port->fd, buf, count);
+
        if (written < 0)
                return SP_ERR_FAIL;
        else
-               return written;;
+               return written;
 #endif
 }
 
-/**
- * Read a number of bytes from the specified serial port.
- *
- * @param port Pointer to port structure.
- * @param buf Buffer where to store the bytes that are read.
- * @param count The number of bytes to read.
- *
- * @return The number of bytes read, SP_ERR_FAIL on failure,
- *         or SP_ERR_ARG if an invalid port is passed.
- */
 int sp_read(struct sp_port *port, void *buf, size_t count)
 {
        CHECK_PORT();
@@ -429,12 +481,14 @@ int sp_read(struct sp_port *port, void *buf, size_t count)
 
 #ifdef _WIN32
        DWORD bytes_read = 0;
+
        /* Returns non-zero upon success, 0 upon failure. */
        if (ReadFile(port->hdl, buf, count, &bytes_read, NULL) == 0)
                return SP_ERR_FAIL;
        return bytes_read;
 #else
        ssize_t bytes_read;
+
        /* Returns the number of bytes read, or -1 upon failure. */
        if ((bytes_read = read(port->fd, buf, count)) < 0)
                return SP_ERR_FAIL;
@@ -442,304 +496,348 @@ int sp_read(struct sp_port *port, void *buf, size_t count)
 #endif
 }
 
-/**
- * Set serial parameters for the specified serial port.
- *
- * @param port Pointer to port structure.
- * @param baudrate The baudrate to set.
- * @param bits The number of data bits to use.
- * @param parity The parity setting to use (0 = none, 1 = even, 2 = odd).
- * @param stopbits The number of stop bits to use (1 or 2).
- * @param flowcontrol The flow control settings to use (0 = none, 1 = RTS/CTS,
- *                    2 = XON/XOFF).
- *
- * @return The number of bytes read, SP_ERR_FAIL on failure,
- *         or SP_ERR_ARG if an invalid argument is passed.
- */
-int sp_set_params(struct sp_port *port, int baudrate,
-                             int bits, int parity, int stopbits,
-                             int flowcontrol, int rts, int dtr)
+static int start_config(struct sp_port *port, struct sp_port_data *data)
 {
        CHECK_PORT();
-
 #ifdef _WIN32
-       DCB dcb;
-
-       if (!GetCommState(port->hdl, &dcb))
+       if (!GetCommState(port->hdl, &data->dcb))
                return SP_ERR_FAIL;
+#else
+       if (tcgetattr(port->fd, &data->term) < 0)
+               return SP_ERR_FAIL;
+#endif
+       return SP_OK;
+}
 
+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:
-               dcb.BaudRate = CBR_110;
+               data->dcb.BaudRate = CBR_110;
                break;
        case 300:
-               dcb.BaudRate = CBR_300;
+               data->dcb.BaudRate = CBR_300;
                break;
        case 600:
-               dcb.BaudRate = CBR_600;
+               data->dcb.BaudRate = CBR_600;
                break;
        case 1200:
-               dcb.BaudRate = CBR_1200;
+               data->dcb.BaudRate = CBR_1200;
                break;
        case 2400:
-               dcb.BaudRate = CBR_2400;
+               data->dcb.BaudRate = CBR_2400;
                break;
        case 4800:
-               dcb.BaudRate = CBR_4800;
+               data->dcb.BaudRate = CBR_4800;
                break;
        case 9600:
-               dcb.BaudRate = CBR_9600;
+               data->dcb.BaudRate = CBR_9600;
                break;
        case 14400:
-               dcb.BaudRate = CBR_14400; /* Not available on Unix? */
+               data->dcb.BaudRate = CBR_14400; /* Not available on Unix? */
                break;
        case 19200:
-               dcb.BaudRate = CBR_19200;
+               data->dcb.BaudRate = CBR_19200;
                break;
        case 38400:
-               dcb.BaudRate = CBR_38400;
+               data->dcb.BaudRate = CBR_38400;
                break;
        case 57600:
-               dcb.BaudRate = CBR_57600;
+               data->dcb.BaudRate = CBR_57600;
                break;
        case 115200:
-               dcb.BaudRate = CBR_115200;
+               data->dcb.BaudRate = CBR_115200;
                break;
        case 128000:
-               dcb.BaudRate = CBR_128000; /* Not available on Unix? */
+               data->dcb.BaudRate = CBR_128000; /* Not available on Unix? */
                break;
        case 256000:
-               dcb.BaudRate = CBR_256000; /* Not available on Unix? */
+               data->dcb.BaudRate = CBR_256000; /* Not available on Unix? */
                break;
        default:
                return SP_ERR_ARG;
        }
-
-       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:
-               return SP_ERR_ARG;
-       }
-
-       switch (parity) {
-       /* Note: There's also SPACEPARITY, MARKPARITY (unneeded so far). */
-       case SP_PARITY_NONE:
-               dcb.Parity = NOPARITY;
-               break;
-       case SP_PARITY_EVEN:
-               dcb.Parity = EVENPARITY;
-               break;
-       case SP_PARITY_ODD:
-               dcb.Parity = ODDPARITY;
-               break;
-       default:
-               return SP_ERR_ARG;
-       }
-
-       if (rts != -1) {
-               if (rts)
-                       dcb.fRtsControl = RTS_CONTROL_ENABLE;
-               else
-                       dcb.fRtsControl = RTS_CONTROL_DISABLE;
-       }
-
-       if (dtr != -1) {
-               if (dtr)
-                       dcb.fDtrControl = DTR_CONTROL_ENABLE;
-               else
-                       dcb.fDtrControl = DTR_CONTROL_DISABLE;
-       }
-
-       if (!SetCommState(port->hdl, &dcb))
-               return SP_ERR_FAIL;
 #else
-       struct termios term;
-       speed_t baud;
-       int controlbits;
-
-       if (tcgetattr(port->fd, &term) < 0)
-               return SP_ERR_FAIL;
-
        switch (baudrate) {
        case 50:
-               baud = B50;
+               data->baud = B50;
                break;
        case 75:
-               baud = B75;
+               data->baud = B75;
                break;
        case 110:
-               baud = B110;
+               data->baud = B110;
                break;
        case 134:
-               baud = B134;
+               data->baud = B134;
                break;
        case 150:
-               baud = B150;
+               data->baud = B150;
                break;
        case 200:
-               baud = B200;
+               data->baud = B200;
                break;
        case 300:
-               baud = B300;
+               data->baud = B300;
                break;
        case 600:
-               baud = B600;
+               data->baud = B600;
                break;
        case 1200:
-               baud = B1200;
+               data->baud = B1200;
                break;
        case 1800:
-               baud = B1800;
+               data->baud = B1800;
                break;
        case 2400:
-               baud = B2400;
+               data->baud = B2400;
                break;
        case 4800:
-               baud = B4800;
+               data->baud = B4800;
                break;
        case 9600:
-               baud = B9600;
+               data->baud = B9600;
                break;
        case 19200:
-               baud = B19200;
+               data->baud = B19200;
                break;
        case 38400:
-               baud = B38400;
+               data->baud = B38400;
                break;
        case 57600:
-               baud = B57600;
+               data->baud = B57600;
                break;
        case 115200:
-               baud = B115200;
+               data->baud = B115200;
                break;
        case 230400:
-               baud = B230400;
+               data->baud = B230400;
                break;
 #if !defined(__APPLE__) && !defined(__OpenBSD__)
        case 460800:
-               baud = B460800;
+               data->baud = B460800;
                break;
 #endif
        default:
                return SP_ERR_ARG;
        }
+#endif
+       return SP_OK;
+}
 
-       if (cfsetospeed(&term, baud) < 0)
-               return SP_ERR_FAIL;
-
-       if (cfsetispeed(&term, baud) < 0)
-               return SP_ERR_FAIL;
-
-       term.c_cflag &= ~CSIZE;
+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:
-               term.c_cflag |= CS8;
+               data->term.c_cflag |= CS8;
                break;
        case 7:
-               term.c_cflag |= CS7;
+               data->term.c_cflag |= CS7;
+               break;
+       case 6:
+               data->term.c_cflag |= CS6;
+               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;
+               break;
+       case SP_PARITY_EVEN:
+               data->dcb.Parity = EVENPARITY;
+               break;
+       case SP_PARITY_ODD:
+               data->dcb.Parity = ODDPARITY;
                break;
        default:
                return SP_ERR_ARG;
        }
+#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;
+       }
+#endif
+       return SP_OK;
+}
 
-       term.c_cflag &= ~CSTOPB;
+static int set_stopbits(struct sp_port_data *data, int stopbits)
+{
+#ifdef _WIN32
        switch (stopbits) {
+       /* Note: There's also ONE5STOPBITS == 1.5 (unneeded so far). */
        case 1:
-               term.c_cflag &= ~CSTOPB;
+               data->dcb.StopBits = ONESTOPBIT;
                break;
        case 2:
-               term.c_cflag |= CSTOPB;
+               data->dcb.StopBits = TWOSTOPBITS;
                break;
        default:
                return SP_ERR_ARG;
        }
-
-       term.c_iflag &= ~(IXON | IXOFF | IXANY);
-       term.c_cflag &= ~CRTSCTS;
-       switch (flowcontrol) {
-       case 0:
-               /* No flow control. */
-               break;
+#else
+       data->term.c_cflag &= ~CSTOPB;
+       switch (stopbits) {
        case 1:
-               term.c_cflag |= CRTSCTS;
+               data->term.c_cflag &= ~CSTOPB;
                break;
        case 2:
-               term.c_iflag |= IXON | IXOFF | IXANY;
+               data->term.c_cflag |= CSTOPB;
                break;
        default:
                return SP_ERR_ARG;
        }
+#endif
+       return SP_OK;
+}
 
-       term.c_iflag &= ~IGNPAR;
-       term.c_cflag &= ~(PARENB | PARODD);
-       switch (parity) {
-       case SP_PARITY_NONE:
-               term.c_iflag |= IGNPAR;
+static int set_flowcontrol(struct sp_port_data *data, int flowcontrol)
+{
+#ifndef _WIN32
+       data->term.c_iflag &= ~(IXON | IXOFF | IXANY);
+       data->term.c_cflag &= ~CRTSCTS;
+       switch (flowcontrol) {
+       case 0:
+               /* No flow control. */
                break;
-       case SP_PARITY_EVEN:
-               term.c_cflag |= PARENB;
+       case 1:
+               data->term.c_cflag |= CRTSCTS;
                break;
-       case SP_PARITY_ODD:
-               term.c_cflag |= PARENB | PARODD;
+       case 2:
+               data->term.c_iflag |= IXON | IXOFF | IXANY;
                break;
        default:
                return SP_ERR_ARG;
        }
+#endif
+       return SP_OK;
+}
+
+static int set_rts(struct sp_port_data *data, int rts)
+{
+#ifdef _WIN32
+       if (rts != -1) {
+               if (rts)
+                       data->dcb.fRtsControl = RTS_CONTROL_ENABLE;
+               else
+                       data->dcb.fRtsControl = RTS_CONTROL_DISABLE;
+       }
+#else
+       data->rts = rts;
+#endif
+       return SP_OK;
+}
+
+static int set_dtr(struct sp_port_data *data, int dtr)
+{
+#ifdef _WIN32
+       if (dtr != -1) {
+               if (dtr)
+                       data->dcb.fDtrControl = DTR_CONTROL_ENABLE;
+               else
+                       data->dcb.fDtrControl = DTR_CONTROL_DISABLE;
+       }
+#else
+       data->dtr = dtr;
+#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;
 
        /* Turn off all serial port cooking. */
-       term.c_iflag &= ~(ISTRIP | INLCR | ICRNL);
-       term.c_oflag &= ~(ONLCR | OCRNL | ONOCR);
+       data->term.c_iflag &= ~(ISTRIP | INLCR | ICRNL);
+       data->term.c_oflag &= ~(ONLCR | OCRNL | ONOCR);
 #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
-       term.c_oflag &= ~OFILL;
+       data->term.c_oflag &= ~OFILL;
 #endif
-
        /* Disable canonical mode, and don't echo input characters. */
-       term.c_lflag &= ~(ICANON | ECHO);
+       data->term.c_lflag &= ~(ICANON | ECHO);
 
        /* Ignore modem status lines; enable receiver */
-       term.c_cflag |= (CLOCAL | CREAD);
+       data->term.c_cflag |= (CLOCAL | CREAD);
 
        /* Write the configured settings. */
-       if (tcsetattr(port->fd, TCSADRAIN, &term) < 0)
+       if (tcsetattr(port->fd, TCSADRAIN, &data->term) < 0)
                return SP_ERR_FAIL;
 
-       if (rts != -1) {
+       if (cfsetospeed(&data->term, data->baud) < 0)
+               return SP_ERR_FAIL;
+
+       if (cfsetispeed(&data->term, data->baud) < 0)
+               return SP_ERR_FAIL;
+
+       if (data->rts != -1) {
                controlbits = TIOCM_RTS;
-               if (ioctl(port->fd, rts ? TIOCMBIS : TIOCMBIC,
+               if (ioctl(port->fd, data->rts ? TIOCMBIS : TIOCMBIC,
                                &controlbits) < 0)
                        return SP_ERR_FAIL;
        }
 
-       if (dtr != -1) {
+       if (data->dtr != -1) {
                controlbits = TIOCM_DTR;
-               if (ioctl(port->fd, dtr ? TIOCMBIS : TIOCMBIC,
+               if (ioctl(port->fd, data->dtr ? TIOCMBIS : TIOCMBIC,
                                &controlbits) < 0)
                        return SP_ERR_FAIL;
        }
 #endif
+       return SP_OK;
+}
+
+#define TRY(x) do { int ret = x; if (ret != SP_OK) return ret; } while (0)
+
+int sp_set_config(struct sp_port *port, struct sp_port_config *config)
+{
+       struct sp_port_data data;
+
+       TRY(start_config(port, &data));
+       TRY(set_baudrate(&data, config->baudrate));
+       TRY(set_bits(&data, config->bits));
+       TRY(set_parity(&data, config->parity));
+       TRY(set_stopbits(&data, config->stopbits));
+       TRY(set_flowcontrol(&data, config->flowcontrol));
+       TRY(set_rts(&data, config->rts));
+       TRY(set_dtr(&data, config->dtr));
+       TRY(apply_config(port, &data));
 
        return SP_OK;
 }
 
-/**
- * Get error code for failed operation.
- *
- * In order to obtain the correct result, this function should be called
- * straight after the failure, before executing any other system operations.
- *
- * @return The system's numeric code for the error that caused the last
- *         operation to fail.
- */
 int sp_last_error_code(void)
 {
 #ifdef _WIN32
@@ -749,16 +847,6 @@ int sp_last_error_code(void)
 #endif
 }
 
-/**
- * Get error message for failed operation.
- *
- * In order to obtain the correct result, this function should be called
- * straight after the failure, before executing other system operations.
- *
- * @return The system's message for the error that caused the last
- *         operation to fail. This string may be allocated by the function,
- *         and can be freed after use by calling sp_free_error_message.
- */
 char *sp_last_error_message(void)
 {
 #ifdef _WIN32
@@ -781,12 +869,6 @@ char *sp_last_error_message(void)
 #endif
 }
 
-/**
- * Free error message.
- *
- * This function can be used to free a string returned by the
- * sp_last_error_message function.
- */
 void sp_free_error_message(char *message)
 {
 #ifdef _WIN32