Simplify channel creation.

[libsigrok.git] / src / hardware / teleinfo / api.c

diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c
index 77cd5f8d7e9c91386d59ff1fe4d7147b047eec9c..c1d9b040914f378a0523821aaf1bbea6d1d9813e 100644 (file)
--- 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;
 
@@ -92,71 +91,38 @@ 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", NULL)))
-               goto scan_cleanup;
-
-       if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-               sr_err("Device context malloc failed.");
-               goto scan_cleanup;
-       }
-
+       sdi = g_malloc0(sizeof(struct sr_dev_inst));
+       sdi->status = SR_ST_INACTIVE;
+       sdi->vendor = g_strdup("EDF");
+       sdi->model = g_strdup("Teleinfo");
+       devc = g_malloc0(sizeof(struct dev_context));
        devc->optarif = teleinfo_get_optarif(buf);
-
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
        sdi->priv = devc;
        sdi->driver = di;
 
-       if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P")))
-               goto scan_cleanup;
-       sdi->channels = g_slist_append(sdi->channels, ch);
+       sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P");
 
        if (devc->optarif == OPTARIF_BASE) {
-               if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "BASE")))
-                       goto scan_cleanup;
-               sdi->channels = g_slist_append(sdi->channels, ch);
+               sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "BASE");
        } else if (devc->optarif == OPTARIF_HC) {
-               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_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HC")))
-                       goto scan_cleanup;
-               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) {
-               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_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPM")))
-                       goto scan_cleanup;
-               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) {
-               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_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HPJW")))
-                       goto scan_cleanup;
-               sdi->channels = g_slist_append(sdi->channels, ch);
-               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_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJB")))
-                       goto scan_cleanup;
-               sdi->channels = g_slist_append(sdi->channels, ch);
-               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_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "HCJR")))
-                       goto scan_cleanup;
-               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");
        }
 
-       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_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "PAPP")))
-               goto scan_cleanup;
-       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);