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

[libsigrok.git] / hardware / brymen-bm86x / api.c

diff --git a/hardware/brymen-bm86x/api.c b/hardware/brymen-bm86x/api.c
index 802d443abe8cc6f316e34cba8328e3202c75a85e..22a4862af4da0d5dcffbd0719ae8a5b8a6269ce9 100644 (file)
--- a/hardware/brymen-bm86x/api.c
+++ b/hardware/brymen-bm86x/api.c
@@ -48,7 +48,7 @@ static GSList *scan(GSList *options)
        struct sr_dev_inst *sdi;
        struct sr_usb_dev_inst *usb;
        struct sr_config *src;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        const char *conn;
 
        drvc = di->priv;
@@ -86,12 +86,12 @@ static GSList *scan(GSList *options)
 
                sdi->priv = devc;
                sdi->driver = di;
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+               if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
                        return NULL;
-               sdi->probes = g_slist_append(sdi->probes, probe);
-               if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P2")))
+               sdi->channels = g_slist_append(sdi->channels, ch);
+               if (!(ch = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P2")))
                        return NULL;
-               sdi->probes = g_slist_append(sdi->probes, probe);
+               sdi->channels = g_slist_append(sdi->channels, ch);
 
                sdi->inst_type = SR_INST_USB;
                sdi->conn = usb;
@@ -183,11 +183,11 @@ static int cleanup(void)
 }
 
 static int config_get(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 = sdi->priv;
 
-       (void)probe_group;
+       (void)cg;
 
        switch (key) {
        case SR_CONF_LIMIT_SAMPLES:
@@ -204,11 +204,11 @@ 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_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;
@@ -235,10 +235,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: