X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fappa-55ii%2Fapi.c;h=38c23b7ccdaaf9f07f7d35e72d816f436a8310ab;hb=5a7e62211c4714ea2aac35baac10cf448373d4f5;hp=997da7f758bb63ad9ef39dfd8ad47cacc8ccb3b3;hpb=91aea754aaed0f0f2a6fc4b2b875f0d0b7c01f8e;p=libsigrok.git

diff --git a/hardware/appa-55ii/api.c b/hardware/appa-55ii/api.c
index 997da7f7..38c23b7c 100644
--- a/hardware/appa-55ii/api.c
+++ b/hardware/appa-55ii/api.c
@@ -52,7 +52,7 @@ static GSList *scan(GSList *options)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 	struct sr_dev_inst *sdi;
-	struct sr_channel *probe;
+	struct sr_channel *ch;
 	struct sr_config *src;
 	GSList *devices, *l;
 	const char *conn, *serialcomm;
@@ -96,7 +96,7 @@ static GSList *scan(GSList *options)
 
 	sr_info("Found device on port %s.", conn);
 
-	if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "APPA", "55II", "")))
+	if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "APPA", "55II", NULL)))
 		goto scan_cleanup;
 
 	if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
@@ -111,12 +111,12 @@ static GSList *scan(GSList *options)
 	sdi->priv = devc;
 	sdi->driver = di;
 
-	if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "T1")))
+	if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "T1")))
 		goto scan_cleanup;
-	sdi->probes = g_slist_append(sdi->probes, probe);
-	if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "T2")))
+	sdi->channels = g_slist_append(sdi->channels, ch);
+	if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "T2")))
 		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);