X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Flecroy-xstream%2Fapi.c;h=d1040b19450564c627375ddd05b66b05cf8e4079;hb=efad7cccec8ab00043939b36de950ba2ced15f85;hp=281a3871bf0050d74414fdc381770bf63d7bb15d;hpb=e66d1892d0dd16ed166fc8f13493f95de0607362;p=libsigrok.git

diff --git a/src/hardware/lecroy-xstream/api.c b/src/hardware/lecroy-xstream/api.c
index 281a3871..d1040b19 100644
--- a/src/hardware/lecroy-xstream/api.c
+++ b/src/hardware/lecroy-xstream/api.c
@@ -46,23 +46,12 @@ static const uint32_t devopts[] = {
 	SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
-static const uint32_t analog_devopts[] = {
+static const uint32_t devopts_cg_analog[] = {
 	SR_CONF_NUM_VDIV | SR_CONF_GET,
 	SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 	SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
-static int check_manufacturer(const char *manufacturer)
-{
-	unsigned int i;
-
-	for (i = 0; i < ARRAY_SIZE(manufacturers); i++)
-		if (!strcmp(manufacturer, manufacturers[i]))
-			return SR_OK;
-
-	return SR_ERR;
-}
-
 static struct sr_dev_inst *probe_serial_device(struct sr_scpi_dev_inst *scpi)
 {
 	struct sr_dev_inst *sdi;
@@ -78,7 +67,7 @@ static struct sr_dev_inst *probe_serial_device(struct sr_scpi_dev_inst *scpi)
 		goto fail;
 	}
 
-	if (check_manufacturer(hw_info->manufacturer) != SR_OK)
+	if (std_str_idx_s(hw_info->manufacturer, ARRAY_AND_SIZE(manufacturers)) < 0)
 		goto fail;
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
@@ -213,25 +202,6 @@ static int config_get(uint32_t key, GVariant **data,
 	return SR_OK;
 }
 
-static GVariant *build_tuples(const struct sr_rational *array, unsigned int n)
-{
-	unsigned int i;
-	GVariant *rational[2];
-	GVariantBuilder gvb;
-
-	g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-
-	for (i = 0; i < n; i++) {
-		rational[0] = g_variant_new_uint64(array[i].p);
-		rational[1] = g_variant_new_uint64(array[i].q);
-
-		/* FIXME: Valgrind reports a memory leak here. */
-		g_variant_builder_add_value(&gvb, g_variant_new_tuple(rational, 2));
-	}
-
-	return g_variant_builder_end(&gvb);
-}
-
 static int config_set(uint32_t key, GVariant *data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
@@ -400,9 +370,7 @@ static int config_list(uint32_t key, GVariant **data,
 	case SR_CONF_DEVICE_OPTIONS:
 		if (!cg)
 			return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-			analog_devopts, ARRAY_SIZE(analog_devopts),
-			sizeof(uint32_t));
+		*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog));
 		break;
 	case SR_CONF_COUPLING:
 		*data = g_variant_new_strv(*model->coupling_options,
@@ -423,16 +391,17 @@ static int config_list(uint32_t key, GVariant **data,
 	case SR_CONF_TIMEBASE:
 		if (!model)
 			return SR_ERR_ARG;
-		*data = build_tuples(model->timebases, model->num_timebases);
+		*data = std_gvar_tuple_rational(model->timebases, model->num_timebases);
 		break;
 	case SR_CONF_VDIV:
 		if (!model)
 			return SR_ERR_ARG;
-		*data = build_tuples(model->vdivs, model->num_vdivs);
+		*data = std_gvar_tuple_rational(model->vdivs, model->num_vdivs);
 		break;
 	default:
 		return SR_ERR_NA;
 	}
+
 	return SR_OK;
 }
 
@@ -504,6 +473,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 	scpi = sdi->conn;
+
 	/* Preset empty results. */
 	g_slist_free(devc->enabled_channels);
 	devc->enabled_channels = NULL;