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

[libsigrok.git] / hardware / center-3xx / api.c

diff --git a/hardware/center-3xx/api.c b/hardware/center-3xx/api.c
index c7539da8525ad2a559d55bcf7ffd3026220b618f..e2b9900472c7acf16e497630ff0a01a216b9c674 100644 (file)
--- a/hardware/center-3xx/api.c
+++ b/hardware/center-3xx/api.c
@@ -32,7 +32,7 @@ static const int32_t hwcaps[] = {
        SR_CONF_CONTINUOUS,
 };
 
-static const char *probe_names[] = {
+static const char *channel_names[] = {
        "T1", "T2", "T3", "T4",
        NULL,
 };
@@ -71,7 +71,7 @@ static GSList *center_scan(const char *conn, const char *serialcomm, int idx)
        struct sr_dev_inst *sdi;
        struct drv_context *drvc;
        struct dev_context *devc;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        struct sr_serial_dev_inst *serial;
        GSList *devices;
 
@@ -103,10 +103,10 @@ static GSList *center_scan(const char *conn, const char *serialcomm, int idx)
        sdi->driver = center_devs[idx].di;
 
        for (i = 0; i <  center_devs[idx].num_channels; i++) {
-               if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG,
-                                          TRUE, probe_names[i])))
+               if (!(ch = sr_probe_new(i, SR_PROBE_ANALOG,
+                                          TRUE, channel_names[i])))
                        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);
@@ -161,11 +161,11 @@ static int cleanup(int idx)
 }
 
 static int config_set(int id, 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;
 
-       (void)channel_group;
+       (void)cg;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -191,10 +191,10 @@ static int config_set(int id, 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: