X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Flink-mso19.h;h=76c9545f7db5aad8ada3400a5edfc5d6481d52b9;hb=39e5d79826cd2c1991007faf1a6cde05af995aa9;hp=506b34697e159891d1627777072ead38d4143988;hpb=a84671913ef320d10607f9c8aabaf6bc3563099b;p=libsigrok.git

diff --git a/hardware/link-mso19/link-mso19.h b/hardware/link-mso19/link-mso19.h
index 506b3469..76c9545f 100644
--- a/hardware/link-mso19/link-mso19.h
+++ b/hardware/link-mso19/link-mso19.h
@@ -18,8 +18,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SIGROK_LINK_MSO19_H
-#define SIGROK_LINK_MSO19_H
+#ifndef LIBSIGROK_HARDWARE_LINK_MSO19_LINK_MSO19_H
+#define LIBSIGROK_HARDWARE_LINK_MSO19_LINK_MSO19_H
+
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "mso-19: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
 
 /* Structure for the pattern generator state */
 struct mso_patgen {
@@ -51,7 +60,7 @@ struct mso_prototrig {
 	uint8_t spimode;
 };
 
-/* our private per-instance data */
+/* Private, per-device-instance driver context. */
 struct mso {
 	/* info */
 	uint8_t hwmodel;
@@ -71,14 +80,14 @@ struct mso {
 	uint8_t dso_probe_attn;
 	uint8_t trigger_chan;
 	uint8_t trigger_slope;
-	uint8_t trigger_spimode;
 	uint8_t trigger_outsrc;
 	uint8_t trigger_state;
 	uint8_t la_trigger;
 	uint8_t la_trigger_mask;
 	double dso_trigger_voltage;
 	uint16_t dso_trigger_width;
-	gpointer session_id;
+	struct mso_prototrig protocol_trigger;
+	void *session_dev_id;
 	uint16_t buffer_n;
 	char buffer[4096];
 };
@@ -150,7 +159,7 @@ static struct rate_map rate_map[] = {
 };
 
 /* FIXME: Determine corresponding voltages */
-uint16_t la_threshold_map[] = {
+static uint16_t la_threshold_map[] = {
 	0x8600,
 	0x8770,
 	0x88ff,