Route sr_source_remove for all serial devices through a wrapper.

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

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index 7dde05e00af35c70cd5513cda5a359a11aaf5656..af80356a3cc72a714627a272e0a420c1a22e28d0 100644 (file)
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -51,6 +51,7 @@ SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags)
 {
        int ret;
        char *error;
+       int sp_flags = 0;
 
        if (!serial) {
                sr_dbg("Invalid serial port.");
@@ -61,7 +62,14 @@ SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags)
 
        sp_get_port_by_name(serial->port, &serial->data);
 
-       ret = sp_open(serial->data, flags);
+       if (flags & SERIAL_RDWR)
+               sp_flags = (SP_MODE_READ | SP_MODE_WRITE);
+       else if (flags & SERIAL_RDONLY)
+               sp_flags = SP_MODE_READ;
+
+       serial->nonblocking = (flags & SERIAL_NONBLOCK) ? 1 : 0;
+
+       ret = sp_open(serial->data, sp_flags);
 
        switch (ret) {
        case SP_ERR_ARG:
@@ -75,7 +83,7 @@ SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags)
        }
 
 #ifndef _WIN32
-       serial->fd = serial->data->fd;
+       sp_get_port_handle(serial->data, &serial->fd);
 #endif
 
        if (serial->serialcomm)
@@ -110,6 +118,7 @@ SR_PRIV int serial_close(struct sr_serial_dev_inst *serial)
        sr_spew("Closing serial port %s (fd %d).", serial->port, serial->fd);
 
        ret = sp_close(serial->data);
+       sp_free_port(serial->data);
 
        switch (ret) {
        case SP_ERR_ARG:
@@ -152,7 +161,7 @@ SR_PRIV int serial_flush(struct sr_serial_dev_inst *serial)
 
        sr_spew("Flushing serial port %s (fd %d).", serial->port, serial->fd);
 
-       ret = sp_flush(serial->data);
+       ret = sp_flush(serial->data, SP_BUF_BOTH);
 
        switch (ret) {
        case SP_ERR_ARG:
@@ -194,7 +203,10 @@ SR_PRIV int serial_write(struct sr_serial_dev_inst *serial,
                return SR_ERR;
        }
 
-       ret = sp_write(serial->data, buf, count);
+       if (serial->nonblocking)
+               ret = sp_nonblocking_write(serial->data, buf, count);
+       else
+               ret = sp_blocking_write(serial->data, buf, count, 0);
 
        switch (ret) {
        case SP_ERR_ARG:
@@ -238,21 +250,24 @@ SR_PRIV int serial_read(struct sr_serial_dev_inst *serial, void *buf,
                return SR_ERR;
        }
 
-       ret = sp_read(serial->data, buf, count);
+       if (serial->nonblocking)
+               ret = sp_nonblocking_read(serial->data, buf, count);
+       else
+               ret = sp_blocking_read(serial->data, buf, count, 0);
 
        switch (ret) {
        case SP_ERR_ARG:
                sr_err("Attempted serial port read with invalid arguments.");
                return SR_ERR_ARG;
-       // Temporarily disabled, will come back later.
-       // case SP_ERR_FAIL:
-       //      error = sp_last_error_message();
-       //      sr_err("Read error: %s.", error);
-       //      sp_free_error_message(error);
-       //      return SR_ERR;
+       case SP_ERR_FAIL:
+               error = sp_last_error_message();
+               sr_err("Read error: %s.", error);
+               sp_free_error_message(error);
+               return SR_ERR;
        }
 
-       sr_spew("Read %d/%d bytes (fd %d).", ret, count, serial->fd);
+       if (ret > 0)
+               sr_spew("Read %d/%d bytes (fd %d).", ret, count, serial->fd);
 
        return ret;
 }
@@ -276,6 +291,7 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
 {
        int ret;
        char *error;
+       struct sp_port_config *config;
 
        if (!serial) {
                sr_dbg("Invalid serial port.");
@@ -291,8 +307,31 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
        sr_spew("Setting serial parameters on port %s (fd %d).", serial->port,
                serial->fd);
 
-       ret = sp_set_params(serial->data, baudrate, bits, parity, stopbits,
-                       flowcontrol, rts, dtr);
+       sp_new_config(&config);
+       sp_set_config_baudrate(config, baudrate);
+       sp_set_config_bits(config, bits);
+       switch (parity) {
+       case 0:
+               sp_set_config_parity(config, SP_PARITY_NONE);
+               break;
+       case 1:
+               sp_set_config_parity(config, SP_PARITY_EVEN);
+               break;
+       case 2:
+               sp_set_config_parity(config, SP_PARITY_ODD);
+               break;
+       default:
+               return SR_ERR_ARG;
+       }
+       sp_set_config_stopbits(config, stopbits);
+       sp_set_config_rts(config, flowcontrol == 1 ? SP_RTS_FLOW_CONTROL : rts);
+       sp_set_config_cts(config, flowcontrol == 1 ? SP_CTS_FLOW_CONTROL : SP_CTS_IGNORE);
+       sp_set_config_dtr(config, dtr);
+       sp_set_config_dsr(config, SP_DSR_IGNORE);
+       sp_set_config_xon_xoff(config, flowcontrol == 2 ? SP_XONXOFF_INOUT : SP_XONXOFF_DISABLED);
+
+       ret = sp_set_config(serial->data, config);
+       sp_free_config(config);
 
        switch (ret) {
        case SP_ERR_ARG:
@@ -318,7 +357,7 @@ SR_PRIV int serial_set_params(struct sr_serial_dev_inst *serial, int baudrate,
  *
  * @return SR_OK upon success, SR_ERR upon failure.
  */
-#define SERIAL_COMM_SPEC "^(\\d+)/([78])([neo])([12])(.*)$"
+#define SERIAL_COMM_SPEC "^(\\d+)/([5678])([neo])([12])(.*)$"
 SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial,
                const char *paramstr)
 {
@@ -557,3 +596,56 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial,
 
        return SR_ERR;
 }
+
+/**
+ * Extract the serial device and options from the options linked list.
+ *
+ * @param options List of options passed from the command line.
+ * @param serial_device Pointer where to store the exctracted serial device.
+ * @param serial_options Pointer where to store the optional extracted serial
+ * options.
+ *
+ * @return SR_OK if a serial_device is found, SR_ERR if no device is found. The
+ * returned string should not be freed by the caller.
+ */
+SR_PRIV int sr_serial_extract_options(GSList *options, const char **serial_device,
+                                     const char **serial_options)
+{
+       GSList *l;
+       struct sr_config *src;
+
+       *serial_device = NULL;
+
+       for (l = options; l; l = l->next) {
+               src = l->data;
+               switch (src->key) {
+               case SR_CONF_CONN:
+                       *serial_device = g_variant_get_string(src->data, NULL);
+                       sr_dbg("Parsed serial device: %s", *serial_device);
+                       break;
+
+               case SR_CONF_SERIALCOMM:
+                       *serial_options = g_variant_get_string(src->data, NULL);
+                       sr_dbg("Parsed serial options: %s", *serial_options);
+                       break;
+               }
+       }
+
+       if (!*serial_device) {
+               sr_dbg("No serial device specified");
+               return SR_ERR;
+       }
+
+       return SR_OK;
+}
+
+SR_PRIV int serial_source_add(struct sr_serial_dev_inst *serial, int events,
+               int timeout, sr_receive_data_callback_t cb, void *cb_data)
+{
+       return sr_source_add(serial->fd, events, timeout, cb, cb_data);
+}
+
+SR_PRIV int serial_source_remove(struct sr_serial_dev_inst *serial)
+{
+       return sr_source_remove(serial->fd);
+}