X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcem-dt-885x%2Fapi.c;h=1b56227e2358b848fdfda8f2cdf334c750cbdab1;hb=0bcfc9dcd83e3bf8200a268782fddad1f15f17a7;hp=3dbb9a3930274ac41976d50a4e165ed4f299c924;hpb=660e398fe9f5fc608787f8fd75a9df8aac61026f;p=libsigrok.git

diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c
index 3dbb9a39..1b56227e 100644
--- a/hardware/cem-dt-885x/api.c
+++ b/hardware/cem-dt-885x/api.c
@@ -79,7 +79,7 @@ static GSList *scan(GSList *options)
 	struct sr_config *src;
 	struct sr_serial_dev_inst *serial;
 	struct sr_dev_inst *sdi;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	GSList *l, *devices;
 	gint64 start;
 	const char *conn;
@@ -126,9 +126,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, "SPL")))
+			if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "SPL")))
 				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);
 			break;
@@ -166,14 +166,14 @@ static int cleanup(void)
 }
 
 static int config_get(int key, 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;
 	GVariant *range[2];
 	uint64_t low, high;
 	int tmp, ret;
 
-	(void)channel_group;
+	(void)cg;
 
 	if (!sdi)
 		return SR_ERR_ARG;
@@ -238,7 +238,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 }
 
 static int config_set(int key, 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;
 	uint64_t tmp_u64, low, high;
@@ -246,7 +246,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 	int tmp, ret;
 	const char *tmp_str;
 
-	(void)channel_group;
+	(void)cg;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
@@ -328,7 +328,7 @@ static int config_set(int key, 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)
 {
 	GVariant *tuple, *range[2];
 	GVariantBuilder gvb;
@@ -336,7 +336,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 	int ret;
 
 	(void)sdi;
-	(void)channel_group;
+	(void)cg;
 
 	ret = SR_OK;
 	switch (key) {