X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fasix-sigma%2Fprotocol.h;h=a35bcb0ad08ba45f66744997f66e866efb427289;hb=b3df76683179cbb9559e1cad8efe0d10c02dacce;hp=83c6adb93f2b8564b2a099f8640e6731317dcfd4;hpb=de4c29fa9116fcd007b136ec550d81b40b3d3989;p=libsigrok.git

diff --git a/src/hardware/asix-sigma/protocol.h b/src/hardware/asix-sigma/protocol.h
index 83c6adb9..a35bcb0a 100644
--- a/src/hardware/asix-sigma/protocol.h
+++ b/src/hardware/asix-sigma/protocol.h
@@ -33,14 +33,6 @@
 
 #define LOG_PREFIX "asix-sigma"
 
-/*
- * Triggers are not working in this implementation. Stop claiming
- * support for the feature which effectively is not available, until
- * the implementation got fixed. Yet keep the code in place and allow
- * developers to turn on this switch during development.
- */
-#define ASIX_SIGMA_WITH_TRIGGER	1
-
 /* Experimental support for OMEGA (scan only, operation is ENOIMPL). */
 #define ASIX_WITH_OMEGA 0
 
@@ -338,6 +330,7 @@ struct dev_context {
 		uint16_t prefix;
 		enum asix_device_type type;
 	} id;
+	char **channel_names;
 	struct {
 		struct ftdi_context ctx;
 		gboolean is_open, must_close;
@@ -359,16 +352,34 @@ struct dev_context {
 		struct sr_sw_limits submit;
 	} limit;
 	enum sigma_firmware_idx firmware_idx;
-	struct {
+	struct sigma_sample_interp {
 		/* Interpretation of sample memory. */
 		size_t num_channels;
 		size_t samples_per_event;
-		uint16_t lastts;
-		uint16_t lastsample;
+		struct {
+			uint16_t ts;
+			uint16_t sample;
+		} last;
+		struct sigma_location {
+			size_t raw, line, cluster, event;
+		} start, stop, trig, iter, trig_arm;
+		struct {
+			size_t lines_total, lines_done;
+			size_t lines_per_read; /* USB transfer limit */
+			size_t lines_rcvd;
+			struct sigma_dram_line *rcvd_lines;
+			struct sigma_dram_line *curr_line;
+		} fetch;
+		struct {
+			gboolean armed;
+			gboolean matched;
+			size_t evt_remain;
+		} trig_chk;
 	} interp;
 	uint64_t capture_ratio;
 	struct sigma_trigger trigger;
 	gboolean use_triggers;
+	gboolean late_trigger_timeout;
 	enum {
 		SIGMA_UNINITIALIZED = 0,
 		SIGMA_CONFIG,