X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=fcc84e1b1814dff0bfcf134e7b4af7810698edf2;hb=329733d92c5004f0fe308eff26b9537fded2cdf3;hp=030bf85460fbc0531ed087a5bd598e8d0f1ba4bd;hpb=af3487ec288c9eb7042932140fcc8d53abf8c382;p=libsigrok.git diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c index 030bf854..fcc84e1b 100644 --- a/src/hardware/yokogawa-dlm/api.c +++ b/src/hardware/yokogawa-dlm/api.c @@ -22,10 +22,14 @@ #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[] = { + SR_CONF_LOGIC_ANALYZER, + SR_CONF_OSCILLOSCOPE, +}; enum { CG_INVALID = -1, @@ -34,7 +38,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); } @@ -62,17 +66,20 @@ 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; - if (!(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, MANUFACTURER_NAME, - model_name, NULL))) - goto fail; + 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); + sdi->version = g_strdup(hw_info->firmware_version); + + 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->driver = di; + sdi->driver = &yokogawa_dlm_driver_info; sdi->priv = devc; sdi->inst_type = SR_INST_SCPI; sdi->conn = scpi; @@ -96,12 +103,12 @@ fail: 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; } @@ -119,7 +126,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); } @@ -149,9 +156,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; } @@ -168,10 +175,10 @@ static int cleanup(void) * @retval CG_INVALID cg is something else */ static int check_channel_group(struct dev_context *devc, - const struct sr_channel_group *cg) + const struct sr_channel_group *cg) { unsigned int i; - struct scope_config *model; + const struct scope_config *model; model = devc->model_config; @@ -190,13 +197,13 @@ 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, - 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; struct dev_context *devc; - struct scope_config *model; + const struct scope_config *model; struct scope_state *state; if (!sdi || !(devc = sdi->priv)) @@ -210,14 +217,14 @@ 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; case SR_CONF_TIMEBASE: *data = g_variant_new("(tt)", - (*model->timebases)[state->timebase][0], - (*model->timebases)[state->timebase][1]); + (*model->timebases)[state->timebase][0], + (*model->timebases)[state->timebase][1]); ret = SR_OK; break; case SR_CONF_NUM_VDIV: @@ -244,8 +251,8 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, 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]); + (*model->vdivs)[state->analog_states[i].vdiv][0], + (*model->vdivs)[state->analog_states[i].vdiv][1]); ret = SR_OK; break; } @@ -308,14 +315,14 @@ 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, - 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; 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; @@ -360,7 +367,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, for (i = 0; i < model->num_vdivs; i++) { if (p != (*model->vdivs)[i][0] || - q != (*model->vdivs)[i][1]) + q != (*model->vdivs)[i][1]) continue; for (j = 1; j <= model->analog_channels; ++j) { if (cg != devc->analog_groups[j - 1]) @@ -369,7 +376,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, g_ascii_formatd(float_str, sizeof(float_str), "%E", (float) p / q); if (dlm_analog_chan_vdiv_set(sdi->conn, j, float_str) != SR_OK || - sr_scpi_get_opc(sdi->conn) != SR_OK) + sr_scpi_get_opc(sdi->conn) != SR_OK) return SR_ERR; break; @@ -384,7 +391,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, for (i = 0; i < model->num_timebases; i++) { if (p != (*model->timebases)[i][0] || - q != (*model->timebases)[i][1]) + q != (*model->timebases)[i][1]) continue; state->timebase = i; g_ascii_formatd(float_str, sizeof(float_str), @@ -403,9 +410,9 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, state->horiz_triggerpos = tmp_d; tmp_d = -(tmp_d - 0.5) * - ((double) (*model->timebases)[state->timebase][0] / - (*model->timebases)[state->timebase][1]) - * model->num_xdivs; + ((double) (*model->timebases)[state->timebase][0] / + (*model->timebases)[state->timebase][1]) + * model->num_xdivs; g_ascii_formatd(float_str, sizeof(float_str), "%E", tmp_d); ret = dlm_horiz_trigger_pos_set(sdi->conn, float_str); @@ -439,7 +446,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, state->analog_states[j-1].coupling = i; if (dlm_analog_chan_coupl_set(sdi->conn, j, tmp) != SR_OK || - sr_scpi_get_opc(sdi->conn) != SR_OK) + sr_scpi_get_opc(sdi->conn) != SR_OK) return SR_ERR; break; } @@ -462,52 +469,58 @@ 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, - 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; - 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: - *data = NULL; - 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: if (cg_type == CG_NONE) return SR_ERR_CHANNEL_GROUP; *data = g_variant_new_strv(*model->coupling_options, - g_strv_length((char **)*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)); + 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)); + 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: @@ -559,7 +572,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; @@ -570,7 +583,7 @@ static int dlm_setup_channels(const struct sr_dev_inst *sdi) model = devc->model_config; setup_changed = FALSE; - pod_enabled = g_try_malloc0(sizeof(gboolean) * model->pods); + pod_enabled = g_malloc0(sizeof(gboolean) * model->pods); for (l = sdi->channels; l; l = l->next) { ch = l->data; @@ -580,7 +593,7 @@ static int dlm_setup_channels(const struct sr_dev_inst *sdi) break; if (dlm_analog_chan_state_set(scpi, ch->index + 1, - ch->enabled) != SR_OK) + ch->enabled) != SR_OK) return SR_ERR; state->analog_states[ch->index].state = ch->enabled; @@ -594,7 +607,7 @@ static int dlm_setup_channels(const struct sr_dev_inst *sdi) break; if (dlm_digital_chan_state_set(scpi, ch->index + 1, - ch->enabled) != SR_OK) + ch->enabled) != SR_OK) return SR_ERR; state->digital_states[ch->index] = ch->enabled; @@ -610,7 +623,7 @@ static int dlm_setup_channels(const struct sr_dev_inst *sdi) continue; if (dlm_digital_pod_state_set(scpi, i, - pod_enabled[i - 1]) != SR_OK) + pod_enabled[i - 1]) != SR_OK) return SR_ERR; state->pod_states[i - 1] = pod_enabled[i - 1]; @@ -635,7 +648,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) (void)cb_data; - if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; scpi = sdi->conn; devc = sdi->priv; @@ -651,9 +665,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) /* Only add a single digital channel. */ if (ch->type != SR_CHANNEL_LOGIC || !digital_added) { devc->enabled_channels = g_slist_append( - devc->enabled_channels, ch); - if (ch->type == SR_CHANNEL_LOGIC) - digital_added = TRUE; + devc->enabled_channels, ch); + if (ch->type == SR_CHANNEL_LOGIC) + digital_added = TRUE; } } @@ -674,8 +688,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) devc->current_channel = devc->enabled_channels; dlm_channel_data_request(sdi); - /* Call our callback when data comes in or after 50ms. */ - sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 10, + /* Call our callback when data comes in or after 5ms. */ + sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 5, dlm_data_receive, (void *)sdi); return SR_OK; @@ -708,7 +722,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info = { .name = "yokogawa-dlm", - .longname = "Yokogawa DL/DLM driver", + .longname = "Yokogawa DL/DLM", .api_version = 1, .init = init, .cleanup = cleanup,