X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fapi.c;h=f7ec7149b93cc14cbadc2de303ad797bffe0195c;hb=697fb6ddfc2522b2e6d35511c7837e2c61d8ae73;hp=f47489315d903f63a9515bc1ba09ee43b639f1f7;hpb=1b0f62df2294af7f4fa9b8ecaed76a5658802095;p=libsigrok.git diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c index f4748931..f7ec7149 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, @@ -47,17 +47,6 @@ enum { CG_DIGITAL, }; -static int check_manufacturer(const char *manufacturer) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(manufacturers); i++) - if (!strcmp(manufacturer, manufacturers[i])) - return SR_OK; - - return SR_ERR; -} - static struct sr_dev_inst *hmo_probe_serial_device(struct sr_scpi_dev_inst *scpi) { struct sr_dev_inst *sdi; @@ -73,7 +62,7 @@ static struct sr_dev_inst *hmo_probe_serial_device(struct sr_scpi_dev_inst *scpi goto fail; } - if (check_manufacturer(hw_info->manufacturer) != SR_OK) + if (std_str_idx_s(hw_info->manufacturer, ARRAY_AND_SIZE(manufacturers)) < 0) goto fail; sdi = g_malloc0(sizeof(struct sr_dev_inst)); @@ -98,10 +87,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 +99,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 +151,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 +184,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 +200,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 +230,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,36 +255,16 @@ 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; + int ret, cg_type, idx; unsigned int i, j; char command[MAX_COMMAND_SIZE], float_str[30]; struct dev_context *devc; const struct scope_config *model; struct scope_state *state; const char *tmp; - uint64_t p, q; double tmp_d; gboolean update_sample_rate; @@ -354,54 +302,37 @@ 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); - - for (i = 0; i < model->num_vdivs; i++) { - if (p != (*model->vdivs)[i][0] || - q != (*model->vdivs)[i][1]) + if ((idx = std_u64_tuple_idx(data, *model->vdivs, model->num_vdivs)) < 0) + return SR_ERR_ARG; + for (j = 1; j <= model->analog_channels; j++) { + if (cg != devc->analog_groups[j - 1]) continue; - for (j = 1; j <= model->analog_channels; j++) { - 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); - g_snprintf(command, sizeof(command), - (*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_DIV], - j, float_str); - - if (sr_scpi_send(sdi->conn, command) != SR_OK || - sr_scpi_get_opc(sdi->conn) != SR_OK) - return SR_ERR; - - break; - } - - ret = SR_OK; + state->analog_channels[j - 1].vdiv = idx; + g_ascii_formatd(float_str, sizeof(float_str), "%E", + (float) (*model->vdivs)[idx][0] / (*model->vdivs)[idx][1]); + g_snprintf(command, sizeof(command), + (*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_DIV], + j, float_str); + if (sr_scpi_send(sdi->conn, command) != SR_OK || + sr_scpi_get_opc(sdi->conn) != SR_OK) + return SR_ERR; break; } + ret = SR_OK; break; case SR_CONF_TIMEBASE: - g_variant_get(data, "(tt)", &p, &q); - - for (i = 0; i < model->num_timebases; i++) { - if (p != (*model->timebases)[i][0] || - q != (*model->timebases)[i][1]) - continue; - state->timebase = i; - g_ascii_formatd(float_str, sizeof(float_str), "%E", (float) p / q); - g_snprintf(command, sizeof(command), - (*model->scpi_dialect)[SCPI_CMD_SET_TIMEBASE], - float_str); - - ret = sr_scpi_send(sdi->conn, command); - update_sample_rate = TRUE; - break; - } + if ((idx = std_u64_tuple_idx(data, *model->timebases, model->num_timebases)) < 0) + return SR_ERR_ARG; + state->timebase = idx; + g_ascii_formatd(float_str, sizeof(float_str), "%E", + (float) (*model->timebases)[idx][0] / (*model->timebases)[idx][1]); + g_snprintf(command, sizeof(command), + (*model->scpi_dialect)[SCPI_CMD_SET_TIMEBASE], + float_str); + ret = sr_scpi_send(sdi->conn, command); + update_sample_rate = TRUE; break; case SR_CONF_HORIZ_TRIGGERPOS: tmp_d = g_variant_get_double(data); @@ -437,10 +368,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 +409,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 +426,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 +461,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; @@ -592,34 +515,50 @@ static int hmo_check_channels(GSList *channels) { GSList *l; struct sr_channel *ch; - gboolean enabled_pod1, enabled_pod2, enabled_chan3, enabled_chan4; + gboolean enabled_chan[MAX_ANALOG_CHANNEL_COUNT]; + gboolean enabled_pod[MAX_DIGITAL_GROUP_COUNT]; + size_t idx; - enabled_pod1 = enabled_pod2 = enabled_chan3 = enabled_chan4 = FALSE; + /* Preset "not enabled" for all channels / pods. */ + for (idx = 0; idx < ARRAY_SIZE(enabled_chan); idx++) + enabled_chan[idx] = FALSE; + for (idx = 0; idx < ARRAY_SIZE(enabled_pod); idx++) + enabled_pod[idx] = FALSE; + /* + * Determine which channels / pods are required for the caller's + * specified configuration. + */ for (l = channels; l; l = l->next) { ch = l->data; switch (ch->type) { case SR_CHANNEL_ANALOG: - if (ch->index == 2) - enabled_chan3 = TRUE; - else if (ch->index == 3) - enabled_chan4 = TRUE; + idx = ch->index; + if (idx < ARRAY_SIZE(enabled_chan)) + enabled_chan[idx] = TRUE; break; case SR_CHANNEL_LOGIC: - if (ch->index < 8) - enabled_pod1 = TRUE; - else - enabled_pod2 = TRUE; + idx = ch->index / 8; + if (idx < ARRAY_SIZE(enabled_pod)) + enabled_pod[idx] = TRUE; break; default: return SR_ERR; } } - if ((enabled_pod1 && enabled_chan3) || - (enabled_pod2 && enabled_chan4)) + /* + * Check for resource conflicts. Some channels can be either + * analog or digital, but never both at the same time. + * + * Note that the constraints might depend on the specific model. + * These tests might need some adjustment when support for more + * models gets added to the driver. + */ + if (enabled_pod[0] && enabled_chan[2]) + return SR_ERR; + if (enabled_pod[1] && enabled_chan[3]) return SR_ERR; - return SR_OK; } @@ -707,15 +646,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) { GSList *l; gboolean digital_added[MAX_DIGITAL_GROUP_COUNT]; - size_t group; + size_t group, pod_count; struct sr_channel *ch; struct dev_context *devc; 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; @@ -726,8 +662,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) devc->enabled_channels = NULL; /* - * Contruct the list of enabled channels. + * Contruct the list of enabled channels. Determine the highest + * number of digital pods involved in the acquisition. */ + pod_count = 0; for (l = sdi->channels; l; l = l->next) { ch = l->data; if (!ch->enabled) @@ -737,12 +675,17 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) if (ch->type != SR_CHANNEL_LOGIC || !digital_added[group]) { devc->enabled_channels = g_slist_append( devc->enabled_channels, ch); - if (ch->type == SR_CHANNEL_LOGIC) + if (ch->type == SR_CHANNEL_LOGIC) { digital_added[group] = TRUE; + if (pod_count < group + 1) + pod_count = group + 1; + } } } if (!devc->enabled_channels) return SR_ERR; + devc->pod_count = pod_count; + devc->logic_data = NULL; /* * Check constraints. Some channels can be either analog or @@ -790,9 +733,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;