output/csv: use intermediate time_t var, silence compiler warning

[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 5cef7758314bda6cc5f56702e326874a5dbf5753..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,9 +146,7 @@ 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);
@@ -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);
@@ -351,7 +343,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        g_mutex_clear(&devc->acquisition_mutex);
 
        return ret;
-
 }
 
 static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {