Change sr_dev_inst_new() to take no parameters.

[libsigrok.git] / src / hardware / fluke-dmm / api.c

diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index 9c5d4b559536a607b880f45788f3c6b8daf28fef..b7638fa2b18b6f355590489dcefcf2cd978fc755 100644 (file)
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -78,7 +78,7 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
        if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
                return NULL;
 
-       if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+       if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
 
        drvc = di->priv;
@@ -90,9 +90,8 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
        while (!devices && retry < 3) {
                retry++;
                serial_flush(serial);
-               if (serial_write(serial, "ID\r", 3) == -1) {
-                       sr_err("Unable to send ID string: %s.",
-                              strerror(errno));
+               if (serial_write_blocking(serial, "ID\r", 3, SERIAL_WRITE_TIMEOUT_MS) < 0) {
+                       sr_err("Unable to send ID string");
                        continue;
                }
 
@@ -123,9 +122,11 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
                                        continue;
                                /* Skip leading spaces in version number. */
                                for (s = 0; tokens[1][s] == ' '; s++);
-                               if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "Fluke",
-                                               tokens[0] + 6, tokens[1] + s)))
-                                       return NULL;
+                               sdi = sr_dev_inst_new();
+                               sdi->status = SR_ST_INACTIVE;
+                               sdi->vendor = g_strdup("Fluke");
+                               sdi->model = g_strdup(tokens[0] + 6);
+                               sdi->version = g_strdup(tokens[1] + s);
                                if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
                                        sr_err("Device context malloc failed.");
                                        return NULL;
@@ -177,6 +178,7 @@ static GSList *scan(GSList *options)
        if (!conn)
                return NULL;
 
+       devices = NULL;
        if (serialcomm) {
                /* Use the provided comm specs. */
                devices = fluke_scan(conn, serialcomm);
@@ -286,8 +288,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        serial_source_add(sdi->session, serial, G_IO_IN, 50,
                        fluke_receive_data, (void *)sdi);
 
-       if (serial_write(serial, "QM\r", 3) == -1) {
-               sr_err("Unable to send QM: %s.", strerror(errno));
+       if (serial_write_blocking(serial, "QM\r", 3, SERIAL_WRITE_TIMEOUT_MS) < 0) {
+               sr_err("Unable to send QM.");
                return SR_ERR;
        }
        devc->cmd_sent_at = g_get_monotonic_time() / 1000;