Consistently use 'cg' for channel group variables.

[libsigrok.git] / hardware / hameg-hmo / api.c

diff --git a/hardware/hameg-hmo/api.c b/hardware/hameg-hmo/api.c
index eeccf7cfbf7f5dfc5adeea235f165ee40e275250..3200d64c3b03fddae333f234a82109517466f9ad 100644 (file)
--- a/hardware/hameg-hmo/api.c
+++ b/hardware/hameg-hmo/api.c
@@ -133,10 +133,10 @@ static void clear_helper(void *priv)
        hmo_scope_state_free(devc->model_state);
 
        for (i = 0; i < model->analog_channels; ++i)
-               g_slist_free(devc->analog_groups[i].probes);
+               g_slist_free(devc->analog_groups[i].channels);
 
        for (i = 0; i < model->digital_pods; ++i) {
-               g_slist_free(devc->digital_groups[i].probes);
+               g_slist_free(devc->digital_groups[i].channels);
                g_free(devc->digital_groups[i].name);
        }
 
@@ -183,32 +183,32 @@ static int cleanup(void)
        return SR_OK;
 }
 
-static int check_probe_group(struct dev_context *devc,
-                            const struct sr_probe_group *probe_group)
+static int check_channel_group(struct dev_context *devc,
+                            const struct sr_channel_group *cg)
 {
        unsigned int i;
        struct scope_config *model;
 
        model = devc->model_config;
 
-       if (!probe_group)
+       if (!cg)
                return PG_NONE;
 
        for (i = 0; i < model->analog_channels; ++i)
-               if (probe_group == &devc->analog_groups[i])
+               if (cg == &devc->analog_groups[i])
                        return PG_ANALOG;
 
        for (i = 0; i < model->digital_pods; ++i)
-               if (probe_group == &devc->digital_groups[i])
+               if (cg == &devc->digital_groups[i])
                        return PG_DIGITAL;
 
-       sr_err("Invalid probe group specified.");
+       sr_err("Invalid channel group specified.");
 
        return PG_INVALID;
 }
 
 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)
 {
        int ret, pg_type;
        unsigned int i;
@@ -219,7 +219,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
        if (!sdi || !(devc = sdi->priv))
                return SR_ERR_ARG;
 
-       if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID)
+       if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID)
                return SR_ERR;
 
        ret = SR_ERR_NA;
@@ -231,7 +231,29 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
                *data = g_variant_new_int32(model->num_xdivs);
                ret = SR_OK;
                break;
+       case SR_CONF_TIMEBASE:
+               *data = g_variant_new("(tt)", (*model->timebases)[state->timebase][0],
+                                     (*model->timebases)[state->timebase][1]);
+               ret = SR_OK;
+               break;
        case SR_CONF_NUM_VDIV:
+               if (pg_type == PG_NONE) {
+                       sr_err("No channel group specified.");
+                       return SR_ERR_CHANNEL_GROUP;
+               } else if (pg_type == PG_ANALOG) {
+                       for (i = 0; i < model->analog_channels; ++i) {
+                               if (cg != &devc->analog_groups[i])
+                                       continue;
+                               *data = g_variant_new_int32(model->num_ydivs);
+                               ret = SR_OK;
+                               break;
+                       }
+
+               } else {
+                       ret = SR_ERR_NA;
+               }
+               break;
+       case SR_CONF_VDIV:
                if (pg_type == PG_NONE) {
                        sr_err("No probe group specified.");
                        return SR_ERR_PROBE_GROUP;
@@ -239,7 +261,9 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
                        for (i = 0; i < model->analog_channels; ++i) {
                                if (probe_group != &devc->analog_groups[i])
                                        continue;
-                               *data = g_variant_new_int32(model->num_ydivs);
+                               *data = g_variant_new("(tt)",
+                                                     (*model->vdivs)[state->analog_channels[i].vdiv][0],
+                                                     (*model->vdivs)[state->analog_channels[i].vdiv][1]);
                                ret = SR_OK;
                                break;
                        }
@@ -252,13 +276,21 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
                *data = g_variant_new_string((*model->trigger_sources)[state->trigger_source]);
                ret = SR_OK;
                break;
+       case SR_CONF_TRIGGER_SLOPE:
+               *data = g_variant_new_string((*model->trigger_slopes)[state->trigger_slope]);
+               ret = SR_OK;
+               break;
+       case SR_CONF_HORIZ_TRIGGERPOS:
+               *data = g_variant_new_double(state->horiz_triggerpos);
+               ret = SR_OK;
+               break;
        case SR_CONF_COUPLING:
                if (pg_type == PG_NONE) {
-                       sr_err("No probe group specified.");
-                       return SR_ERR_PROBE_GROUP;
+                       sr_err("No channel group specified.");
+                       return SR_ERR_CHANNEL_GROUP;
                } else if (pg_type == PG_ANALOG) {
                        for (i = 0; i < model->analog_channels; ++i) {
-                               if (probe_group != &devc->analog_groups[i])
+                               if (cg != &devc->analog_groups[i])
                                        continue;
                                *data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]);
                                ret = SR_OK;
@@ -300,7 +332,7 @@ static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n)
 }
 
 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)
 {
        int ret, pg_type;
        unsigned int i, j;
@@ -316,7 +348,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
        if (!sdi || !(devc = sdi->priv))
                return SR_ERR_ARG;
 
-       if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID)
+       if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID)
                return SR_ERR;
 
        model = devc->model_config;
@@ -346,8 +378,8 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
                break;
        case SR_CONF_VDIV:
                if (pg_type == PG_NONE) {
-                       sr_err("No probe group specified.");
-                       return SR_ERR_PROBE_GROUP;
+                       sr_err("No channel group specified.");
+                       return SR_ERR_CHANNEL_GROUP;
                }
 
                g_variant_get(data, "(tt)", &p, &q);
@@ -357,7 +389,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
                            q != (*model->vdivs)[i][1])
                                continue;
                        for (j = 1; j <= model->analog_channels; ++j) {
-                               if (probe_group != &devc->analog_groups[j - 1])
+                               if (cg != &devc->analog_groups[j - 1])
                                        continue;
                                state->analog_channels[j - 1].vdiv = i;
                                g_ascii_formatd(float_str, sizeof(float_str), "%E", (float) p / q);
@@ -429,8 +461,8 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
                break;
        case SR_CONF_COUPLING:
                if (pg_type == PG_NONE) {
-                       sr_err("No probe group specified.");
-                       return SR_ERR_PROBE_GROUP;
+                       sr_err("No channel group specified.");
+                       return SR_ERR_CHANNEL_GROUP;
                }
 
                tmp = g_variant_get_string(data, NULL);
@@ -439,7 +471,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
                        if (strcmp(tmp, (*model->coupling_options)[i]) != 0)
                                continue;
                        for (j = 1; j <= model->analog_channels; ++j) {
-                               if (probe_group != &devc->analog_groups[j - 1])
+                               if (cg != &devc->analog_groups[j - 1])
                                        continue;
                                state->analog_channels[j-1].coupling = i;
 
@@ -472,7 +504,7 @@ 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)
 {
        int pg_type;
        struct dev_context *devc;
@@ -481,7 +513,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
        if (!sdi || !(devc = sdi->priv))
                return SR_ERR_ARG;
 
-       if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID)
+       if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID)
                return SR_ERR;
 
        model = devc->model_config;
@@ -503,7 +535,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
                break;
        case SR_CONF_COUPLING:
                if (pg_type == PG_NONE)
-                       return SR_ERR_PROBE_GROUP;
+                       return SR_ERR_CHANNEL_GROUP;
                *data = g_variant_new_strv(*model->coupling_options,
                           g_strv_length((char **)*model->coupling_options));
                break;
@@ -511,12 +543,16 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
                *data = g_variant_new_strv(*model->trigger_sources,
                           g_strv_length((char **)*model->trigger_sources));
                break;
+       case SR_CONF_TRIGGER_SLOPE:
+               *data = g_variant_new_strv(*model->trigger_slopes,
+                          g_strv_length((char **)*model->trigger_slopes));
+               break;
        case SR_CONF_TIMEBASE:
                *data = build_tuples(model->timebases, model->num_timebases);
                break;
        case SR_CONF_VDIV:
                if (pg_type == PG_NONE)
-                       return SR_ERR_PROBE_GROUP;
+                       return SR_ERR_CHANNEL_GROUP;
                *data = build_tuples(model->vdivs, model->num_vdivs);
                break;
        default: