Fix #442 by renaming sr_dev_driver.priv to .context

[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 31c11e2b361caacf439ad49bf3db9051ab3125e8..fb03d04cdd86ecc615d71235dd28f1471a3abe16 100644 (file)
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -23,12 +23,15 @@
 #define SERIALCOMM "115200/8n1/flow=1"
 
 SR_PRIV struct sr_dev_driver hameg_hmo_driver_info;
-static struct sr_dev_driver *di = &hameg_hmo_driver_info;
 
 static const char *manufacturers[] = {
        "HAMEG",
 };
 
+static const uint32_t drvopts[] = {
+       SR_CONF_OSCILLOSCOPE,
+};
+
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
        SR_CONF_SERIALCOMM,
@@ -41,7 +44,7 @@ enum {
        CG_DIGITAL,
 };
 
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
        return std_init(sr_ctx, di, LOG_PREFIX);
 }
@@ -75,22 +78,20 @@ 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(SR_ST_ACTIVE,
-                                   hw_info->manufacturer, hw_info->model,
-                                   hw_info->firmware_version))) {
-               goto fail;
-       }
-
-       sdi->driver = di;
+       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 = &hameg_hmo_driver_info;
        sdi->inst_type = SR_INST_SCPI;
        sdi->conn = scpi;
-       sdi->serial_num = g_strdup(hw_info->serial_number);
 
        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->priv = devc;
 
@@ -108,20 +109,19 @@ fail:
                sr_scpi_hw_info_free(hw_info);
        if (sdi)
                sr_dev_inst_free(sdi);
-       if (devc)
-               g_free(devc);
+       g_free(devc);
 
        return NULL;
 }
 
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-       return sr_scpi_scan(di->priv, options, hmo_probe_serial_device);
+       return sr_scpi_scan(di->context, options, hmo_probe_serial_device);
 }
 
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
-       return ((struct drv_context *)(di->priv))->instances;
+       return ((struct drv_context *)(di->context))->instances;
 }
 
 static void clear_helper(void *priv)
@@ -138,7 +138,7 @@ static void clear_helper(void *priv)
        g_free(devc);
 }
 
-static int dev_clear(void)
+static int dev_clear(const struct sr_dev_driver *di)
 {
        return std_dev_clear(di, clear_helper);
 }
@@ -168,9 +168,9 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
-       dev_clear();
+       dev_clear(di);
 
        return SR_OK;
 }
@@ -179,7 +179,7 @@ static int check_channel_group(struct dev_context *devc,
                             const struct sr_channel_group *cg)
 {
        unsigned int i;
-       struct scope_config *model;
+       const struct scope_config *model;
 
        model = devc->model_config;
 
@@ -205,7 +205,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        int ret, cg_type;
        unsigned int i;
        struct dev_context *devc;
-       struct scope_config *model;
+       const struct scope_config *model;
        struct scope_state *state;
 
        if (!sdi || !(devc = sdi->priv))
@@ -219,7 +219,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        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;
@@ -330,7 +330,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        unsigned int i, j;
        char command[MAX_COMMAND_SIZE], float_str[30];
        struct dev_context *devc;
-       struct scope_config *model;
+       const struct scope_config *model;
        struct scope_state *state;
        const char *tmp;
        uint64_t p, q;
@@ -498,17 +498,16 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 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;
+       const 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:
@@ -517,9 +516,12 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                break;
        case SR_CONF_DEVICE_OPTIONS:
                if (cg_type == CG_NONE) {
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               model->devopts, model->num_devopts,
-                               sizeof(uint32_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_UINT32,
                                model->analog_devopts, model->num_analog_devopts,
@@ -536,14 +538,20 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                           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:
@@ -563,7 +571,7 @@ SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi)
        char command[MAX_COMMAND_SIZE];
        struct sr_channel *ch;
        struct dev_context *devc;
-       struct scope_config *model;
+       const struct scope_config *model;
 
        devc = sdi->priv;
        model = devc->model_config;
@@ -631,7 +639,7 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
        gboolean *pod_enabled, setup_changed;
        char command[MAX_COMMAND_SIZE];
        struct scope_state *state;
-       struct scope_config *model;
+       const struct scope_config *model;
        struct sr_channel *ch;
        struct dev_context *devc;
        struct sr_scpi_dev_inst *scpi;
@@ -801,5 +809,5 @@ SR_PRIV struct sr_dev_driver hameg_hmo_driver_info = {
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
        .dev_acquisition_stop = dev_acquisition_stop,
-       .priv = NULL,
+       .context = NULL,
 };