rdtech-um: use common helper to parse conn= and serialcomm= specs

[libsigrok.git] / src / hardware / rdtech-um / api.c

diff --git a/src/hardware/rdtech-um/api.c b/src/hardware/rdtech-um/api.c
index 31c77071301f16115bb564a598d5b53a7023705d..768596a647679325c443ec4ce06f420d8ff550be 100644 (file)
--- a/src/hardware/rdtech-um/api.c
+++ b/src/hardware/rdtech-um/api.c
@@ -50,10 +50,10 @@ static GSList *rdtech_um_scan(struct sr_dev_driver *di,
        const char *conn, const char *serialcomm)
 {
        struct sr_serial_dev_inst *serial;
-       const struct rdtech_um_profile *p = NULL;
-       GSList *devices = NULL;
-       struct dev_context *devc = NULL;
-       struct sr_dev_inst *sdi = NULL;
+       const struct rdtech_um_profile *p;
+       GSList *devices;
+       struct dev_context *devc;
+       struct sr_dev_inst *sdi;
        size_t ch_idx;
        const char *name;
 
@@ -67,24 +67,23 @@ static GSList *rdtech_um_scan(struct sr_dev_driver *di,
                goto err_out_serial;
        }
 
-       devc = g_malloc0(sizeof(struct dev_context));
-       sdi = g_malloc0(sizeof(struct sr_dev_inst));
-
+       devc = g_malloc0(sizeof(*devc));
        sr_sw_limits_init(&devc->limits);
        devc->profile = p;
 
+       sdi = g_malloc0(sizeof(*sdi));
+       sdi->priv = devc;
        sdi->status = SR_ST_INACTIVE;
        sdi->vendor = g_strdup("RDTech");
        sdi->model = g_strdup(p->model_name);
        sdi->version = NULL;
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
-       sdi->priv = devc;
 
        for (ch_idx = 0; (name = p->channels[ch_idx].name); ch_idx++)
                sr_channel_new(sdi, ch_idx, SR_CHANNEL_ANALOG, TRUE, name);
 
-       devices = g_slist_append(devices, sdi);
+       devices = g_slist_append(NULL, sdi);
        serial_close(serial);
        if (!devices)
                sr_serial_dev_inst_free(serial);
@@ -101,21 +100,12 @@ err_out:
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-       struct sr_config *src;
-       const char *conn = NULL;
-       const char *serialcomm = RDTECH_UM_SERIALCOMM;
-
-       for (GSList *l = options; l; l = l->next) {
-               src = l->data;
-               switch (src->key) {
-               case SR_CONF_CONN:
-                       conn = g_variant_get_string(src->data, NULL);
-                       break;
-               case SR_CONF_SERIALCOMM:
-                       serialcomm = g_variant_get_string(src->data, NULL);
-                       break;
-               }
-       }
+       const char *conn;
+       const char *serialcomm;
+
+       conn = NULL;
+       serialcomm = RDTECH_UM_SERIALCOMM;
+       (void)sr_serial_extract_options(options, &conn, &serialcomm);
        if (!conn)
                return NULL;
 
@@ -142,16 +132,18 @@ static int config_list(uint32_t key, GVariant **data,
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
-       struct dev_context *devc = sdi->priv;
-       struct sr_serial_dev_inst *serial = sdi->conn;
+       struct dev_context *devc;
+       struct sr_serial_dev_inst *serial;
 
+       devc = sdi->priv;
        sr_sw_limits_acquisition_start(&devc->limits);
        std_session_send_df_header(sdi);
 
+       serial = sdi->conn;
        serial_source_add(sdi->session, serial, G_IO_IN, 50,
                rdtech_um_receive_data, (void *)sdi);
 
-       return rdtech_um_poll(sdi);
+       return rdtech_um_poll(sdi, TRUE);
 }
 
 static struct sr_dev_driver rdtech_um_driver_info = {