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

[libsigrok.git] / src / hardware / motech-lps-30x / api.c

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index 0c5817897499d3de0121d5260ac69e06d6e0cf4f..b29346ca1cbcab166b6e37d6210ed08b11bec310 100644 (file)
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -363,13 +363,12 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o
 
        sdi = NULL;
        devc = NULL;
-       conn = serialcomm = NULL;
 
        /* Process and check options. */
+       conn = NULL;
+       serialcomm = SERIALCOMM;
        if (sr_serial_extract_options(options, &conn, &serialcomm) != SR_OK)
                return NULL;
-       if (!serialcomm)
-               serialcomm = SERIALCOMM;
 
        /* Init serial port. */
        serial = sr_serial_dev_inst_new(conn, serialcomm);
@@ -378,7 +377,6 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o
                goto exit_err;
 
        /* Query and verify model string. */
-       serial_flush(serial);
        if (lps_cmd_reply(buf, serial, "MODEL") != SR_OK)
                return NULL;
 
@@ -440,13 +438,9 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o
 
                devc->channel_status[cnt].info = g_slist_append(NULL, ch);
 
-               cg = g_malloc(sizeof(struct sr_channel_group));
-               snprintf(channel, sizeof(channel), "CG%d", cnt+1);
-               cg->name = g_strdup(channel);
-               cg->priv = NULL;
+               snprintf(channel, sizeof(channel), "CG%d", cnt + 1);
+               cg = sr_channel_group_new(sdi, channel, NULL);
                cg->channels = g_slist_append(NULL, ch);
-
-               sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
        }
 
        /* Query status */
@@ -650,6 +644,8 @@ static int config_list(uint32_t key, GVariant **data,
                case SR_CONF_DEVICE_OPTIONS:
                        return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
                case SR_CONF_CHANNEL_CONFIG:
+                       if (!devc || !devc->model)
+                               return SR_ERR_ARG;
                        if (devc->model->modelid <= LPS_303) {
                                /* The 1-channel models. */
                                *data = g_variant_new_strv(channel_modes, 1);
@@ -675,9 +671,13 @@ static int config_list(uint32_t key, GVariant **data,
                        *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_ch3));
                break;
        case SR_CONF_VOLTAGE_TARGET:
+               if (!devc || !devc->model)
+                       return SR_ERR_ARG;
                *data = std_gvar_min_max_step_array(devc->model->channels[ch_idx].voltage);
                break;
        case SR_CONF_CURRENT_LIMIT:
+               if (!devc || !devc->model)
+                       return SR_ERR_ARG;
                *data = std_gvar_min_max_step_array(devc->model->channels[ch_idx].current);
                break;
        default: