X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fikalogic-scanalogic2%2Fprotocol.c;h=663ff527a75c42c2851448a3dd716cd983393489;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hp=dd460d42d0f6fecab04455b880b214ac15ef9fd2;hpb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;p=libsigrok.git

diff --git a/hardware/ikalogic-scanalogic2/protocol.c b/hardware/ikalogic-scanalogic2/protocol.c
index dd460d42..663ff527 100644
--- a/hardware/ikalogic-scanalogic2/protocol.c
+++ b/hardware/ikalogic-scanalogic2/protocol.c
@@ -33,7 +33,7 @@ static void stop_acquisition(struct sr_dev_inst *sdi)
 	devc = sdi->priv;
 
 	/* Remove USB file descriptors from polling. */
-	usb_source_remove(drvc->sr_ctx);
+	usb_source_remove(sdi->session, drvc->sr_ctx);
 
 	packet.type = SR_DF_END;
 	sr_session_send(devc->cb_data, &packet);
@@ -50,7 +50,7 @@ static void abort_acquisition(struct sr_dev_inst *sdi)
 	devc = sdi->priv;
 
 	/* Remove USB file descriptors from polling. */
-	usb_source_remove(drvc->sr_ctx);
+	usb_source_remove(sdi->session, drvc->sr_ctx);
 
 	packet.type = SR_DF_END;
 	sr_session_send(devc->cb_data, &packet);
@@ -89,7 +89,7 @@ static void process_sample_data(const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_logic logic;
-	uint8_t i, j, tmp, buffer[PACKET_NUM_SAMPLES], *ptr[NUM_PROBES];
+	uint8_t i, j, tmp, buffer[PACKET_NUM_SAMPLES], *ptr[NUM_CHANNELS];
 	uint16_t offset, n = 0;
 	int8_t k;
 
@@ -479,14 +479,14 @@ SR_PRIV int sl2_set_limit_samples(const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-SR_PRIV void sl2_configure_trigger(const struct sr_dev_inst *sdi)
+SR_PRIV int sl2_convert_trigger(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	struct sr_channel *ch;
-	uint8_t trigger_type;
-	int channel_index, num_triggers_anyedge;
-	char *trigger;
-	GSList *l;
+	struct sr_trigger *trigger;
+	struct sr_trigger_stage *stage;
+	struct sr_trigger_match *match;
+	const GSList *l, *m;
+	int num_triggers_anyedge;
 
 	devc = sdi->priv;
 
@@ -494,45 +494,51 @@ SR_PRIV void sl2_configure_trigger(const struct sr_dev_inst *sdi)
 	devc->trigger_channel = TRIGGER_CHANNEL_0;
 	devc->trigger_type = TRIGGER_TYPE_NONE;
 
-	num_triggers_anyedge = 0;
-
-	for (l = sdi->channels, channel_index = 0; l; l = l->next, channel_index++) {
-		ch = l->data;
-		trigger = ch->trigger;
+	if (!(trigger = sr_session_trigger_get(sdi->session)))
+		return SR_OK;
 
-		if (!trigger || !ch->enabled)
-			continue;
+	if (g_slist_length(trigger->stages) > 1) {
+		sr_err("This device only supports 1 trigger stage.");
+		return SR_ERR;
+	}
 
-		switch (*trigger) {
-		case 'r':
-			trigger_type = TRIGGER_TYPE_POSEDGE;
-			break;
-		case 'f':
-			trigger_type = TRIGGER_TYPE_NEGEDGE;
-			break;
-		case 'c':
-			trigger_type = TRIGGER_TYPE_ANYEDGE;
-			num_triggers_anyedge++;
-			break;
-		default:
-			continue;
+	num_triggers_anyedge = 0;
+	for (l = trigger->stages; l; l = l->next) {
+		stage = l->data;
+		for (m = stage->matches; m; m = m->next) {
+			match = m->data;
+			if (!match->channel->enabled)
+				/* Ignore disabled channels with a trigger. */
+				continue;
+			devc->trigger_channel = match->channel->index + 1;
+			switch (match->match) {
+			case SR_TRIGGER_RISING:
+				devc->trigger_type = TRIGGER_TYPE_POSEDGE;
+				break;
+			case SR_TRIGGER_FALLING:
+				devc->trigger_type = TRIGGER_TYPE_NEGEDGE;
+				break;
+			case SR_TRIGGER_EDGE:
+				devc->trigger_type = TRIGGER_TYPE_ANYEDGE;
+				num_triggers_anyedge++;
+				break;
+			}
 		}
-
-		devc->trigger_channel = channel_index + 1;
-		devc->trigger_type = trigger_type;
 	}
 
 	/*
 	 * Set trigger to any edge on all channels if the trigger for each
 	 * channel is set to any edge.
 	 */
-	if (num_triggers_anyedge == NUM_PROBES) {
+	if (num_triggers_anyedge == NUM_CHANNELS) {
 		devc->trigger_channel = TRIGGER_CHANNEL_ALL;
 		devc->trigger_type = TRIGGER_TYPE_ANYEDGE;
 	}
 
 	sr_dbg("Trigger set to channel 0x%02x and type 0x%02x.",
 		devc->trigger_channel, devc->trigger_type);
+
+	return SR_OK;
 }
 
 SR_PRIV int sl2_set_capture_ratio(const struct sr_dev_inst *sdi,