X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fteleinfo%2Fapi.c;h=c1d9b040914f378a0523821aaf1bbea6d1d9813e;hb=16aca7661b7ab34a399c323bb9214721e2b1be0c;hp=6089f3a5a918ac46b4cb65ac05de60f087772641;hpb=c368e6f3d248a73d69cd0c2c4a7c88a92def55e3;p=libsigrok.git

diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c
index 6089f3a5..c1d9b040 100644
--- a/src/hardware/teleinfo/api.c
+++ b/src/hardware/teleinfo/api.c
@@ -49,7 +49,6 @@ static GSList *scan(GSList *options)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 	struct sr_dev_inst *sdi;
-	struct sr_channel *ch;
 	GSList *devices = NULL, *l;
 	const char *conn = NULL, *serialcomm = NULL;
 	uint8_t buf[292];
@@ -74,8 +73,8 @@ static GSList *scan(GSList *options)
 	if (!serialcomm)
 		serialcomm = "1200/7e1";
 
-	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-		return NULL;
+	serial = sr_serial_dev_inst_new(conn, serialcomm);
+
 	if (serial_open(serial, SERIAL_RDONLY) != SR_OK)
 		return NULL;
 
@@ -103,42 +102,27 @@ static GSList *scan(GSList *options)
 	sdi->priv = devc;
 	sdi->driver = di;
 
-	ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P");
-	sdi->channels = g_slist_append(sdi->channels, ch);
+	sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P");
 
 	if (devc->optarif == OPTARIF_BASE) {
-		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "BASE");
-		sdi->channels = g_slist_append(sdi->channels, ch);
+		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "BASE");
 	} else if (devc->optarif == OPTARIF_HC) {
-		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HP");
-		sdi->channels = g_slist_append(sdi->channels, ch);
-		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HC");
-		sdi->channels = g_slist_append(sdi->channels, ch);
+		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HP");
+		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HC");
 	} else if (devc->optarif == OPTARIF_EJP) {
-		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HN");
-		sdi->channels = g_slist_append(sdi->channels, ch);
-		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPM");
-		sdi->channels = g_slist_append(sdi->channels, ch);
+		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HN");
+		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HPM");
 	} else if (devc->optarif == OPTARIF_BBR) {
-		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJB");
-		sdi->channels = g_slist_append(sdi->channels, ch);
-		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJW");
-		sdi->channels = g_slist_append(sdi->channels, ch);
-		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJR");
-		sdi->channels = g_slist_append(sdi->channels, ch);
-		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJB");
-		sdi->channels = g_slist_append(sdi->channels, ch);
-		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJW");
-		sdi->channels = g_slist_append(sdi->channels, ch);
-		ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJR");
-		sdi->channels = g_slist_append(sdi->channels, ch);
+		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HPJB");
+		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HPJW");
+		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HPJR");
+		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HCJB");
+		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HCJW");
+		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "HCJR");
 	}
 
-	ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "IINST");
-	sdi->channels = g_slist_append(sdi->channels, ch);
-
-	ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "PAPP");
-	sdi->channels = g_slist_append(sdi->channels, ch);
+	sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "IINST");
+	sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "PAPP");
 
 	drvc->instances = g_slist_append(drvc->instances, sdi);
 	devices = g_slist_append(devices, sdi);