X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=fcc84e1b1814dff0bfcf134e7b4af7810698edf2;hb=329733d92c5004f0fe308eff26b9537fded2cdf3;hp=3cf5a2be41e3d14e6d24ccd11261bc05b5171a1e;hpb=af945a6625474e039fb7730483c5d07aa7f45969;p=libsigrok.git diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c index 3cf5a2be..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,16 +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; 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; @@ -95,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; } @@ -118,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); } @@ -148,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; } @@ -170,7 +178,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; @@ -195,7 +203,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)) @@ -209,7 +217,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; @@ -314,7 +322,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; @@ -464,23 +472,26 @@ 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; - - if (!sdi || !(devc = sdi->priv)) - return SR_ERR_ARG; + int cg_type = CG_NONE; + struct dev_context *devc = NULL; + const struct scope_config *model = NULL; - 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_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, sizeof(uint32_t)); @@ -496,14 +507,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: @@ -555,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;