X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Flink-mso19%2Fapi.c;h=f1b28e93bca7313a1145dc89d7b2a24606bbf151;hp=654f876ed853ec454376be525cff2f58f8bfa507;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hpb=ca9b9f4834f106ba8387cf962a216425e0476de5

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index 654f876e..f1b28e93 100644
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -33,11 +33,11 @@ static const int32_t hwcaps[] = {
 };
 
 /*
- * Probes are numbered 0 to 7.
+ * Channels are numbered 0 to 7.
  *
  * See also: http://www.linkinstruments.com/images/mso19_1113.gif
  */
-SR_PRIV const char *mso19_probe_names[NUM_PROBES + 1] = {
+SR_PRIV const char *mso19_channel_names[NUM_PROBES + 1] = {
 	/* Note: DSO needs to be first. */
 	"DSO", "0", "1", "2", "3", "4", "5", "6", "7", NULL,
 };
@@ -217,12 +217,12 @@ static GSList *scan(GSList *options)
 		sdi->priv = devc;
 
 		for (i = 0; i < NUM_PROBES; i++) {
-			struct sr_probe *probe;
+			struct sr_channel *ch;
 			ptype = (i == 0) ? SR_PROBE_ANALOG : SR_PROBE_LOGIC;
-			if (!(probe = sr_probe_new(i, ptype, TRUE,
-						   mso19_probe_names[i])))
+			if (!(ch = sr_probe_new(i, ptype, TRUE,
+						   mso19_channel_names[i])))
 				return 0;
-			sdi->probes = g_slist_append(sdi->probes, probe);
+			sdi->channels = g_slist_append(sdi->channels, ch);
 		}
 
 		//Add the driver
@@ -276,11 +276,11 @@ static int cleanup(void)
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_probe_group *probe_group)
+		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 
-	(void)probe_group;
+	(void)cg;
 
 	switch (id) {
 	case SR_CONF_SAMPLERATE:
@@ -298,7 +298,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
-		const struct sr_probe_group *probe_group)
+		const struct sr_channel_group *cg)
 {
 	int ret;
 	struct dev_context *devc;
@@ -307,7 +307,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 	int trigger_pos;
 	double pos;
 
-	(void)probe_group;
+	(void)cg;
 	devc = sdi->priv;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -369,12 +369,12 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 }
 
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_probe_group *probe_group)
+		const struct sr_channel_group *cg)
 {
 	GVariant *gvar;
 	GVariantBuilder gvb;
 
-	(void)probe_group;
+	(void)cg;
 	(void)sdi;
 
 	switch (key) {
@@ -409,8 +409,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 	devc = sdi->priv;
 
-	if (mso_configure_probes(sdi) != SR_OK) {
-		sr_err("Failed to configure probes.");
+	if (mso_configure_channels(sdi) != SR_OK) {
+		sr_err("Failed to configure channels.");
 		return SR_ERR;
 	}
 
@@ -457,7 +457,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	/* Send header packet to the session bus. */
 	std_session_send_df_header(cb_data, LOG_PREFIX);
 
-	/* Our first probe is analog, the other 8 are of type 'logic'. */
+	/* Our first channel is analog, the other 8 are of type 'logic'. */
 	/* TODO. */
 
 	serial_source_add(devc->serial, G_IO_IN, -1, mso_receive_data, cb_data);