X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic16%2Fapi.c;h=8b2db4b49e065b9845e976559d735f70812d034d;hb=a4e435eb49c1fa30c31d5851b404001324cafe33;hp=a12143a5c97365567664f55632e6ffcea3674c09;hpb=d0107565c1e61e7b705fb9c0c84c72490da57d8f;p=libsigrok.git

diff --git a/hardware/saleae-logic16/api.c b/hardware/saleae-logic16/api.c
index a12143a5..8b2db4b4 100644
--- a/hardware/saleae-logic16/api.c
+++ b/hardware/saleae-logic16/api.c
@@ -49,13 +49,22 @@ static const int32_t hwcaps[] = {
 	SR_CONF_LOGIC_ANALYZER,
 	SR_CONF_SAMPLERATE,
 	SR_CONF_VOLTAGE_THRESHOLD,
+	SR_CONF_TRIGGER_MATCH,
 
 	/* These are really implemented in the driver, not the hardware. */
 	SR_CONF_LIMIT_SAMPLES,
 	SR_CONF_CONTINUOUS,
 };
 
-static const char *probe_names[] = {
+static const int32_t soft_trigger_matches[] = {
+	SR_TRIGGER_ZERO,
+	SR_TRIGGER_ONE,
+	SR_TRIGGER_RISING,
+	SR_TRIGGER_FALLING,
+	SR_TRIGGER_EDGE,
+};
+
+static const char *channel_names[] = {
 	"0", "1", "2", "3", "4", "5", "6", "7", "8",
 	"9", "10", "11", "12", "13", "14", "15",
 	NULL,
@@ -136,7 +145,7 @@ static GSList *scan(GSList *options)
 	struct dev_context *devc;
 	struct sr_dev_inst *sdi;
 	struct sr_usb_dev_inst *usb;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	struct sr_config *src;
 	GSList *l, *devices, *conn_devices;
 	struct libusb_device_descriptor des;
@@ -194,11 +203,11 @@ static GSList *scan(GSList *options)
 			return NULL;
 		sdi->driver = di;
 
-		for (j = 0; probe_names[j]; j++) {
-			if (!(probe = sr_probe_new(j, SR_PROBE_LOGIC, TRUE,
-						   probe_names[j])))
+		for (j = 0; channel_names[j]; j++) {
+			if (!(ch = sr_channel_new(j, SR_CHANNEL_LOGIC, TRUE,
+						   channel_names[j])))
 				return NULL;
-			sdi->probes = g_slist_append(sdi->probes, probe);
+			sdi->channels = g_slist_append(sdi->channels, ch);
 		}
 
 		if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
@@ -240,11 +249,6 @@ static GSList *dev_list(void)
 	return ((struct drv_context *)(di->priv))->instances;
 }
 
-static int dev_clear(void)
-{
-	return std_dev_clear(di, NULL);
-}
-
 static int logic16_dev_open(struct sr_dev_inst *sdi)
 {
 	libusb_device **devlist;
@@ -308,6 +312,20 @@ static int logic16_dev_open(struct sr_dev_inst *sdi)
 			break;
 		}
 
+		ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
+		if (ret == LIBUSB_ERROR_BUSY) {
+			sr_err("Unable to claim USB interface. Another "
+			       "program or driver has already claimed it.");
+			break;
+		} else if (ret == LIBUSB_ERROR_NO_DEVICE) {
+			sr_err("Device has been disconnected.");
+			break;
+		} else if (ret != 0) {
+			sr_err("Unable to claim interface: %s.",
+			       libusb_error_name(ret));
+			break;
+		}
+
 		if ((ret = logic16_init_device(sdi)) != SR_OK) {
 			sr_err("Failed to init device.");
 			break;
@@ -321,21 +339,25 @@ static int logic16_dev_open(struct sr_dev_inst *sdi)
 	}
 	libusb_free_device_list(devlist, 1);
 
-	if (sdi->status != SR_ST_ACTIVE)
+	if (sdi->status != SR_ST_ACTIVE) {
+		if (usb->devhdl) {
+			libusb_release_interface(usb->devhdl, USB_INTERFACE);
+			libusb_close(usb->devhdl);
+			usb->devhdl = NULL;
+		}
 		return SR_ERR;
+	}
 
 	return SR_OK;
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
 {
-	struct sr_usb_dev_inst *usb;
 	struct dev_context *devc;
 	int ret;
 	int64_t timediff_us, timediff_ms;
 
 	devc = sdi->priv;
-	usb = sdi->conn;
 
 	/*
 	 * If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
@@ -371,25 +393,6 @@ static int dev_open(struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
-	ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
-	if (ret != 0) {
-		switch (ret) {
-		case LIBUSB_ERROR_BUSY:
-			sr_err("Unable to claim USB interface. Another "
-			       "program or driver has already claimed it.");
-			break;
-		case LIBUSB_ERROR_NO_DEVICE:
-			sr_err("Device has been disconnected.");
-			break;
-		default:
-			sr_err("Unable to claim interface: %s.",
-			       libusb_error_name(ret));
-			break;
-		}
-
-		return SR_ERR;
-	}
-
 	if (devc->cur_samplerate == 0) {
 		/* Samplerate hasn't been set; default to the slowest one. */
 		devc->cur_samplerate = samplerates[0];
@@ -425,14 +428,16 @@ static int cleanup(void)
 		/* Can get called on an unused driver, doesn't matter. */
 		return SR_OK;
 
-	ret = dev_clear();
+
+	ret = std_dev_clear(di, NULL);
 	g_free(drvc);
 	di->priv = NULL;
 
 	return ret;
 }
 
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
@@ -441,6 +446,8 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
 	int ret;
 	unsigned int i;
 
+	(void)cg;
+
 	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_CONN:
@@ -483,13 +490,16 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
 	return ret;
 }
 
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
+static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	gdouble low, high;
 	int ret;
 	unsigned int i;
 
+	(void)cg;
+
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
@@ -523,7 +533,8 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
 	return ret;
 }
 
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+		const struct sr_channel_group *cg)
 {
 	GVariant *gvar, *range[2];
 	GVariantBuilder gvb;
@@ -531,6 +542,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 	unsigned int i;
 
 	(void)sdi;
+	(void)cg;
 
 	ret = SR_OK;
 	switch (key) {
@@ -559,6 +571,11 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 		}
 		*data = g_variant_builder_end(&gvb);
 		break;
+	case SR_CONF_TRIGGER_MATCH:
+		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+				soft_trigger_matches, ARRAY_SIZE(soft_trigger_matches),
+				sizeof(int32_t));
+		break;
 	default:
 		return SR_ERR_NA;
 	}
@@ -570,7 +587,7 @@ static void abort_acquisition(struct dev_context *devc)
 {
 	int i;
 
-	devc->num_samples = -1;
+	devc->sent_samples = -1;
 
 	for (i = devc->num_transfers - 1; i >= 0; i--) {
 		if (devc->transfers[i])
@@ -618,25 +635,28 @@ static unsigned int get_timeout(struct dev_context *devc)
 	return timeout + timeout / 4; /* Leave a headroom of 25% percent. */
 }
 
-static int configure_probes(const struct sr_dev_inst *sdi)
+static int configure_channels(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	GSList *l;
-	uint16_t probe_bit;
+	uint16_t channel_bit;
+#ifdef WORDS_BIGENDIAN
+	int i;
+#endif
 
 	devc = sdi->priv;
 
 	devc->cur_channels = 0;
 	devc->num_channels = 0;
-	for (l = sdi->probes; l; l = l->next) {
-		probe = (struct sr_probe *)l->data;
-		if (probe->enabled == FALSE)
+	for (l = sdi->channels; l; l = l->next) {
+		ch = (struct sr_channel *)l->data;
+		if (ch->enabled == FALSE)
 			continue;
 
-		probe_bit = 1 << (probe->index);
+		channel_bit = 1 << (ch->index);
 
-		devc->cur_channels |= probe_bit;
+		devc->cur_channels |= channel_bit;
 
 #ifdef WORDS_BIGENDIAN
 		/*
@@ -644,10 +664,10 @@ static int configure_probes(const struct sr_dev_inst *sdi)
 		 * To speed things up during conversion, do the switcharoo
 		 * here instead.
 		 */
-		probe_bit = 1 << (probe->index ^ 8);
+		channel_bit = 1 << (ch->index ^ 8);
 #endif
 
-		devc->channel_masks[devc->num_channels++] = probe_bit;
+		devc->channel_masks[devc->num_channels++] = channel_bit;
 	}
 
 	return SR_OK;
@@ -670,7 +690,7 @@ static int receive_data(int fd, int revents, void *cb_data)
 	tv.tv_sec = tv.tv_usec = 0;
 	libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
 
-	if (devc->num_samples == -2) {
+	if (devc->sent_samples == -2) {
 		logic16_abort_acquisition(sdi);
 		abort_acquisition(devc);
 	}
@@ -683,8 +703,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	struct dev_context *devc;
 	struct drv_context *drvc;
 	struct sr_usb_dev_inst *usb;
+	struct sr_trigger *trigger;
 	struct libusb_transfer *transfer;
-	const struct libusb_pollfd **lupfd;
 	unsigned int i, timeout, num_transfers;
 	int ret;
 	unsigned char *buf;
@@ -698,23 +718,28 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	usb = sdi->conn;
 
 	/* Configures devc->cur_channels. */
-	if (configure_probes(sdi) != SR_OK) {
-		sr_err("Failed to configure probes.");
+	if (configure_channels(sdi) != SR_OK) {
+		sr_err("Failed to configure channels.");
 		return SR_ERR;
 	}
 
 	devc->cb_data = cb_data;
-	devc->num_samples = 0;
+	devc->sent_samples = 0;
 	devc->empty_transfer_count = 0;
 	devc->cur_channel = 0;
 	memset(devc->channel_data, 0, sizeof(devc->channel_data));
 
+	if ((trigger = sr_session_trigger_get())) {
+		devc->stl = soft_trigger_logic_new(sdi, trigger);
+		devc->trigger_fired = FALSE;
+	} else
+		devc->trigger_fired = TRUE;
+
 	timeout = get_timeout(devc);
 	num_transfers = get_number_of_transfers(devc);
 	size = get_buffer_size(devc);
 	convsize = (size / devc->num_channels + 2) * 16;
 	devc->submitted_transfers = 0;
-	devc->usbfd = NULL;
 
 	devc->convbuffer_size = convsize;
 	if (!(devc->convbuffer = g_try_malloc(convsize))) {
@@ -764,21 +789,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 		devc->submitted_transfers++;
 	}
 
-	lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx);
-	for (i = 0; lupfd[i]; i++);
-	devc->usbfd = g_try_malloc(sizeof(struct libusb_pollfd) * (i + 1));
-	if (!devc->usbfd) {
-		abort_acquisition(devc);
-		free(lupfd);
-		return SR_ERR;
-	}
-	for (i = 0; lupfd[i]; i++) {
-		sr_source_add(lupfd[i]->fd, lupfd[i]->events,
-			      timeout, receive_data, (void *)sdi);
-		devc->usbfd[i] = lupfd[i]->fd;
-	}
-	devc->usbfd[i] = -1;
-	free(lupfd);
+	devc->ctx = drvc->sr_ctx;
+
+	usb_source_add(devc->ctx, timeout, receive_data, (void *)sdi);
 
 	/* Send header packet to the session bus. */
 	std_session_send_df_header(cb_data, LOG_PREFIX);
@@ -815,7 +828,7 @@ SR_PRIV struct sr_dev_driver saleae_logic16_driver_info = {
 	.cleanup = cleanup,
 	.scan = scan,
 	.dev_list = dev_list,
-	.dev_clear = dev_clear,
+	.dev_clear = NULL,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,