Simplify channel creation.

[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..bb903d2f7c98ae2d5b6bb5c1bab9eec9c4f8f9ee 100644 (file)
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -69,16 +69,14 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
        struct sr_dev_inst *sdi;
        struct drv_context *drvc;
        struct dev_context *devc;
-       struct sr_channel *ch;
        struct sr_serial_dev_inst *serial;
        GSList *devices;
        int retry, len, i, s;
        char buf[128], *b, **tokens;
 
-       if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-               return NULL;
+       serial = sr_serial_dev_inst_new(conn, serialcomm);
 
-       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 +88,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,21 +120,18 @@ 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;
-                               if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-                                       sr_err("Device context malloc failed.");
-                                       return NULL;
-                               }
+                               sdi = g_malloc0(sizeof(struct sr_dev_inst));
+                               sdi->status = SR_ST_INACTIVE;
+                               sdi->vendor = g_strdup("Fluke");
+                               sdi->model = g_strdup(tokens[0] + 6);
+                               sdi->version = g_strdup(tokens[1] + s);
+                               devc = g_malloc0(sizeof(struct dev_context));
                                devc->profile = &supported_flukedmm[i];
                                sdi->inst_type = SR_INST_SERIAL;
                                sdi->conn = serial;
                                sdi->priv = devc;
                                sdi->driver = di;
-                               if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
-                                       return NULL;
-                               sdi->channels = g_slist_append(sdi->channels, ch);
+                               sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
                                drvc->instances = g_slist_append(drvc->instances, sdi);
                                devices = g_slist_append(devices, sdi);
                                break;
@@ -177,6 +171,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 +281,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;