set_config(): Add missing CS5 handling.

[libserialport.git] / serialport.c

diff --git a/serialport.c b/serialport.c
index 7f452db3dbefd5325a8562ab64fb4bc5cc903e9e..fc286cd0912d59e2b7317531043b02f9514f6fc0 100644 (file)
--- a/serialport.c
+++ b/serialport.c
@@ -46,7 +46,7 @@
 
 #include "libserialport.h"
 
-struct sp_port_data {
+struct port_data {
 #ifdef _WIN32
        DCB dcb;
 #else
@@ -91,11 +91,15 @@ const struct std_baudrate std_baudrates[] = {
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 #define NUM_STD_BAUDRATES ARRAY_SIZE(std_baudrates)
 
-/* Helper functions for configuring ports. */
-static int get_config(struct sp_port *port, struct sp_port_data *data, struct sp_port_config *config);
-static int set_config(struct sp_port *port, struct sp_port_data *data, struct sp_port_config *config);
+/* 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);
 
-int sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
+enum sp_return sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
 {
        struct sp_port *port;
        int len;
@@ -132,7 +136,7 @@ int sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
        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;
@@ -156,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;
@@ -175,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;
@@ -240,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;
@@ -298,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);
@@ -357,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)
@@ -395,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;
@@ -409,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;
@@ -442,7 +446,7 @@ 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;
 
@@ -489,7 +493,7 @@ int sp_open(struct sp_port *port, int flags)
        return SP_OK;
 }
 
-int sp_close(struct sp_port *port)
+enum sp_return sp_close(struct sp_port *port)
 {
        CHECK_PORT();
 
@@ -508,7 +512,7 @@ int sp_close(struct sp_port *port)
        return SP_OK;
 }
 
-int sp_flush(struct sp_port *port)
+enum sp_return sp_flush(struct sp_port *port)
 {
        CHECK_PORT();
 
@@ -524,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();
 
@@ -549,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();
 
@@ -573,7 +577,8 @@ int sp_read(struct sp_port *port, void *buf, size_t count)
 #endif
 }
 
-static int get_config(struct sp_port *port, struct sp_port_data *data, struct sp_port_config *config)
+static enum sp_return get_config(struct sp_port *port, struct port_data *data,
+       struct sp_port_config *config)
 {
        unsigned int i;
 
@@ -724,7 +729,8 @@ static int get_config(struct sp_port *port, struct sp_port_data *data, struct sp
        return SP_OK;
 }
 
-static int set_config(struct sp_port *port, struct sp_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)
 {
        unsigned int i;
 
@@ -891,6 +897,9 @@ static int set_config(struct sp_port *port, struct sp_port_data *data, struct sp
                case 6:
                        data->term.c_cflag |= CS6;
                        break;
+               case 5:
+                       data->term.c_cflag |= CS5;
+                       break;
                default:
                        return SP_ERR_ARG;
                }
@@ -1003,41 +1012,49 @@ static int set_config(struct sp_port *port, struct sp_port_data *data, struct sp
 
 #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)
+enum sp_return sp_set_config(struct sp_port *port, const struct sp_port_config *config)
 {
-       struct sp_port_data 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; \
+#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)
-
-int sp_set_flowcontrol(struct sp_port *port, int flowcontrol)
+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 sp_port_data data;
+       struct port_data data;
        struct sp_port_config config;
 
+       CHECK_PORT();
+
        TRY(get_config(port, &data, &config));
 
        if (flowcontrol == SP_FLOWCONTROL_XONXOFF)