X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmotech-lps-30x%2Fapi.c;h=76184fb2815966ea32cb36517b57ae2b5635d68c;hb=697fb6ddfc2522b2e6d35511c7837e2c61d8ae73;hp=6164e4ace3cc3bcf2f3d136e0a459ed0128d9565;hpb=ca314e060f653e6a0b5ec0f58914bac4d426217f;p=libsigrok.git diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c index 6164e4ac..76184fb2 100644 --- a/src/hardware/motech-lps-30x/api.c +++ b/src/hardware/motech-lps-30x/api.c @@ -32,8 +32,6 @@ SR_PRIV int lps_query_status(struct sr_dev_inst *sdi); #define SERIALCOMM "2400/8n1/dtr=1/rts=1/flow=0" -#define VENDOR_MOTECH "Motech" - static const uint32_t scanopts[] = { SR_CONF_CONN, SR_CONF_SERIALCOMM, @@ -51,7 +49,7 @@ static const uint32_t devopts[] = { }; /** Hardware capabilities channel 1, 2. */ -static const uint32_t devopts_ch12[] = { +static const uint32_t devopts_cg_ch12[] = { SR_CONF_VOLTAGE | SR_CONF_GET, SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_CURRENT | SR_CONF_GET, @@ -60,7 +58,7 @@ static const uint32_t devopts_ch12[] = { }; /** Hardware capabilities channel 3 (LPS-304/305 only). */ -static const uint32_t devopts_ch3[] = { +static const uint32_t devopts_cg_ch3[] = { SR_CONF_VOLTAGE | SR_CONF_GET, SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET, }; @@ -423,7 +421,7 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi->status = SR_ST_INACTIVE; - sdi->vendor = g_strdup(VENDOR_MOTECH); + sdi->vendor = g_strdup("Motech"); sdi->model = g_strdup(models[modelid].modelstr); sdi->version = g_strdup(verstr); sdi->inst_type = SR_INST_SERIAL; @@ -491,8 +489,8 @@ static int dev_clear(const struct sr_dev_driver *di) return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper); } -static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_get(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; struct sr_channel *ch; @@ -543,17 +541,15 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s return SR_OK; } -static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_set(uint32_t key, GVariant *data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; struct sr_channel *ch; gdouble dval; int ch_idx; - const char *sval; gboolean bval; int idx; - gboolean found; devc = sdi->priv; @@ -568,22 +564,15 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd case SR_CONF_LIMIT_SAMPLES: return sr_sw_limits_config_set(&devc->limits, key, data); case SR_CONF_CHANNEL_CONFIG: - sval = g_variant_get_string(data, NULL); - found = FALSE; - for (idx = 0; idx < (int)ARRAY_SIZE(channel_modes); idx++) { - if (!strcmp(sval, channel_modes[idx])) { - found = TRUE; - if (devc->tracking_mode == idx) - break; /* Nothing to do! */ - devc->tracking_mode = idx; - if (devc->model->modelid >= LPS_304) /* No use to set anything in the smaller models. */ - return lps_cmd_ok(sdi->conn, "TRACK%1d", devc->tracking_mode); - } - if (devc->model->modelid <= LPS_303) /* Only first setting possible for smaller models. */ - break; - } - if (!found) + if ((idx = std_str_idx(data, ARRAY_AND_SIZE(channel_modes))) < 0) return SR_ERR_ARG; + if (devc->model->modelid <= LPS_303 && idx != 0) + break; /* Only first setting possible for smaller models. */ + if (devc->tracking_mode == idx) + break; /* Nothing to do! */ + devc->tracking_mode = idx; + if (devc->model->modelid >= LPS_304) /* No use to set anything in the smaller models. */ + return lps_cmd_ok(sdi->conn, "TRACK%1d", devc->tracking_mode); break; default: return SR_ERR_NA; @@ -647,14 +636,12 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd return SR_OK; } -static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_list(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; struct sr_channel *ch; - int ch_idx, i; - GVariant *gvar; - GVariantBuilder gvb; + int ch_idx; devc = (sdi) ? sdi->priv : NULL; @@ -669,7 +656,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * *data = g_variant_new_strv(channel_modes, 1); } else { /* The other models support all modes. */ - *data = g_variant_new_strv(channel_modes, ARRAY_SIZE(channel_modes)); + *data = g_variant_new_strv(ARRAY_AND_SIZE(channel_modes)); } return SR_OK; default: @@ -684,29 +671,15 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * switch (key) { case SR_CONF_DEVICE_OPTIONS: if ((ch_idx == 0) || (ch_idx == 1)) /* CH1, CH2 */ - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts_ch12, ARRAY_SIZE(devopts_ch12), sizeof(uint32_t)); + *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_ch12)); else /* Must be CH3 */ - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts_ch3, ARRAY_SIZE(devopts_ch3), sizeof(uint32_t)); + *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_ch3)); break; case SR_CONF_VOLTAGE_TARGET: - g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - /* Min, max, step. */ - for (i = 0; i < 3; i++) { - gvar = g_variant_new_double(devc->model->channels[ch_idx].voltage[i]); - g_variant_builder_add_value(&gvb, gvar); - } - *data = g_variant_builder_end(&gvb); + *data = std_gvar_min_max_step_array(devc->model->channels[ch_idx].voltage); break; case SR_CONF_CURRENT_LIMIT: - g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - /* Min, max, step. */ - for (i = 0; i < 3; i++) { - gvar = g_variant_new_double(devc->model->channels[ch_idx].current[i]); - g_variant_builder_add_value(&gvb, gvar); - } - *data = g_variant_builder_end(&gvb); + *data = std_gvar_min_max_step_array(devc->model->channels[ch_idx].current); break; default: return SR_ERR_NA;