X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Fcolead-slm%2Fapi.c;h=a73fe299df1678b390b02c025c43b818d426655e;hp=c3046d4bf26fbbb0aa2d49f481b182736ae14325;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hpb=660e398fe9f5fc608787f8fd75a9df8aac61026f

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index c3046d4b..a73fe299 100644
--- a/hardware/colead-slm/api.c
+++ b/hardware/colead-slm/api.c
@@ -56,7 +56,7 @@ static GSList *scan(GSList *options)
 	struct dev_context *devc;
 	struct sr_dev_inst *sdi;
 	struct sr_config *src;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	GSList *devices, *l;
 	const char *conn, *serialcomm;
 
@@ -97,9 +97,9 @@ static GSList *scan(GSList *options)
 	sdi->inst_type = SR_INST_SERIAL;
 	sdi->priv = devc;
 	sdi->driver = di;
-	if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+	if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
 		return NULL;
-	sdi->probes = g_slist_append(sdi->probes, probe);
+	sdi->channels = g_slist_append(sdi->channels, ch);
 	drvc->instances = g_slist_append(drvc->instances, sdi);
 	devices = g_slist_append(devices, sdi);
 
@@ -130,11 +130,11 @@ static int cleanup(void)
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *channel_group)
+		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 
-	(void)channel_group;
+	(void)cg;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
@@ -168,10 +168,10 @@ 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_channel_group *channel_group)
+		const struct sr_channel_group *cg)
 {
 	(void)sdi;
-	(void)channel_group;
+	(void)cg;
 
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS: