use common channel group allocation/release code

[libsigrok.git] / src / hardware / itech-it8500 / api.c

diff --git a/src/hardware/itech-it8500/api.c b/src/hardware/itech-it8500/api.c
index fe3b676250bdf773f2205f1e632c86061c51b403..f6156f761de6d72bd0dc03c1099fc6161275dec8 100644 (file)
--- a/src/hardware/itech-it8500/api.c
+++ b/src/hardware/itech-it8500/api.c
@@ -270,9 +270,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sdi->version = g_strdup_printf("%x.%02x", fw_major, fw_minor);
        sdi->serial_num = unit_serial;
 
-       cg = g_malloc0(sizeof(*cg));
-       cg->name = g_strdup("1");
-       sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
+       cg = sr_channel_group_new(sdi, "1", NULL);
        ch = sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "V1");
        cg->channels = g_slist_append(cg->channels, ch);
        ch = sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "I1");
@@ -627,8 +625,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        devc = sdi->priv;
        serial = sdi->conn;
 
-       ret = serial_source_add(sdi->session, serial, G_IO_IN,
-                       (1000.0 / devc->sample_rate),
+       ret = serial_source_add(sdi->session, serial,
+                       G_IO_IN, (1000.0 / devc->sample_rate),
                        itech_it8500_receive_data, (void *)sdi);
        if (ret == SR_OK) {
                sr_sw_limits_acquisition_start(&devc->limits);