add USBTMC device search helper

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

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index a18ad0b494073962f1bc7fb182b4e1c95db3b2e3..6cf43f987f6bdec63d9d4f86824f5f95d955c88e 100644 (file)
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -278,14 +278,6 @@ SR_PRIV int serial_read(struct sr_serial_dev_inst *serial, void *buf,
 #else
        /* Returns the number of bytes read, or -1 upon failure. */
        ret = read(serial->fd, buf, count);
-       if (ret < 0)
-               /*
-                * Should be sr_err(), but that would yield lots of
-                * "Resource temporarily unavailable" messages.
-                */
-               sr_spew("Read error: %s (fd %d).", strerror(errno), serial->fd);
-       else
-               sr_spew("Read %d/%d bytes (fd %d).", ret, count, serial->fd);
 #endif
 
        return ret;
@@ -655,6 +647,7 @@ SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial,
 
        speed = databits = parity = stopbits = 0;
        rts = dtr = -1;
+       sr_spew("Parsing parameters from \"%s\".", paramstr);
        reg = g_regex_new(SERIAL_COMM_SPEC, 0, 0, NULL);
        if (g_regex_match(reg, paramstr, 0, &match)) {
                if ((mstr = g_match_info_fetch(match, 1)))
@@ -718,11 +711,13 @@ SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial,
        g_match_info_unref(match);
        g_regex_unref(reg);
 
-       if (speed)
-               return serial_set_params(serial, speed, databits, parity, stopbits,
-                               0, rts, dtr);
-       else
+       if (speed) {
+               return serial_set_params(serial, speed, databits, parity,
+                                        stopbits, 0, rts, dtr);
+       } else {
+               sr_dbg("Could not infer speed from parameter string.");
                return SR_ERR_ARG;
+       }
 }
 
 /**
@@ -831,7 +826,7 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial,
                if (len > 0) {
                        ibuf += len;
                } else if (len == 0) {
-                       sr_spew("Error: Only read 0 bytes.");
+                       /* No logging, already done in serial_read(). */
                } else {
                        /* Error reading byte, but continuing anyway. */
                }