X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flecroy-xstream%2Fapi.c;h=582474c9913a278429edbf18443bee277aa87e75;hb=76f0fa5dfb6efe7afdaa3a1101d3d894840471cc;hp=f51397029719597aeb696cb48b1743fb742faa92;hpb=105df67463b84683a35f3474eccc871e5aa4ed0e;p=libsigrok.git

diff --git a/src/hardware/lecroy-xstream/api.c b/src/hardware/lecroy-xstream/api.c
index f5139702..582474c9 100644
--- a/src/hardware/lecroy-xstream/api.c
+++ b/src/hardware/lecroy-xstream/api.c
@@ -52,18 +52,7 @@ static const uint32_t devopts_cg_analog[] = {
 	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)
+static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
@@ -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));
@@ -112,7 +101,7 @@ fail:
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-	return sr_scpi_scan(di->context, options, probe_serial_device);
+	return sr_scpi_scan(di->context, options, probe_device);
 }
 
 static void clear_helper(struct dev_context *devc)
@@ -165,8 +154,8 @@ static int config_get(uint32_t key, GVariant **data,
 		break;
 	case SR_CONF_TIMEBASE:
 		*data = g_variant_new("(tt)",
-				model->timebases[state->timebase].p,
-				model->timebases[state->timebase].q);
+				(*model->timebases)[state->timebase][0],
+				(*model->timebases)[state->timebase][1]);
 		break;
 	case SR_CONF_NUM_VDIV:
 		for (i = 0; i < model->analog_channels; i++) {
@@ -180,8 +169,8 @@ static int config_get(uint32_t key, GVariant **data,
 			if (cg != devc->analog_groups[i])
 				continue;
 			*data = g_variant_new("(tt)",
-				model->vdivs[state->analog_channels[i].vdiv].p,
-				model->vdivs[state->analog_channels[i].vdiv].q);
+				(*model->vdivs)[state->analog_channels[i].vdiv][0],
+				(*model->vdivs)[state->analog_channels[i].vdiv][1]);
 		}
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
@@ -223,8 +212,7 @@ static int config_set(uint32_t key, GVariant *data,
 	const struct scope_config *model;
 	struct scope_state *state;
 	const char *tmp;
-	int64_t p;
-	uint64_t q;
+	uint64_t p, q;
 	double tmp_d;
 	gboolean update_sample_rate;
 
@@ -246,7 +234,7 @@ static int config_set(uint32_t key, GVariant *data,
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
 		tmp = g_variant_get_string(data, NULL);
-		for (i = 0; (*model->trigger_sources)[i]; i++) {
+		for (i = 0; i < model->num_trigger_sources; i++) {
 			if (g_strcmp0(tmp, (*model->trigger_sources)[i]) != 0)
 				continue;
 			state->trigger_source = i;
@@ -262,7 +250,7 @@ static int config_set(uint32_t key, GVariant *data,
 		g_variant_get(data, "(tt)", &p, &q);
 
 		for (i = 0; i < model->num_vdivs; i++) {
-			if (p != model->vdivs[i].p || q != model->vdivs[i].q)
+			if (p != (*model->vdivs)[i][0] || q != (*model->vdivs)[i][1])
 				continue;
 			for (j = 1; j <= model->analog_channels; j++) {
 				if (cg != devc->analog_groups[j - 1])
@@ -286,8 +274,8 @@ static int config_set(uint32_t key, GVariant *data,
 		g_variant_get(data, "(tt)", &p, &q);
 
 		for (i = 0; i < model->num_timebases; i++) {
-			if (p != model->timebases[i].p ||
-			    q != model->timebases[i].q)
+			if (p != (*model->timebases)[i][0] ||
+			    q != (*model->timebases)[i][1])
 				continue;
 			state->timebase = i;
 			g_snprintf(command, sizeof(command),
@@ -306,8 +294,8 @@ static int config_set(uint32_t key, GVariant *data,
 
 		state->horiz_triggerpos = tmp_d;
 		tmp_d = -(tmp_d - 0.5) *
-			((double)model->timebases[state->timebase].p /
-			 model->timebases[state->timebase].q)
+			((double)(*model->timebases)[state->timebase][0] /
+			 (*model->timebases)[state->timebase][1])
 			 * model->num_xdivs;
 
 		g_snprintf(command, sizeof(command), "TRIG POS %e S", tmp_d);
@@ -316,7 +304,7 @@ static int config_set(uint32_t key, GVariant *data,
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
 		tmp = g_variant_get_string(data, NULL);
-		for (i = 0; (*model->trigger_slopes)[i]; i++) {
+		for (i = 0; i < model->num_trigger_slopes; i++) {
 			if (g_strcmp0(tmp, (*model->trigger_slopes)[i]) != 0)
 				continue;
 			state->trigger_slope = i;
@@ -331,7 +319,7 @@ static int config_set(uint32_t key, GVariant *data,
 	case SR_CONF_COUPLING:
 		tmp = g_variant_get_string(data, NULL);
 
-		for (i = 0; (*model->coupling_options)[i]; i++) {
+		for (i = 0; i < model->num_coupling_options; i++) {
 			if (strcmp(tmp, (*model->coupling_options)[i]) != 0)
 				continue;
 			for (j = 1; j <= model->analog_channels; j++) {
@@ -381,37 +369,35 @@ 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 = std_gvar_array_u32(devopts_cg_analog, ARRAY_SIZE(devopts_cg_analog));
+		*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog));
 		break;
 	case SR_CONF_COUPLING:
-		*data = g_variant_new_strv(*model->coupling_options,
-			   g_strv_length((char **)*model->coupling_options));
+		*data = g_variant_new_strv(*model->coupling_options, model->num_coupling_options);
 		break;
 	case SR_CONF_TRIGGER_SOURCE:
 		if (!model)
 			return SR_ERR_ARG;
-		*data = g_variant_new_strv(*model->trigger_sources,
-			   g_strv_length((char **)*model->trigger_sources));
+		*data = g_variant_new_strv(*model->trigger_sources, model->num_trigger_sources);
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
 		if (!model)
 			return SR_ERR_ARG;
-		*data = g_variant_new_strv(*model->trigger_slopes,
-			   g_strv_length((char **)*model->trigger_slopes));
+		*data = g_variant_new_strv(*model->trigger_slopes, model->num_trigger_slopes);
 		break;
 	case SR_CONF_TIMEBASE:
 		if (!model)
 			return SR_ERR_ARG;
-		*data = std_gvar_tuple_rational(model->timebases, model->num_timebases);
+		*data = std_gvar_tuple_array(*model->timebases, model->num_timebases);
 		break;
 	case SR_CONF_VDIV:
 		if (!model)
 			return SR_ERR_ARG;
-		*data = std_gvar_tuple_rational(model->vdivs, model->num_vdivs);
+		*data = std_gvar_tuple_array(*model->vdivs, model->num_vdivs);
 		break;
 	default:
 		return SR_ERR_NA;
 	}
+
 	return SR_OK;
 }