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

[libsigrok.git] / hardware / appa-55ii / api.c

diff --git a/hardware/appa-55ii/api.c b/hardware/appa-55ii/api.c
index af22cb5c0e490bab3e9a49c62d8916825780b67e..667b1c97cb36747a93b3b0fe2b179145ef38ffdc 100644 (file)
--- a/hardware/appa-55ii/api.c
+++ b/hardware/appa-55ii/api.c
@@ -52,7 +52,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;
        struct sr_config *src;
        GSList *devices, *l;
        const char *conn, *serialcomm;
@@ -111,12 +111,12 @@ static GSList *scan(GSList *options)
        sdi->priv = devc;
        sdi->driver = di;
 
-       if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "T1")))
+       if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "T1")))
                goto scan_cleanup;
-       sdi->probes = g_slist_append(sdi->probes, probe);
-       if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "T2")))
+       sdi->channels = g_slist_append(sdi->channels, ch);
+       if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "T2")))
                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);
@@ -138,11 +138,11 @@ static int cleanup(void)
 }
 
 static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *channel_group)
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc = sdi->priv;
 
-       (void)channel_group;
+       (void)cg;
 
        switch (key) {
        case SR_CONF_LIMIT_SAMPLES:
@@ -162,13 +162,13 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 }
 
 static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *channel_group)
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        const char *tmp_str;
        unsigned int i;
 
-       (void)channel_group;
+       (void)cg;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -206,10 +206,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_channel_group *channel_group)
+               const struct sr_channel_group *cg)
 {
        (void)sdi;
-       (void)channel_group;
+       (void)cg;
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS: