X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fapi.c;h=994c43e1a0fc8c6e3be81dee19c01169884e1826;hb=87dc5410273abf9307dc25a2528a6aa98a8ae44b;hp=f8fc644cbb2c99b4667451a9998a87a1b85c3059;hpb=4889acefb2178f0c7f52ff9d97aa50d2b5607aa6;p=libsigrok.git diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c index f8fc644c..994c43e1 100644 --- a/src/hardware/hameg-hmo/api.c +++ b/src/hardware/hameg-hmo/api.c @@ -31,15 +31,15 @@ static const char *manufacturers[] = { "Rohde&Schwarz", }; -static const uint32_t drvopts[] = { - SR_CONF_OSCILLOSCOPE, -}; - static const uint32_t scanopts[] = { SR_CONF_CONN, SR_CONF_SERIALCOMM, }; +static const uint32_t drvopts[] = { + SR_CONF_OSCILLOSCOPE, +}; + enum { CG_INVALID = -1, CG_NONE, @@ -98,10 +98,8 @@ static struct sr_dev_inst *hmo_probe_serial_device(struct sr_scpi_dev_inst *scpi return sdi; fail: - if (hw_info) - sr_scpi_hw_info_free(hw_info); - if (sdi) - sr_dev_inst_free(sdi); + sr_scpi_hw_info_free(hw_info); + sr_dev_inst_free(sdi); g_free(devc); return NULL; @@ -112,48 +110,32 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return sr_scpi_scan(di->context, options, hmo_probe_serial_device); } -static void clear_helper(void *priv) +static void clear_helper(struct dev_context *devc) { - struct dev_context *devc; - - devc = priv; - hmo_scope_state_free(devc->model_state); - g_free(devc->analog_groups); g_free(devc->digital_groups); - - g_free(devc); } static int dev_clear(const struct sr_dev_driver *di) { - return std_dev_clear(di, clear_helper); + return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper); } static int dev_open(struct sr_dev_inst *sdi) { - if (sdi->status != SR_ST_ACTIVE && sr_scpi_open(sdi->conn) != SR_OK) + if (sr_scpi_open(sdi->conn) != SR_OK) return SR_ERR; if (hmo_scope_state_get(sdi) != SR_OK) return SR_ERR; - sdi->status = SR_ST_ACTIVE; - return SR_OK; } static int dev_close(struct sr_dev_inst *sdi) { - if (sdi->status == SR_ST_INACTIVE) - return SR_OK; - - sr_scpi_close(sdi->conn); - - sdi->status = SR_ST_INACTIVE; - - return SR_OK; + return sr_scpi_close(sdi->conn); } static int check_channel_group(struct dev_context *devc, @@ -180,8 +162,8 @@ static int check_channel_group(struct dev_context *devc, return CG_INVALID; } -static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +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; unsigned int i; @@ -213,7 +195,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s break; case SR_CONF_NUM_VDIV: if (cg_type == CG_NONE) { - sr_err("No channel group specified."); return SR_ERR_CHANNEL_GROUP; } else if (cg_type == CG_ANALOG) { for (i = 0; i < model->analog_channels; i++) { @@ -230,7 +211,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s break; case SR_CONF_VDIV: if (cg_type == CG_NONE) { - sr_err("No channel group specified."); return SR_ERR_CHANNEL_GROUP; } else if (cg_type == CG_ANALOG) { for (i = 0; i < model->analog_channels; i++) { @@ -261,7 +241,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s break; case SR_CONF_COUPLING: if (cg_type == CG_NONE) { - sr_err("No channel group specified."); return SR_ERR_CHANNEL_GROUP; } else if (cg_type == CG_ANALOG) { for (i = 0; i < model->analog_channels; i++) { @@ -287,27 +266,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s return ret; } -static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n) -{ - unsigned int i; - GVariant *rational[2]; - GVariantBuilder gvb; - - g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - - for (i = 0; i < n; i++) { - rational[0] = g_variant_new_uint64((*array)[i][0]); - rational[1] = g_variant_new_uint64((*array)[i][1]); - - /* FIXME: Valgrind reports a memory leak here. */ - g_variant_builder_add_value(&gvb, g_variant_new_tuple(rational, 2)); - } - - return g_variant_builder_end(&gvb); -} - -static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +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; unsigned int i, j; @@ -354,10 +314,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd } break; case SR_CONF_VDIV: - if (cg_type == CG_NONE) { - sr_err("No channel group specified."); + if (cg_type == CG_NONE) return SR_ERR_CHANNEL_GROUP; - } g_variant_get(data, "(tt)", &p, &q); @@ -437,10 +395,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd } break; case SR_CONF_COUPLING: - if (cg_type == CG_NONE) { - sr_err("No channel group specified."); + if (cg_type == CG_NONE) return SR_ERR_CHANNEL_GROUP; - } tmp = g_variant_get_string(data, NULL); @@ -480,8 +436,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd return ret; } -static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_list(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { int cg_type = CG_NONE; struct dev_context *devc = NULL; @@ -497,24 +453,18 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * switch (key) { case SR_CONF_SCAN_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); + *data = std_gvar_array_u32(ARRAY_AND_SIZE(scanopts)); break; case SR_CONF_DEVICE_OPTIONS: if (cg_type == CG_NONE) { if (model) - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - model->devopts, model->num_devopts, sizeof(uint32_t)); + *data = std_gvar_array_u32((const uint32_t *)model->devopts, model->num_devopts); else - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); + *data = std_gvar_array_u32(ARRAY_AND_SIZE(drvopts)); } else if (cg_type == CG_ANALOG) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - model->analog_devopts, model->num_analog_devopts, - sizeof(uint32_t)); + *data = std_gvar_array_u32((const uint32_t *)model->devopts_cg_analog, model->num_devopts_cg_analog); } else { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - NULL, 0, sizeof(uint32_t)); + *data = std_gvar_array_u32(NULL, 0); } break; case SR_CONF_COUPLING: @@ -538,12 +488,12 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * case SR_CONF_TIMEBASE: if (!model) return SR_ERR_ARG; - *data = build_tuples(model->timebases, model->num_timebases); + *data = std_gvar_tuple_array(*model->timebases, model->num_timebases); break; case SR_CONF_VDIV: if (cg_type == CG_NONE) return SR_ERR_CHANNEL_GROUP; - *data = build_tuples(model->vdivs, model->num_vdivs); + *data = std_gvar_tuple_array(*model->vdivs, model->num_vdivs); break; default: return SR_ERR_NA; @@ -729,9 +679,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) struct sr_scpi_dev_inst *scpi; int ret; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - scpi = sdi->conn; devc = sdi->priv; @@ -813,9 +760,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) std_session_send_df_end(sdi); - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; devc->num_frames = 0;