use common channel group allocation/release code

[libsigrok.git] / src / hardware / arachnid-labs-re-load-pro / api.c

diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c
index a0e99dee6d11394c41ec9b0110f9bc8e91423b30..c14c20d400d05db58c3c55b32680f91893666b8e 100644 (file)
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -99,8 +99,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
 
-       serial_flush(serial);
-
        /*
         * First stop potentially running monitoring and wait for 50ms before
         * next command can be sent.
@@ -148,14 +146,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
 
-       cg = g_malloc0(sizeof(struct sr_channel_group));
-       cg->name = g_strdup("1");
-       sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
+       cg = sr_channel_group_new(sdi, "1", NULL);
 
        ch = sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "V");
        cg->channels = g_slist_append(cg->channels, ch);
 
-       ch = sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "I");
+       ch = sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "I");
        cg->channels = g_slist_append(cg->channels, ch);
 
        devc = g_malloc0(sizeof(struct dev_context));
@@ -247,12 +243,8 @@ static int config_get(uint32_t key, GVariant **data,
                *data = g_variant_new_boolean(devc->otp_active);
                break;
        case SR_CONF_UNDER_VOLTAGE_CONDITION:
-               if (reloadpro_get_under_voltage_threshold(sdi, &fvalue) == SR_OK) {
-                       if (fvalue == .0)
-                               *data = g_variant_new_boolean(FALSE);
-                       else
-                               *data = g_variant_new_boolean(TRUE);
-               }
+               if (reloadpro_get_under_voltage_threshold(sdi, &fvalue) == SR_OK)
+                       *data = g_variant_new_boolean(fvalue != 0.0);
                break;
        case SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE:
                *data = g_variant_new_boolean(devc->uvc_active);
@@ -325,26 +317,32 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                return SR_ERR;
        }
 
-       serial_source_add(sdi->session, serial, G_IO_IN, 100,
-                         reloadpro_receive_data, (void *)sdi);
-
        sr_sw_limits_acquisition_start(&devc->limits);
        std_session_send_df_header(sdi);
 
        memset(devc->buf, 0, RELOADPRO_BUFSIZE);
        devc->buflen = 0;
 
+       g_mutex_init(&devc->acquisition_mutex);
+
+       serial_source_add(sdi->session, serial, G_IO_IN, 100,
+                         reloadpro_receive_data, (void *)sdi);
+
        return SR_OK;
 }
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
+       int ret;
 
        devc = sdi->priv;
        devc->acquisition_running = FALSE;
 
-       return std_serial_dev_acquisition_stop(sdi);
+       ret = std_serial_dev_acquisition_stop(sdi);
+       g_mutex_clear(&devc->acquisition_mutex);
+
+       return ret;
 }
 
 static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {