X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Ffluke-dmm%2Fapi.c;h=83aaad4c17381e9c734e5a5f707476a8748ebbb2;hp=d9d3d9b83f34b65ff5a283ef6c05a03f7af50d9e;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hpb=0bc3ab92e66ee08486e25a9a95b1300e2654fd28

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index d9d3d9b8..83aaad4c 100644
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -69,7 +69,7 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 	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 retry, len, i, s;
@@ -135,9 +135,9 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 				sdi->conn = 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);
 				break;
@@ -204,11 +204,11 @@ static int cleanup(void)
 }
 
 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;
@@ -242,10 +242,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: