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

[libsigrok.git] / src / hardware / maynuo-m97 / api.c

diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index 1ae2adeda381b7e66c9862968ed3719c49b4280c..20a922fa215177a139587c94121693ec6bac45a0 100644 (file)
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -140,14 +140,12 @@ static struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus)
        sdi->status = SR_ST_INACTIVE;
        sdi->vendor = g_strdup("Maynuo");
        sdi->model = g_strdup(model->name);
-       sdi->version = g_strdup_printf("v%d.%d", version/10, version%10);
+       sdi->version = g_strdup_printf("v%d.%d", version / 10, version % 10);
        sdi->conn = modbus;
        sdi->driver = &maynuo_m97_driver_info;
        sdi->inst_type = SR_INST_MODBUS;
 
-       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, "V1");
        cg->channels = g_slist_append(cg->channels, ch);
@@ -321,39 +319,31 @@ static int config_set(uint32_t key, GVariant *data,
 {
        struct dev_context *devc;
        struct sr_modbus_dev_inst *modbus;
-       int ret;
 
        (void)cg;
 
        modbus = sdi->conn;
        devc = sdi->priv;
 
-       ret = SR_OK;
        switch (key) {
        case SR_CONF_LIMIT_SAMPLES:
        case SR_CONF_LIMIT_MSEC:
-               ret = sr_sw_limits_config_set(&devc->limits, key, data);
-               break;
+               return sr_sw_limits_config_set(&devc->limits, key, data);
        case SR_CONF_ENABLED:
-               ret = maynuo_m97_set_input(modbus, g_variant_get_boolean(data));
-               break;
+               return maynuo_m97_set_input(modbus, g_variant_get_boolean(data));
        case SR_CONF_VOLTAGE_TARGET:
-               ret = maynuo_m97_set_float(modbus, UFIX, g_variant_get_double(data));
-               break;
+               return maynuo_m97_set_float(modbus, UFIX, g_variant_get_double(data));
        case SR_CONF_CURRENT_LIMIT:
-               ret = maynuo_m97_set_float(modbus, IFIX, g_variant_get_double(data));
-               break;
+               return maynuo_m97_set_float(modbus, IFIX, g_variant_get_double(data));
        case SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD:
-               ret = maynuo_m97_set_float(modbus, UMAX, g_variant_get_double(data));
-               break;
+               return maynuo_m97_set_float(modbus, UMAX, g_variant_get_double(data));
        case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD:
-               ret = maynuo_m97_set_float(modbus, IMAX, g_variant_get_double(data));
-               break;
+               return maynuo_m97_set_float(modbus, IMAX, g_variant_get_double(data));
        default:
-               ret = SR_ERR_NA;
+               return SR_ERR_NA;
        }
 
-       return ret;
+       return SR_OK;
 }
 
 static int config_list(uint32_t key, GVariant **data,
@@ -371,9 +361,13 @@ static int config_list(uint32_t key, GVariant **data,
                        *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
                        break;
                case SR_CONF_VOLTAGE_TARGET:
+                       if (!devc || !devc->model)
+                               return SR_ERR_ARG;
                        *data = std_gvar_min_max_step(0.0, devc->model->max_voltage, 0.001);
                        break;
                case SR_CONF_CURRENT_LIMIT:
+                       if (!devc || !devc->model)
+                               return SR_ERR_ARG;
                        *data = std_gvar_min_max_step(0.0, devc->model->max_current, 0.0001);
                        break;
                default: