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

[libsigrok.git] / hardware / atten-pps3xxx / api.c

diff --git a/hardware/atten-pps3xxx/api.c b/hardware/atten-pps3xxx/api.c
index 514ec75630a5a0dc8d177eceeef34704024e0ad0..6dc62511dc4bed0ec9cb9ba51185e699b62101c8 100644 (file)
--- a/hardware/atten-pps3xxx/api.c
+++ b/hardware/atten-pps3xxx/api.c
@@ -43,7 +43,7 @@ static const int32_t devopts[] = {
        SR_CONF_OVER_CURRENT_PROTECTION,
 };
 
-static const int32_t devopts_pg[] = {
+static const int32_t devopts_cg[] = {
        SR_CONF_OUTPUT_VOLTAGE,
        SR_CONF_OUTPUT_VOLTAGE_MAX,
        SR_CONF_OUTPUT_CURRENT,
@@ -87,8 +87,8 @@ static GSList *scan(GSList *options, int modelid)
        struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_config *src;
-       struct sr_probe *probe;
-       struct sr_probe_group *pg;
+       struct sr_channel *ch;
+       struct sr_channel_group *cg;
        struct sr_serial_dev_inst *serial;
        GSList *l, *devices;
        struct pps_model *model;
@@ -126,7 +126,7 @@ static GSList *scan(GSList *options, int modelid)
                return NULL;
        serial_flush(serial);
 
-       /* This is how the vendor software probes for hardware. */
+       /* This is how the vendor software channels for hardware. */
        memset(packet, 0, PACKET_SIZE);
        packet[0] = 0xaa;
        packet[1] = 0xaa;
@@ -167,13 +167,13 @@ static GSList *scan(GSList *options, int modelid)
        sdi->conn = serial;
        for (i = 0; i < MAX_CHANNELS; i++) {
                snprintf(channel, 10, "CH%d", i + 1);
-               probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, channel);
-               sdi->probes = g_slist_append(sdi->probes, probe);
-               pg = g_malloc(sizeof(struct sr_probe_group));
-               pg->name = g_strdup(channel);
-               pg->probes = g_slist_append(NULL, probe);
-               pg->priv = NULL;
-               sdi->probe_groups = g_slist_append(sdi->probe_groups, pg);
+               ch = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, channel);
+               sdi->channels = g_slist_append(sdi->channels, ch);
+               cg = g_malloc(sizeof(struct sr_channel_group));
+               cg->name = g_strdup(channel);
+               cg->channels = g_slist_append(NULL, ch);
+               cg->priv = NULL;
+               sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
        }
 
        devc = g_malloc0(sizeof(struct dev_context));
@@ -200,21 +200,16 @@ 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_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;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        int channel, ret;
 
        if (!sdi)
@@ -223,8 +218,8 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
        devc = sdi->priv;
 
        ret = SR_OK;
-       if (!probe_group) {
-               /* No probe group: global options. */
+       if (!cg) {
+               /* No channel group: global options. */
                switch (key) {
                case SR_CONF_OUTPUT_CHANNEL:
                        *data = g_variant_new_string(channel_modes[devc->channel_mode]);
@@ -236,9 +231,9 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
                        return SR_ERR_NA;
                }
        } else {
-               /* We only ever have one channel per probe group in this driver. */
-               probe = probe_group->probes->data;
-               channel = probe->index;
+               /* We only ever have one channel per channel group in this driver. */
+               ch = cg->channels->data;
+               channel = ch->index;
 
                switch (key) {
                case SR_CONF_OUTPUT_VOLTAGE:
@@ -280,10 +275,10 @@ static int find_str(const char *str, const char **strings, int array_size)
 }
 
 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;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        gdouble dval;
        int channel, ret, ival;
        const char *sval;
@@ -294,8 +289,8 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 
        ret = SR_OK;
        devc = sdi->priv;
-       if (!probe_group) {
-               /* No probe group: global options. */
+       if (!cg) {
+               /* No channel group: global options. */
                switch (key) {
                case SR_CONF_OUTPUT_CHANNEL:
                        sval = g_variant_get_string(data, NULL);
@@ -326,10 +321,10 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
                        return SR_ERR_NA;
                }
        } else {
-               /* Probe group specified: per-channel options. */
-               /* We only ever have one channel per probe group in this driver. */
-               probe = probe_group->probes->data;
-               channel = probe->index;
+               /* Channel group specified: per-channel options. */
+               /* We only ever have one channel per channel group in this driver. */
+               ch = cg->channels->data;
+               channel = ch->index;
 
                switch (key) {
                case SR_CONF_OUTPUT_VOLTAGE_MAX:
@@ -364,10 +359,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)
 {
        struct dev_context *devc;
-       struct sr_probe *probe;
+       struct sr_channel *ch;
        GVariant *gvar;
        GVariantBuilder gvb;
        int channel, ret, i;
@@ -384,8 +379,8 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
        devc = sdi->priv;
 
        ret = SR_OK;
-       if (!probe_group) {
-               /* No probe group: global options. */
+       if (!cg) {
+               /* No channel group: global options. */
                switch (key) {
                case SR_CONF_DEVICE_OPTIONS:
                        *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
@@ -404,17 +399,17 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
                        return SR_ERR_NA;
                }
        } else {
-               /* Probe group specified: per-channel options. */
+               /* Channel group specified: per-channel options. */
                if (!sdi)
                        return SR_ERR_ARG;
-               /* We only ever have one channel per probe group in this driver. */
-               probe = probe_group->probes->data;
-               channel = probe->index;
+               /* We only ever have one channel per channel group in this driver. */
+               ch = cg->channels->data;
+               channel = ch->index;
 
                switch (key) {
                case SR_CONF_DEVICE_OPTIONS:
                        *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-                                       devopts_pg, ARRAY_SIZE(devopts_pg), sizeof(int32_t));
+                                       devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(int32_t));
                        break;
                case SR_CONF_OUTPUT_VOLTAGE_MAX:
                        g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
@@ -478,7 +473,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
        serial_source_add(serial, G_IO_IN, 50, atten_pps3xxx_receive_data, (void *)sdi);
        std_session_send_df_header(cb_data, LOG_PREFIX);
 
-       /* Send a "probe" configuration packet now. */
+       /* Send a "channel" configuration packet now. */
        memset(packet, 0, PACKET_SIZE);
        packet[0] = 0xaa;
        packet[1] = 0xaa;
@@ -510,7 +505,7 @@ SR_PRIV struct sr_dev_driver atten_pps3203_driver_info = {
        .cleanup = cleanup,
        .scan = scan_3203,
        .dev_list = dev_list,
-       .dev_clear = dev_clear,
+       .dev_clear = NULL,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,