X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flecroy-xstream%2Fprotocol.c;h=63459d0b8cb412daf850a7841ba59041c10f04c2;hb=6158728cdb82ecf5a9783fa94489d51c90875f59;hp=7aebdc59004e8b940de06e39686b079f10362022;hpb=f8195cb2da3268c89e24071ed32ab9acdded5bc0;p=libsigrok.git

diff --git a/src/hardware/lecroy-xstream/protocol.c b/src/hardware/lecroy-xstream/protocol.c
index 7aebdc59..63459d0b 100644
--- a/src/hardware/lecroy-xstream/protocol.c
+++ b/src/hardware/lecroy-xstream/protocol.c
@@ -80,18 +80,17 @@ static const char *coupling_options[] = {
 	"D1M", // DC with 1 MOhm termination
 	"GND",
 	"OVL",
-	NULL,
 };
 
 static const char *scope_trigger_slopes[] = {
-	"POS", "NEG", NULL,
+	"POS", "NEG",
 };
 
 static const char *trigger_sources[] = {
-	"C1", "C2", "C3", "C4", "LINE", "EXT", NULL,
+	"C1", "C2", "C3", "C4", "LINE", "EXT",
 };
 
-static const struct sr_rational timebases[] = {
+static const uint64_t timebases[][2] = {
 	/* picoseconds */
 	{ 20, 1000000000000 },
 	{ 50, 1000000000000 },
@@ -141,7 +140,7 @@ static const struct sr_rational timebases[] = {
 	{ 1000, 1 },
 };
 
-static const struct sr_rational vdivs[] = {
+static const uint64_t vdivs[][2] = {
 	/* millivolts */
 	{ 1, 1000 },
 	{ 2, 1000 },
@@ -173,13 +172,18 @@ static const struct scope_config scope_models[] = {
 		.analog_names = &scope_analog_channel_names,
 
 		.coupling_options = &coupling_options,
+		.num_coupling_options = ARRAY_SIZE(coupling_options),
+
 		.trigger_sources = &trigger_sources,
+		.num_trigger_sources = ARRAY_SIZE(trigger_sources),
+
 		.trigger_slopes = &scope_trigger_slopes,
+		.num_trigger_slopes = ARRAY_SIZE(scope_trigger_slopes),
 
-		.timebases = timebases,
+		.timebases = &timebases,
 		.num_timebases = ARRAY_SIZE(timebases),
 
-		.vdivs = vdivs,
+		.vdivs = &vdivs,
 		.num_vdivs = ARRAY_SIZE(vdivs),
 
 		.num_xdivs = 10,
@@ -194,16 +198,16 @@ static void scope_state_dump(const struct scope_config *config,
 	char *tmp;
 
 	for (i = 0; i < config->analog_channels; i++) {
-		tmp = sr_voltage_string(config->vdivs[state->analog_channels[i].vdiv].p,
-					config->vdivs[state->analog_channels[i].vdiv].q);
+		tmp = sr_voltage_string((*config->vdivs)[state->analog_channels[i].vdiv][0],
+					(*config->vdivs)[state->analog_channels[i].vdiv][1]);
 		sr_info("State of analog channel %d -> %s : %s (coupling) %s (vdiv) %2.2e (offset)",
 			i + 1, state->analog_channels[i].state ? "On" : "Off",
 			(*config->coupling_options)[state->analog_channels[i].coupling],
 			tmp, state->analog_channels[i].vertical_offset);
 	}
 
-	tmp = sr_period_string(config->timebases[state->timebase].p,
-				config->timebases[state->timebase].q);
+	tmp = sr_period_string((*config->timebases)[state->timebase][0],
+				(*config->timebases)[state->timebase][1]);
 	sr_info("Current timebase: %s", tmp);
 	g_free(tmp);
 
@@ -218,11 +222,11 @@ static void scope_state_dump(const struct scope_config *config,
 }
 
 static int scope_state_get_array_option(const char *resp,
-					const char *(*array)[], int *result)
+	const char *(*array)[], unsigned int n, int *result)
 {
 	unsigned int i;
 
-	for (i = 0; (*array)[i]; i++) {
+	for (i = 0; i < n; i++) {
 		if (!g_strcmp0(resp, (*array)[i])) {
 			*result = i;
 			return SR_OK;
@@ -243,16 +247,18 @@ static int scope_state_get_array_option(const char *resp,
  *
  * @return SR_ERR on any parsing error, SR_OK otherwise.
  */
-static int array_float_get(gchar *value, const struct sr_rational *aval,
+static int array_float_get(gchar *value, const uint64_t array[][2],
 		int array_len, unsigned int *result)
 {
 	struct sr_rational rval;
+	struct sr_rational aval;
 
 	if (sr_parse_rational(value, &rval) != SR_OK)
 		return SR_ERR;
 
 	for (int i = 0; i < array_len; i++) {
-		if (sr_rational_eq(&rval, aval + i)) {
+		sr_rational_set(&aval, array[i][0], array[i][1]);
+		if (sr_rational_eq(&rval, &aval)) {
 			*result = i;
 			return SR_OK;
 		}
@@ -302,6 +308,7 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
 
 
 		if (scope_state_get_array_option(tmp_str, config->coupling_options,
+				 config->num_coupling_options,
 				 &state->analog_channels[i].coupling) != SR_OK)
 			return SR_ERR;
 
@@ -383,7 +390,7 @@ SR_PRIV int lecroy_xstream_state_get(struct sr_dev_inst *sdi)
 		i++;
 	}
 
-	if (!trig_source || scope_state_get_array_option(trig_source, config->trigger_sources, &state->trigger_source) != SR_OK)
+	if (!trig_source || scope_state_get_array_option(trig_source, config->trigger_sources, config->num_trigger_sources, &state->trigger_source) != SR_OK)
 		return SR_ERR;
 
 	g_snprintf(command, sizeof(command), "%s:TRIG_SLOPE?", trig_source);
@@ -391,7 +398,7 @@ SR_PRIV int lecroy_xstream_state_get(struct sr_dev_inst *sdi)
 		return SR_ERR;
 
 	if (scope_state_get_array_option(tmp_str,
-		config->trigger_slopes, &state->trigger_slope) != SR_OK)
+		config->trigger_slopes, config->num_trigger_slopes, &state->trigger_slope) != SR_OK)
 		return SR_ERR;
 
 	if (sr_scpi_get_float(sdi->conn, "TRIG_DELAY?",	&state->horiz_triggerpos) != SR_OK)
@@ -452,6 +459,10 @@ SR_PRIV int lecroy_xstream_init_device(struct sr_dev_inst *sdi)
 		return SR_ERR_NA;
 	}
 
+	/* Set the desired response and format modes. */
+	sr_scpi_send(sdi->conn, "COMM_HEADER OFF");
+	sr_scpi_send(sdi->conn, "COMM_FORMAT OFF,WORD,BIN");
+
 	devc->analog_groups = g_malloc0(sizeof(struct sr_channel_group*) *
 				scope_models[model_index].analog_channels);
 
@@ -483,9 +494,6 @@ SR_PRIV int lecroy_xstream_init_device(struct sr_dev_inst *sdi)
 	if (!(devc->model_state = scope_state_new(devc->model_config)))
 		return SR_ERR_MALLOC;
 
-	/* Set the desired response mode. */
-	sr_scpi_send(sdi->conn, "COMM_HEADER OFF,WORD,BIN");
-
 	return SR_OK;
 }