X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fteleinfo%2Fapi.c;h=c4fd846716878241d1151bba3679e8e5cc7a8e1b;hb=102f12396660e0784134bccce5cc0679db325751;hp=9ba99129801693fd81373781310a582444e92211;hpb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;p=libsigrok.git

diff --git a/hardware/teleinfo/api.c b/hardware/teleinfo/api.c
index 9ba99129..c4fd8467 100644
--- a/hardware/teleinfo/api.c
+++ b/hardware/teleinfo/api.c
@@ -92,7 +92,7 @@ static GSList *scan(GSList *options)
 
 	sr_info("Found device on port %s.", conn);
 
-	if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "EDF", "Teleinfo", "")))
+	if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, "EDF", "Teleinfo", NULL)))
 		goto scan_cleanup;
 
 	if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
@@ -107,54 +107,54 @@ static GSList *scan(GSList *options)
 	sdi->priv = devc;
 	sdi->driver = di;
 
-	if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P")))
+	if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P")))
 		goto scan_cleanup;
 	sdi->channels = g_slist_append(sdi->channels, ch);
 
 	if (devc->optarif == OPTARIF_BASE) {
-		if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "BASE")))
+		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "BASE")))
 			goto scan_cleanup;
 		sdi->channels = g_slist_append(sdi->channels, ch);
 	} else if (devc->optarif == OPTARIF_HC) {
-		if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HP")))
+		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HP")))
 			goto scan_cleanup;
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HC")))
+		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HC")))
 			goto scan_cleanup;
 		sdi->channels = g_slist_append(sdi->channels, ch);
 	} else if (devc->optarif == OPTARIF_EJP) {
-		if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HN")))
+		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HN")))
 			goto scan_cleanup;
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPM")))
+		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPM")))
 			goto scan_cleanup;
 		sdi->channels = g_slist_append(sdi->channels, ch);
 	} else if (devc->optarif == OPTARIF_BBR) {
-		if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPJB")))
+		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJB")))
 			goto scan_cleanup;
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPJW")))
+		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJW")))
 			goto scan_cleanup;
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPJR")))
+		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJR")))
 			goto scan_cleanup;
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HCJB")))
+		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJB")))
 			goto scan_cleanup;
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HCJW")))
+		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJW")))
 			goto scan_cleanup;
 		sdi->channels = g_slist_append(sdi->channels, ch);
-		if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HCJR")))
+		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJR")))
 			goto scan_cleanup;
 		sdi->channels = g_slist_append(sdi->channels, ch);
 	}
 
-	if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "IINST")))
+	if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "IINST")))
 		goto scan_cleanup;
 	sdi->channels = g_slist_append(sdi->channels, ch);
 
-	if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "PAPP")))
+	if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "PAPP")))
 		goto scan_cleanup;
 	sdi->channels = g_slist_append(sdi->channels, ch);
 
@@ -257,7 +257,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	std_session_send_df_header(cb_data, LOG_PREFIX);
 
 	/* Poll every 50ms, or whenever some data comes in. */
-	serial_source_add(serial, G_IO_IN, 50, teleinfo_receive_data, (void *)sdi);
+	serial_source_add(sdi->session, serial, G_IO_IN, 50,
+			teleinfo_receive_data, (void *)sdi);
 
 	return SR_OK;
 }