X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fdreamsourcelab-dslogic%2Fapi.c;h=6d5b7fc7d6cd009d5bf90c8f043fa0cc28162993;hp=c5724c100d1b754589fdb381b9b5e79c1ce95987;hb=HEAD;hpb=7962b129c3146a907bd765ebb40cf102fd5c2419

diff --git a/src/hardware/dreamsourcelab-dslogic/api.c b/src/hardware/dreamsourcelab-dslogic/api.c
index c5724c10..6d5b7fc7 100644
--- a/src/hardware/dreamsourcelab-dslogic/api.c
+++ b/src/hardware/dreamsourcelab-dslogic/api.c
@@ -47,14 +47,14 @@ static const struct dslogic_profile supported_device[] = {
 	ALL_ZERO
 };
 
-static const uint32_t drvopts[] = {
-	SR_CONF_LOGIC_ANALYZER,
-};
-
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 };
 
+static const uint32_t drvopts[] = {
+	SR_CONF_LOGIC_ANALYZER,
+};
+
 static const uint32_t devopts[] = {
 	SR_CONF_CONTINUOUS | SR_CONF_SET | SR_CONF_GET,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
@@ -67,16 +67,20 @@ static const uint32_t devopts[] = {
 	SR_CONF_CLOCK_EDGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
-/* Names assigned to available edge slope choices. */
-static const char *const signal_edge_names[] = {
+static const int32_t trigger_matches[] = {
+	SR_TRIGGER_ZERO,
+	SR_TRIGGER_ONE,
+	SR_TRIGGER_RISING,
+	SR_TRIGGER_FALLING,
+	SR_TRIGGER_EDGE,
+};
+
+static const char *signal_edges[] = {
 	[DS_EDGE_RISING] = "rising",
 	[DS_EDGE_FALLING] = "falling",
 };
 
-static const struct {
-	gdouble low;
-	gdouble high;
-} voltage_thresholds[] = {
+static const double thresholds[][2] = {
 	{ 0.7, 1.4 },
 	{ 1.4, 3.6 },
 };
@@ -210,23 +214,20 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 			continue;
 		}
 
-		usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
-
 		libusb_close(hdl);
 
+		if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+			continue;
+
 		prof = NULL;
 		for (j = 0; supported_device[j].vid; j++) {
 			if (des.idVendor == supported_device[j].vid &&
-					des.idProduct == supported_device[j].pid &&
-					(!strcmp(manufacturer, supported_device[j].usb_manufacturer)) &&
-					(!strcmp(product, "USB-based Instrument") ||
-						!strcmp(product, supported_device[j].usb_product))) {
+					des.idProduct == supported_device[j].pid) {
 				prof = &supported_device[j];
 				break;
 			}
 		}
 
-		/* Skip if the device was not found. */
 		if (!prof)
 			continue;
 
@@ -239,15 +240,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		sdi->connection_id = g_strdup(connection_id);
 
 		/* Logic channels, all in one channel group. */
-		cg = g_malloc0(sizeof(struct sr_channel_group));
-		cg->name = g_strdup("Logic");
-		for (j = 0; j < 16; j++) {
+		cg = sr_channel_group_new(sdi, "Logic", NULL);
+		for (j = 0; j < NUM_CHANNELS; j++) {
 			sprintf(channel_name, "%d", j);
 			ch = sr_channel_new(sdi, j, SR_CHANNEL_LOGIC,
 						TRUE, channel_name);
 			cg->channels = g_slist_append(cg->channels, ch);
 		}
-		sdi->channel_groups = g_slist_append(NULL, cg);
 
 		devc = dslogic_dev_new();
 		devc->profile = prof;
@@ -267,14 +266,16 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 					libusb_get_device_address(devlist[i]), NULL);
 		} else {
 			if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
-					USB_CONFIGURATION, prof->firmware) == SR_OK)
+					USB_CONFIGURATION, prof->firmware) == SR_OK) {
 				/* Store when this device's FW was updated. */
 				devc->fw_updated = g_get_monotonic_time();
-			else
+			} else {
 				sr_err("Firmware upload failed for "
-				       "device %d.%d (logical).",
+				       "device %d.%d (logical), name %s.",
 				       libusb_get_bus_number(devlist[i]),
-				       libusb_get_device_address(devlist[i]));
+				       libusb_get_device_address(devlist[i]),
+				       prof->firmware);
+			}
 			sdi->inst_type = SR_INST_USB;
 			sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
 					0xff, NULL);
@@ -286,19 +287,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	return std_scan_complete(di, devices);
 }
 
-static void clear_dev_context(void *priv)
-{
-	struct dev_context *devc;
-
-	devc = priv;
-	g_free(devc);
-}
-
-static int dev_clear(const struct sr_dev_driver *di)
-{
-	return std_dev_clear(di, clear_dev_context);
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
 	struct sr_dev_driver *di = sdi->driver;
@@ -372,8 +360,10 @@ static int dev_open(struct sr_dev_inst *sdi)
 		devc->cur_samplerate = devc->samplerates[0];
 	}
 
-	if (devc->cur_threshold == 0.0)
-		devc->cur_threshold = 1.5;
+	if (devc->cur_threshold == 0.0) {
+		devc->cur_threshold = thresholds[1][0];
+		return dslogic_set_voltage_threshold(sdi, devc->cur_threshold);
+	}
 
 	return SR_OK;
 }
@@ -385,14 +375,13 @@ static int dev_close(struct sr_dev_inst *sdi)
 	usb = sdi->conn;
 
 	if (!usb->devhdl)
-		return SR_ERR;
+		return SR_ERR_BUG;
 
 	sr_info("Closing device on %d.%d (logical) / %s (physical) interface %d.",
 		usb->bus, usb->address, sdi->connection_id, USB_INTERFACE);
 	libusb_release_interface(usb->devhdl, USB_INTERFACE);
 	libusb_close(usb->devhdl);
 	usb->devhdl = NULL;
-	sdi->status = SR_ST_INACTIVE;
 
 	return SR_OK;
 }
@@ -402,9 +391,7 @@ static int config_get(uint32_t key, GVariant **data,
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
-	GVariant *range[2];
-	unsigned int i, voltage_range;
-	char str[128];
+	int idx;
 
 	(void)cg;
 
@@ -422,28 +409,18 @@ static int config_get(uint32_t key, GVariant **data,
 			/* Device still needs to re-enumerate after firmware
 			 * upload, so we don't know its (future) address. */
 			return SR_ERR;
-		snprintf(str, 128, "%d.%d", usb->bus, usb->address);
-		*data = g_variant_new_string(str);
+		*data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
 		break;
 	case SR_CONF_VOLTAGE_THRESHOLD:
 		if (!strcmp(devc->profile->model, "DSLogic")) {
-			voltage_range = 0;
-
-			for (i = 0; i < ARRAY_SIZE(voltage_thresholds); i++)
-				if (voltage_thresholds[i].low == devc->cur_threshold) {
-					voltage_range = i;
-					break;
-				}
-
-			range[0] = g_variant_new_double(
-				voltage_thresholds[voltage_range].low);
-			range[1] = g_variant_new_double(
-				voltage_thresholds[voltage_range].high);
+			if ((idx = std_double_tuple_idx_d0(devc->cur_threshold,
+					ARRAY_AND_SIZE(thresholds))) < 0)
+				return SR_ERR_BUG;
+			*data = std_gvar_tuple_double(thresholds[idx][0],
+					thresholds[idx][1]);
 		} else {
-			range[0] = g_variant_new_double(devc->cur_threshold);
-			range[1] = g_variant_new_double(devc->cur_threshold);
+			*data = std_gvar_tuple_double(devc->cur_threshold, devc->cur_threshold);
 		}
-		*data = g_variant_new_tuple(range, 2);
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
 		*data = g_variant_new_uint64(devc->limit_samples);
@@ -461,10 +438,10 @@ static int config_get(uint32_t key, GVariant **data,
 		*data = g_variant_new_boolean(devc->continuous_mode);
 		break;
 	case SR_CONF_CLOCK_EDGE:
-		i = devc->clock_edge;
-		if (i >= ARRAY_SIZE(signal_edge_names))
+		idx = devc->clock_edge;
+		if (idx >= (int)ARRAY_SIZE(signal_edges))
 			return SR_ERR_BUG;
-		*data = g_variant_new_string(signal_edge_names[0]);
+		*data = g_variant_new_string(signal_edges[0]);
 		break;
 	default:
 		return SR_ERR_NA;
@@ -473,34 +450,11 @@ static int config_get(uint32_t key, GVariant **data,
 	return SR_OK;
 }
 
-/*
- * Helper for mapping a string-typed configuration value to an index
- * within a table of possible values.
- */
-static int lookup_index(GVariant *value, const char *const *table, int len)
-{
-	const char *entry;
-	int i;
-
-	entry = g_variant_get_string(value, NULL);
-	if (!entry)
-		return -1;
-
-	/* Linear search is fine for very small tables. */
-	for (i = 0; i < len; i++) {
-		if (strcmp(entry, table[i]) == 0)
-			return i;
-	}
-
-	return -1;
-}
-
 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;
-	uint64_t arg;
-	int i, ret;
+	int idx;
 	gdouble low, high;
 
 	(void)cg;
@@ -508,46 +462,29 @@ static int config_set(uint32_t key, GVariant *data,
 	if (!sdi)
 		return SR_ERR_ARG;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR;
-
 	devc = sdi->priv;
 
-	ret = SR_OK;
-
 	switch (key) {
 	case SR_CONF_SAMPLERATE:
-		arg = g_variant_get_uint64(data);
-		for (i = 0; i < devc->num_samplerates; i++) {
-			if (devc->samplerates[i] == arg) {
-				devc->cur_samplerate = arg;
-				break;
-			}
-		}
-		if (i == devc->num_samplerates)
-			ret = SR_ERR_ARG;
+		if ((idx = std_u64_idx(data, devc->samplerates, devc->num_samplerates)) < 0)
+			return SR_ERR_ARG;
+		devc->cur_samplerate = devc->samplerates[idx];
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
 		devc->limit_samples = g_variant_get_uint64(data);
 		break;
 	case SR_CONF_CAPTURE_RATIO:
 		devc->capture_ratio = g_variant_get_uint64(data);
-		ret = (devc->capture_ratio > 100) ? SR_ERR : SR_OK;
 		break;
 	case SR_CONF_VOLTAGE_THRESHOLD:
-		g_variant_get(data, "(dd)", &low, &high);
 		if (!strcmp(devc->profile->model, "DSLogic")) {
-			for (i = 0; (unsigned int)i < ARRAY_SIZE(voltage_thresholds); i++) {
-				if (fabs(voltage_thresholds[i].low - low) < 0.1 &&
-				    fabs(voltage_thresholds[i].high - high) < 0.1) {
-					devc->cur_threshold =
-						voltage_thresholds[i].low;
-					break;
-				}
-			}
-			ret = dslogic_fpga_firmware_upload(sdi);
+			if ((idx = std_double_tuple_idx(data, ARRAY_AND_SIZE(thresholds))) < 0)
+				return SR_ERR_ARG;
+			devc->cur_threshold = thresholds[idx][0];
+			return dslogic_fpga_firmware_upload(sdi);
 		} else {
-			ret = dslogic_set_voltage_threshold(sdi, (low + high) / 2.0);
+			g_variant_get(data, "(dd)", &low, &high);
+			return dslogic_set_voltage_threshold(sdi, (low + high) / 2.0);
 		}
 		break;
 	case SR_CONF_EXTERNAL_CLOCK:
@@ -557,77 +494,46 @@ static int config_set(uint32_t key, GVariant *data,
 		devc->continuous_mode = g_variant_get_boolean(data);
 		break;
 	case SR_CONF_CLOCK_EDGE:
-		i = lookup_index(data, signal_edge_names,
-		 		   ARRAY_SIZE(signal_edge_names));
-		if (i < 0)
+		if ((idx = std_str_idx(data, ARRAY_AND_SIZE(signal_edges))) < 0)
 			return SR_ERR_ARG;
-		devc->clock_edge = i;
+		devc->clock_edge = idx;
 		break;
 	default:
-		ret = SR_ERR_NA;
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 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 = NULL;
-	GVariant *gvar, *range[2];
-	GVariantBuilder gvb;
-	unsigned int i;
-	double v;
+	struct dev_context *devc;
 
-	(void)cg;
+	devc = (sdi) ? sdi->priv : NULL;
 
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS:
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-		break;
 	case SR_CONF_DEVICE_OPTIONS:
-		if (!sdi) {
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
-		} else {
-			devc = sdi->priv;
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-							  devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-		}
-		break;
+		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 	case SR_CONF_VOLTAGE_THRESHOLD:
-		if (sdi->priv)
-			devc = sdi->priv;
-		g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-		if (devc && !strcmp(devc->profile->model, "DSLogic")) {
-			for (i = 0; i < ARRAY_SIZE(voltage_thresholds); i++) {
-				range[0] = g_variant_new_double(voltage_thresholds[i].low);
-				range[1] = g_variant_new_double(voltage_thresholds[i].high);
-				gvar = g_variant_new_tuple(range, 2);
-				g_variant_builder_add_value(&gvb, gvar);
-			}
-		} else {
-			for (v = 0.0; v <= 5.0; v += 0.1) {
-				range[0] = g_variant_new_double(v);
-				range[1] = g_variant_new_double(v);
-				gvar = g_variant_new_tuple(range, 2);
-				g_variant_builder_add_value(&gvb, gvar);
-			}
-		}
-		*data = g_variant_builder_end(&gvb);
+		if (!devc || !devc->profile)
+			return SR_ERR_ARG;
+		if (!strcmp(devc->profile->model, "DSLogic"))
+			*data = std_gvar_thresholds(ARRAY_AND_SIZE(thresholds));
+		else
+			*data = std_gvar_min_max_step_thresholds(0.0, 5.0, 0.1);
 		break;
 	case SR_CONF_SAMPLERATE:
-		devc = sdi->priv;
-		g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
-		gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), devc->samplerates,
-				devc->num_samplerates, sizeof(uint64_t));
-		g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
-		*data = g_variant_builder_end(&gvb);
+		if (!devc)
+			return SR_ERR_ARG;
+		*data = std_gvar_samplerates(devc->samplerates, devc->num_samplerates);
+		break;
+	case SR_CONF_TRIGGER_MATCH:
+		*data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
 		break;
 	case SR_CONF_CLOCK_EDGE:
-		*data = g_variant_new_strv(signal_edge_names,
-			ARRAY_SIZE(signal_edge_names));
+		*data = g_variant_new_strv(ARRAY_AND_SIZE(signal_edges));
 		break;
 	default:
 		return SR_ERR_NA;
@@ -644,7 +550,7 @@ static struct sr_dev_driver dreamsourcelab_dslogic_driver_info = {
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,
-	.dev_clear = dev_clear,
+	.dev_clear = std_dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,