X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic16%2Fprotocol.h;h=8a1ded823900e7ae41c194f355d1a73b5f07fb15;hb=f2a189f0a7737d6abc1140b61a554c4a9f1efb70;hp=6faa8b68f91e0ed3e968cfe793888f99234e66b8;hpb=6c60facc190a03c50aa66d4b1d17c825fec5d20e;p=libsigrok.git

diff --git a/hardware/saleae-logic16/protocol.h b/hardware/saleae-logic16/protocol.h
index 6faa8b68..8a1ded82 100644
--- a/hardware/saleae-logic16/protocol.h
+++ b/hardware/saleae-logic16/protocol.h
@@ -27,14 +27,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "saleae-logic16: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "saleae-logic16"
 
 enum voltage_range {
 	VOLTAGE_RANGE_UNKNOWN,
@@ -70,14 +63,17 @@ struct dev_context {
 	/* EEPROM data from address 8. */
 	uint8_t eeprom_data[8];
 
-	int64_t num_samples;
+	int64_t sent_samples;
 	int submitted_transfers;
 	int empty_transfer_count;
-	int num_channels, cur_channel;
+	int num_channels;
+	int cur_channel;
 	uint16_t channel_masks[16];
 	uint16_t channel_data[16];
 	uint8_t *convbuffer;
 	size_t convbuffer_size;
+	struct soft_trigger_logic *stl;
+	gboolean trigger_fired;
 
 	void *cb_data;
 	unsigned int num_transfers;