Replace 'probe' with 'channel' in most places.

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

diff --git a/hardware/teleinfo/api.c b/hardware/teleinfo/api.c
index ffbabf0694b918d6ecabe4d97214113477708a77..9ba99129801693fd81373781310a582444e92211 100644 (file)
--- a/hardware/teleinfo/api.c
+++ b/hardware/teleinfo/api.c
@@ -49,7 +49,7 @@ static GSList *scan(GSList *options)
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
        struct sr_dev_inst *sdi;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        GSList *devices = NULL, *l;
        const char *conn = NULL, *serialcomm = NULL;
        uint8_t buf[292];
@@ -107,56 +107,56 @@ static GSList *scan(GSList *options)
        sdi->priv = devc;
        sdi->driver = di;
 
-       if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P")))
+       if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P")))
                goto scan_cleanup;
-       sdi->probes = g_slist_append(sdi->probes, probe);
+       sdi->channels = g_slist_append(sdi->channels, ch);
 
        if (devc->optarif == OPTARIF_BASE) {
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "BASE")))
+               if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "BASE")))
                        goto scan_cleanup;
-               sdi->probes = g_slist_append(sdi->probes, probe);
+               sdi->channels = g_slist_append(sdi->channels, ch);
        } else if (devc->optarif == OPTARIF_HC) {
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HP")))
+               if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HP")))
                        goto scan_cleanup;
-               sdi->probes = g_slist_append(sdi->probes, probe);
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HC")))
+               sdi->channels = g_slist_append(sdi->channels, ch);
+               if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HC")))
                        goto scan_cleanup;
-               sdi->probes = g_slist_append(sdi->probes, probe);
+               sdi->channels = g_slist_append(sdi->channels, ch);
        } else if (devc->optarif == OPTARIF_EJP) {
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HN")))
+               if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HN")))
                        goto scan_cleanup;
-               sdi->probes = g_slist_append(sdi->probes, probe);
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPM")))
+               sdi->channels = g_slist_append(sdi->channels, ch);
+               if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPM")))
                        goto scan_cleanup;
-               sdi->probes = g_slist_append(sdi->probes, probe);
+               sdi->channels = g_slist_append(sdi->channels, ch);
        } else if (devc->optarif == OPTARIF_BBR) {
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPJB")))
+               if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPJB")))
                        goto scan_cleanup;
-               sdi->probes = g_slist_append(sdi->probes, probe);
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPJW")))
+               sdi->channels = g_slist_append(sdi->channels, ch);
+               if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPJW")))
                        goto scan_cleanup;
-               sdi->probes = g_slist_append(sdi->probes, probe);
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPJR")))
+               sdi->channels = g_slist_append(sdi->channels, ch);
+               if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HPJR")))
                        goto scan_cleanup;
-               sdi->probes = g_slist_append(sdi->probes, probe);
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HCJB")))
+               sdi->channels = g_slist_append(sdi->channels, ch);
+               if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HCJB")))
                        goto scan_cleanup;
-               sdi->probes = g_slist_append(sdi->probes, probe);
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HCJW")))
+               sdi->channels = g_slist_append(sdi->channels, ch);
+               if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HCJW")))
                        goto scan_cleanup;
-               sdi->probes = g_slist_append(sdi->probes, probe);
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HCJR")))
+               sdi->channels = g_slist_append(sdi->channels, ch);
+               if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "HCJR")))
                        goto scan_cleanup;
-               sdi->probes = g_slist_append(sdi->probes, probe);
+               sdi->channels = g_slist_append(sdi->channels, ch);
        }
 
-       if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "IINST")))
+       if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "IINST")))
                goto scan_cleanup;
-       sdi->probes = g_slist_append(sdi->probes, probe);
+       sdi->channels = g_slist_append(sdi->channels, ch);
 
-       if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "PAPP")))
+       if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "PAPP")))
                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);
@@ -172,22 +172,17 @@ static GSList *dev_list(void)
        return ((struct drv_context *)(di->priv))->instances;
 }
 
-static int dev_clear(void)
-{
-       return std_dev_clear(di, NULL);
-}
-
 static int cleanup(void)
 {
-       return dev_clear();
+       return std_dev_clear(di, NULL);
 }
 
 static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
-       (void)probe_group;
+       (void)cg;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -214,10 +209,10 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 }
 
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        (void)sdi;
-       (void)probe_group;
+       (void)cg;
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
@@ -281,7 +276,7 @@ SR_PRIV struct sr_dev_driver teleinfo_driver_info = {
        .cleanup = cleanup,
        .scan = scan,
        .dev_list = dev_list,
-       .dev_clear = dev_clear,
+       .dev_clear = NULL,
        .config_get = NULL,
        .config_set = config_set,
        .config_list = config_list,