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 b2515a3426a695b589c67f2c0cecf364590fa0b1..af80356a3cc72a714627a272e0a420c1a22e28d0 100644 (file)
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -66,8 +66,8 @@ SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags)
                sp_flags = (SP_MODE_READ | SP_MODE_WRITE);
        else if (flags & SERIAL_RDONLY)
                sp_flags = SP_MODE_READ;
-       if (flags & SERIAL_NONBLOCK)
-               sp_flags |= SP_MODE_NONBLOCK;
+
+       serial->nonblocking = (flags & SERIAL_NONBLOCK) ? 1 : 0;
 
        ret = sp_open(serial->data, sp_flags);
 
@@ -203,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:
@@ -234,7 +237,7 @@ SR_PRIV int serial_read(struct sr_serial_dev_inst *serial, void *buf,
                size_t count)
 {
        ssize_t ret;
-       //char *error;
+       char *error;
 
        if (!serial) {
                sr_dbg("Invalid serial port.");
@@ -247,21 +250,23 @@ 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;
        }
 
-       if (ret >= 0)
+       if (ret > 0)
                sr_spew("Read %d/%d bytes (fd %d).", ret, count, serial->fd);
 
        return ret;
@@ -591,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);
+}