X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flink-mso19%2Fprotocol.h;h=809d7f87177648b5756f57b20a03a30a410639b6;hb=b5bbc3f1b00d5f3096c6800af4069fb07704d3a9;hp=77a87bfee216cd5c016e1dc75f7cba0631e1f5c1;hpb=c50277a6ec09fb35de3a6e0f2ae3401bc72a1526;p=libsigrok.git

diff --git a/hardware/link-mso19/protocol.h b/hardware/link-mso19/protocol.h
index 77a87bfe..809d7f87 100644
--- a/hardware/link-mso19/protocol.h
+++ b/hardware/link-mso19/protocol.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2011 Daniel Ribeiro <drwyrm@gmail.com>
  * Copyright (C) 2012 Renato Caldas <rmsc@fe.up.pt>
@@ -29,19 +29,12 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "mso19: "
-#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)
+#define LOG_PREFIX "link-mso19"
 
 #define USB_VENDOR		"3195"
 #define USB_PRODUCT		"f190"
 
-#define NUM_PROBES		8
+#define NUM_CHANNELS		(1 + 8)
 #define NUM_TRIGGER_STAGES	4
 #define TRIGGER_TYPE 		"01"	//the first r/f is used for the whole group
 #define SERIALCOMM		"460800/8n1/flow=2"
@@ -123,7 +116,7 @@ struct dev_context {
 	double dso_trigger_voltage;
 	uint16_t dso_trigger_width;
 	struct mso_prototrig protocol_trigger;
-	void *session_dev_id;
+	void *cb_data;
 	uint16_t buffer_n;
 	char buffer[4096];
 };
@@ -146,7 +139,7 @@ SR_PRIV inline uint16_t mso_calc_raw_from_mv(struct dev_context *devc);
 SR_PRIV int mso_reset_fsm(struct sr_dev_inst *sdi);
 SR_PRIV int mso_toggle_led(struct sr_dev_inst *sdi, int state);
 
-SR_PRIV int mso_configure_probes(const struct sr_dev_inst *sdi);
+SR_PRIV int mso_configure_channels(const struct sr_dev_inst *sdi);
 SR_PRIV void stop_acquisition(const struct sr_dev_inst *sdi);
 
 /* bank agnostic registers */