serial: flush() after open() in the serial core.

[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 76184fb2815966ea32cb36517b57ae2b5635d68c..e4a1fb6b9859d141e0074e8bdb2f430969fdb4ec 100644 (file)
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -378,7 +378,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;
 
@@ -441,7 +440,7 @@ 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);
+               snprintf(channel, sizeof(channel), "CG%d", cnt + 1);
                cg->name = g_strdup(channel);
                cg->priv = NULL;
                cg->channels = g_slist_append(NULL, ch);
@@ -612,7 +611,6 @@ static int config_set(uint32_t key, GVariant *data,
                                return SR_ERR_NA;
                        devc->channel_status[ch_idx].output_current_max = dval;
                        return lps_cmd_ok(sdi->conn, "ISET%d %05.4f", ch_idx+1, dval);
-                       break;
                case SR_CONF_ENABLED:
                        bval = g_variant_get_boolean(data);
                        if (bval == devc->channel_status[ch_idx].output_enabled) /* Nothing to do. */
@@ -651,6 +649,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);
@@ -676,9 +676,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: