X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=0ccf5834e157638aac443d69708a5230a8fceb46;hb=f3c60fb6affce2ebd81250db1d60bee733e5f479;hp=28884de46ad36e6fcfef9c5623f73022e4b7f33f;hpb=cf0280fa1ba3532e1d3aa15b86323c9de7d5365c;p=libsigrok.git diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c index 28884de4..0ccf5834 100644 --- a/src/hardware/yokogawa-dlm/api.c +++ b/src/hardware/yokogawa-dlm/api.c @@ -22,16 +22,38 @@ #include "protocol.h" SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info; -static struct sr_dev_driver *di = &yokogawa_dlm_driver_info; -static char *MANUFACTURER_ID = "YOKOGAWA"; -static char *MANUFACTURER_NAME = "Yokogawa"; +static const char *MANUFACTURER_ID = "YOKOGAWA"; +static const char *MANUFACTURER_NAME = "Yokogawa"; -static const uint32_t drvopts[] = { +static const uint32_t dlm_scanopts[] = { + SR_CONF_CONN, +}; + +static const uint32_t dlm_drvopts[] = { SR_CONF_LOGIC_ANALYZER, SR_CONF_OSCILLOSCOPE, }; +static const uint32_t dlm_devopts[] = { + SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET, + SR_CONF_SAMPLERATE | SR_CONF_GET, + SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_NUM_HDIV | SR_CONF_GET, + SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET, + SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, +}; + +static const uint32_t dlm_analog_devopts[] = { + SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_NUM_VDIV | SR_CONF_GET, +}; + +static const uint32_t dlm_digital_devopts[] = { +}; + enum { CG_INVALID = -1, CG_NONE, @@ -39,7 +61,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); } @@ -67,7 +89,7 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi) if (dlm_model_get(hw_info->model, &model_name, &model_index) != SR_OK) goto fail; - sdi = sr_dev_inst_new(); + sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi->status = SR_ST_ACTIVE; sdi->vendor = g_strdup(MANUFACTURER_NAME); sdi->model = g_strdup(model_name); @@ -80,7 +102,7 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi) devc = g_malloc0(sizeof(struct dev_context)); - sdi->driver = di; + sdi->driver = &yokogawa_dlm_driver_info; sdi->priv = devc; sdi->inst_type = SR_INST_SCPI; sdi->conn = scpi; @@ -98,18 +120,17 @@ 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, probe_usbtmc_device); } -static GSList *dev_list(void) +static GSList *dev_list(const struct sr_dev_driver *di) { return ((struct drv_context *)(di->priv))->instances; } @@ -127,7 +148,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); } @@ -157,9 +178,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 +200,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; @@ -204,7 +225,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)) @@ -218,14 +239,14 @@ 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; case SR_CONF_TIMEBASE: *data = g_variant_new("(tt)", - (*model->timebases)[state->timebase][0], - (*model->timebases)[state->timebase][1]); + dlm_timebases[state->timebase][0], + dlm_timebases[state->timebase][1]); ret = SR_OK; break; case SR_CONF_NUM_VDIV: @@ -252,8 +273,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s if (cg != devc->analog_groups[i]) continue; *data = g_variant_new("(tt)", - (*model->vdivs)[state->analog_states[i].vdiv][0], - (*model->vdivs)[state->analog_states[i].vdiv][1]); + dlm_vdivs[state->analog_states[i].vdiv][0], + dlm_vdivs[state->analog_states[i].vdiv][1]); ret = SR_OK; break; } @@ -263,7 +284,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s ret = SR_OK; break; case SR_CONF_TRIGGER_SLOPE: - *data = g_variant_new_string((*model->trigger_slopes)[state->trigger_slope]); + *data = g_variant_new_string(dlm_trigger_slopes[state->trigger_slope]); ret = SR_OK; break; case SR_CONF_HORIZ_TRIGGERPOS: @@ -323,7 +344,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd unsigned int i, j; char 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; @@ -366,9 +387,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd 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]) + for (i = 0; i < ARRAY_SIZE(dlm_vdivs); i++) { + if (p != dlm_vdivs[i][0] || + q != dlm_vdivs[i][1]) continue; for (j = 1; j <= model->analog_channels; ++j) { if (cg != devc->analog_groups[j - 1]) @@ -390,9 +411,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd 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]) + for (i = 0; i < ARRAY_SIZE(dlm_timebases); i++) { + if (p != dlm_timebases[i][0] || + q != dlm_timebases[i][1]) continue; state->timebase = i; g_ascii_formatd(float_str, sizeof(float_str), @@ -411,8 +432,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd state->horiz_triggerpos = tmp_d; tmp_d = -(tmp_d - 0.5) * - ((double) (*model->timebases)[state->timebase][0] / - (*model->timebases)[state->timebase][1]) + ((double) dlm_timebases[state->timebase][0] / + dlm_timebases[state->timebase][1]) * model->num_xdivs; g_ascii_formatd(float_str, sizeof(float_str), "%E", tmp_d); @@ -475,27 +496,68 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * { int cg_type = CG_NONE; struct dev_context *devc = NULL; - struct scope_config *model = NULL; + const struct scope_config *model = NULL; - if (sdi && (devc = sdi->priv)) { - if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID) - return SR_ERR; + /* SR_CONF_SCAN_OPTIONS is always valid, regardless of sdi or probe group. */ + if (key == SR_CONF_SCAN_OPTIONS) { + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + dlm_scanopts, ARRAY_SIZE(dlm_scanopts), sizeof(uint32_t)); + return SR_OK; + } + + /* If sdi is NULL, nothing except SR_CONF_DEVICE_OPTIONS can be provided. */ + if (key == SR_CONF_DEVICE_OPTIONS && !sdi) { + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + dlm_drvopts, ARRAY_SIZE(dlm_drvopts), sizeof(uint32_t)); + return SR_OK; + } + + if (!sdi) + return SR_ERR_ARG; + + devc = sdi->priv; + model = devc->model_config; - model = devc->model_config; + /* If cg is NULL, only the SR_CONF_DEVICE_OPTIONS that are not + * specific to a probe group must be returned. */ + if (!cg) { + switch (key) { + case SR_CONF_DEVICE_OPTIONS: + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + dlm_devopts, ARRAY_SIZE(dlm_devopts), sizeof(uint32_t)); + return SR_OK; + case SR_CONF_TIMEBASE: + *data = build_tuples(&dlm_timebases, ARRAY_SIZE(dlm_timebases)); + return SR_OK; + 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)); + return SR_OK; + case SR_CONF_TRIGGER_SLOPE: + *data = g_variant_new_strv(dlm_trigger_slopes, + g_strv_length((char **)dlm_trigger_slopes)); + return SR_OK; + case SR_CONF_NUM_HDIV: + *data = g_variant_new_uint32(ARRAY_SIZE(dlm_timebases)); + return SR_OK; + default: + return SR_ERR_NA; + } } + if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID) + return SR_ERR; + switch (key) { 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)); - else - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); - } else if (cg_type == CG_ANALOG) { + if (cg_type == CG_ANALOG) { + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + dlm_analog_devopts, ARRAY_SIZE(dlm_analog_devopts), sizeof(uint32_t)); + } else if (cg_type == CG_DIGITAL) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - model->analog_devopts, model->num_analog_devopts, sizeof(uint32_t)); + dlm_digital_devopts, ARRAY_SIZE(dlm_digital_devopts), sizeof(uint32_t)); } else { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, NULL, 0, sizeof(uint32_t)); @@ -507,27 +569,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * *data = g_variant_new_strv(*model->coupling_options, 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: if (cg_type == CG_NONE) return SR_ERR_CHANNEL_GROUP; - *data = build_tuples(model->vdivs, model->num_vdivs); + *data = build_tuples(&dlm_vdivs, ARRAY_SIZE(dlm_vdivs)); break; default: return SR_ERR_NA; @@ -573,7 +618,7 @@ static int dlm_setup_channels(const struct sr_dev_inst *sdi) unsigned int i; gboolean *pod_enabled, setup_changed; 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; @@ -601,17 +646,18 @@ static int dlm_setup_channels(const struct sr_dev_inst *sdi) setup_changed = TRUE; break; case SR_CHANNEL_LOGIC: + i = ch->index - DLM_DIG_CHAN_INDEX_OFFS; if (ch->enabled) - pod_enabled[ch->index / 8] = TRUE; + pod_enabled[i / 8] = TRUE; - if (ch->enabled == state->digital_states[ch->index]) + if (ch->enabled == state->digital_states[i]) break; - if (dlm_digital_chan_state_set(scpi, ch->index + 1, + if (dlm_digital_chan_state_set(scpi, i + 1, ch->enabled) != SR_OK) return SR_ERR; - state->digital_states[ch->index] = ch->enabled; + state->digital_states[i] = ch->enabled; setup_changed = TRUE; break; default: