X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fapi.c;h=136d2a7cc002082dfbe6a2c4bba0d8c46613f68c;hb=46641facd4ad8de4a93910d7089c7b289b412443;hp=93487920a7c5fc299ec87b9a091d121d52206d27;hpb=e83437ae206dea1bce85c8b46f7c56ebb9667bda;p=libsigrok.git

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 93487920..136d2a7c 100644
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -337,7 +337,7 @@ static GSList *sdmm_scan(const char *conn, const char *serialcomm, int dmm)
 	struct sr_dev_inst *sdi;
 	struct drv_context *drvc;
 	struct dev_context *devc;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	struct sr_serial_dev_inst *serial;
 	GSList *devices;
 	int dropped, ret;
@@ -392,7 +392,7 @@ static GSList *sdmm_scan(const char *conn, const char *serialcomm, int dmm)
 	sr_info("Found device on port %s.", conn);
 
 	if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, dmms[dmm].vendor,
-				    dmms[dmm].device, "")))
+				    dmms[dmm].device, NULL)))
 		goto scan_cleanup;
 
 	if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
@@ -405,9 +405,9 @@ static GSList *sdmm_scan(const char *conn, const char *serialcomm, int dmm)
 
 	sdi->priv = devc;
 	sdi->driver = dmms[dmm].di;
-	if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+	if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
 		goto scan_cleanup;
-	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);
 
@@ -460,11 +460,11 @@ static int cleanup(int dmm)
 }
 
 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)
 {
 	struct dev_context *devc;
 
-	(void)probe_group;
+	(void)cg;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
@@ -493,10 +493,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_probe_group *probe_group)
+		const struct sr_channel_group *cg)
 {
 	(void)sdi;
-	(void)probe_group;
+	(void)cg;
 
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS: