Rename SR_CONF_NUM_TIMEBASE to SR_CONF_NUM_HDIV.

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

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index 7f3d5f549321e0cc6025ee16f7a20624b3da1e44..77feac8637d54c00d039fd761cf5a39794bba0d3 100644 (file)
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -29,7 +29,11 @@ static const char *manufacturers[] = {
        "HAMEG",
 };
 
-static const int32_t scanopts[] = {
+static const uint32_t drvopts[] = {
+       SR_CONF_OSCILLOSCOPE,
+};
+
+static const uint32_t scanopts[] = {
        SR_CONF_CONN,
        SR_CONF_SERIALCOMM,
 };
@@ -75,21 +79,22 @@ static struct sr_dev_inst *hmo_probe_serial_device(struct sr_scpi_dev_inst *scpi
        if (check_manufacturer(hw_info->manufacturer) != SR_OK)
                goto fail;
 
-       if (!(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE,
-                                   hw_info->manufacturer, hw_info->model,
-                                   hw_info->firmware_version))) {
-               goto fail;
-       }
+       sdi = g_malloc0(sizeof(struct sr_dev_inst));
+       sdi->status = SR_ST_ACTIVE;
+       sdi->vendor = g_strdup(hw_info->manufacturer);
+       sdi->model = g_strdup(hw_info->model);
+       sdi->version = g_strdup(hw_info->firmware_version);
+       sdi->serial_num = g_strdup(hw_info->serial_number);
+       sdi->driver = di;
+       sdi->inst_type = SR_INST_SCPI;
+       sdi->conn = scpi;
+
        sr_scpi_hw_info_free(hw_info);
        hw_info = NULL;
 
-       if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
-               goto fail;
+       devc = g_malloc0(sizeof(struct dev_context));
 
-       sdi->driver = di;
        sdi->priv = devc;
-       sdi->inst_type = SR_INST_SCPI;
-       sdi->conn = scpi;
 
        if (hmo_init_device(sdi) != SR_OK)
                goto fail;
@@ -123,23 +128,12 @@ static GSList *dev_list(void)
 
 static void clear_helper(void *priv)
 {
-       unsigned int i;
        struct dev_context *devc;
-       struct scope_config *model;
 
        devc = priv;
-       model = devc->model_config;
 
        hmo_scope_state_free(devc->model_state);
 
-       for (i = 0; i < model->analog_channels; ++i)
-               g_slist_free(devc->analog_groups[i].channels);
-
-       for (i = 0; i < model->digital_pods; ++i) {
-               g_slist_free(devc->digital_groups[i].channels);
-               g_free(devc->digital_groups[i].name);
-       }
-
        g_free(devc->analog_groups);
        g_free(devc->digital_groups);
 
@@ -195,11 +189,11 @@ static int check_channel_group(struct dev_context *devc,
                return CG_NONE;
 
        for (i = 0; i < model->analog_channels; ++i)
-               if (cg == &devc->analog_groups[i])
+               if (cg == devc->analog_groups[i])
                        return CG_ANALOG;
 
        for (i = 0; i < model->digital_pods; ++i)
-               if (cg == &devc->digital_groups[i])
+               if (cg == devc->digital_groups[i])
                        return CG_DIGITAL;
 
        sr_err("Invalid channel group specified.");
@@ -207,7 +201,7 @@ static int check_channel_group(struct dev_context *devc,
        return CG_INVALID;
 }
 
-static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                      const struct sr_channel_group *cg)
 {
        int ret, cg_type;
@@ -227,7 +221,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
        state = devc->model_state;
 
        switch (key) {
-       case SR_CONF_NUM_TIMEBASE:
+       case SR_CONF_NUM_HDIV:
                *data = g_variant_new_int32(model->num_xdivs);
                ret = SR_OK;
                break;
@@ -242,7 +236,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
                        return SR_ERR_CHANNEL_GROUP;
                } else if (cg_type == CG_ANALOG) {
                        for (i = 0; i < model->analog_channels; ++i) {
-                               if (cg != &devc->analog_groups[i])
+                               if (cg != devc->analog_groups[i])
                                        continue;
                                *data = g_variant_new_int32(model->num_ydivs);
                                ret = SR_OK;
@@ -259,7 +253,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
                        return SR_ERR_CHANNEL_GROUP;
                } else if (cg_type == CG_ANALOG) {
                        for (i = 0; i < model->analog_channels; ++i) {
-                               if (cg != &devc->analog_groups[i])
+                               if (cg != devc->analog_groups[i])
                                        continue;
                                *data = g_variant_new("(tt)",
                                                      (*model->vdivs)[state->analog_channels[i].vdiv][0],
@@ -290,7 +284,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
                        return SR_ERR_CHANNEL_GROUP;
                } else if (cg_type == CG_ANALOG) {
                        for (i = 0; i < model->analog_channels; ++i) {
-                               if (cg != &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;
@@ -331,7 +325,7 @@ static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n)
        return g_variant_builder_end(&gvb);
 }
 
-static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
+static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
                      const struct sr_channel_group *cg)
 {
        int ret, cg_type;
@@ -389,7 +383,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 (cg != &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);
@@ -471,7 +465,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 (cg != &devc->analog_groups[j - 1])
+                               if (cg != devc->analog_groups[j - 1])
                                        continue;
                                state->analog_channels[j-1].coupling = i;
 
@@ -503,38 +497,40 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
        return ret;
 }
 
-static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                       const struct sr_channel_group *cg)
 {
-       int cg_type;
-       struct dev_context *devc;
-       struct scope_config *model;
+       int cg_type = CG_NONE;
+       struct dev_context *devc = NULL;
+       struct scope_config *model = NULL;
 
-       if (!sdi || !(devc = sdi->priv))
-               return SR_ERR_ARG;
-
-       if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
-               return SR_ERR;
+       if (sdi && (devc = sdi->priv)) {
+               if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
+                       return SR_ERR;
 
-       model = devc->model_config;
+               model = devc->model_config;
+       }
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-                               scanopts, ARRAY_SIZE(scanopts), sizeof(int32_t));
+               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                               scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
                break;
        case SR_CONF_DEVICE_OPTIONS:
                if (cg_type == CG_NONE) {
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-                               model->hw_caps, model->num_hwcaps,
-                               sizeof(int32_t));
+                       if (model)
+                               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                                       model->devopts, model->num_devopts, sizeof(uint32_t));
+                       else
+                               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                                       drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
                } else if (cg_type == CG_ANALOG) {
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-                               model->analog_hwcaps, model->num_analog_hwcaps,
-                               sizeof(int32_t));
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                               model->analog_devopts, model->num_analog_devopts,
+                               sizeof(uint32_t));
                } else {
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-                               NULL, 0, sizeof(int32_t));
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                               NULL, 0, sizeof(uint32_t));
                }
                break;
        case SR_CONF_COUPLING:
@@ -544,14 +540,20 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
                           g_strv_length((char **)*model->coupling_options));
                break;
        case SR_CONF_TRIGGER_SOURCE:
+               if (!model)
+                       return SR_ERR_ARG;
                *data = g_variant_new_strv(*model->trigger_sources,
                           g_strv_length((char **)*model->trigger_sources));
                break;
        case SR_CONF_TRIGGER_SLOPE:
+               if (!model)
+                       return SR_ERR_ARG;
                *data = g_variant_new_strv(*model->trigger_slopes,
                           g_strv_length((char **)*model->trigger_slopes));
                break;
        case SR_CONF_TIMEBASE:
+               if (!model)
+                       return SR_ERR_ARG;
                *data = build_tuples(model->timebases, model->num_timebases);
                break;
        case SR_CONF_VDIV: