X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=f80e83dceb7e91537252d05b37a516e12e225ac3;hb=093b8ff47851f177c67db1e0490d183a7d716851;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..f80e83dc 100644
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -18,14 +18,42 @@
* along with this program. If not, see .
*/
+#include
#include
+#include "scpi.h"
#include "protocol.h"
-SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info;
-static struct sr_dev_driver *di = &yokogawa_dlm_driver_info;
+static struct sr_dev_driver yokogawa_dlm_driver_info;
-static char *MANUFACTURER_ID = "YOKOGAWA";
-static char *MANUFACTURER_NAME = "Yokogawa";
+static const char *MANUFACTURER_ID = "YOKOGAWA";
+
+static const uint32_t scanopts[] = {
+ SR_CONF_CONN,
+};
+
+static const uint32_t drvopts[] = {
+ SR_CONF_LOGIC_ANALYZER,
+ SR_CONF_OSCILLOSCOPE,
+};
+
+static const uint32_t 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_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+};
+
+static const uint32_t devopts_cg_analog[] = {
+ SR_CONF_NUM_VDIV | SR_CONF_GET,
+ SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+};
+
+static const uint32_t devopts_cg_digital[] = {
+};
enum {
CG_INVALID = -1,
@@ -34,12 +62,7 @@ enum {
CG_DIGITAL,
};
-static int init(struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
-static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
+static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
@@ -62,17 +85,19 @@ 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->vendor = g_strdup("Yokogawa");
+ 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;
@@ -80,182 +105,139 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi)
if (dlm_device_init(sdi, model_index) != SR_OK)
goto fail;
- sr_scpi_close(sdi->conn);
-
- sdi->status = SR_ST_INACTIVE;
return sdi;
fail:
- if (hw_info)
- sr_scpi_hw_info_free(hw_info);
- if (sdi)
- sr_dev_inst_free(sdi);
- if (devc)
- g_free(devc);
+ sr_scpi_hw_info_free(hw_info);
+ sr_dev_inst_free(sdi);
+ g_free(devc);
return NULL;
}
-static GSList *scan(GSList *options)
-{
- return sr_scpi_scan(di->priv, options, probe_usbtmc_device);
-}
-
-static GSList *dev_list(void)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
- return ((struct drv_context *)(di->priv))->instances;
+ return sr_scpi_scan(di->context, options, probe_device);
}
-static void clear_helper(void *priv)
+static void clear_helper(struct dev_context *devc)
{
- struct dev_context *devc;
-
- devc = priv;
-
dlm_scope_state_destroy(devc->model_state);
-
g_free(devc->analog_groups);
g_free(devc->digital_groups);
- 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);
+ 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 (dlm_scope_state_query(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;
-}
-
-static int cleanup(void)
-{
- dev_clear();
-
- return SR_OK;
+ return sr_scpi_close(sdi->conn);
}
/**
* Check which category a given channel group belongs to.
*
* @param devc Our internal device context.
- * @param cg The channel group to check.
+ * @param cg The channel group to check.
*
- * @retval CG_NONE cg is NULL
- * @retval CG_ANALOG cg is an analog group
+ * @retval CG_NONE cg is NULL
+ * @retval CG_ANALOG cg is an analog group
* @retval CG_DIGITAL cg is a digital group
* @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;
+ if (!devc)
+ return CG_INVALID;
model = devc->model_config;
if (!cg)
return CG_NONE;
- for (i = 0; i < model->analog_channels; ++i)
- if (cg == devc->analog_groups[i])
- return CG_ANALOG;
+ if (std_cg_idx(cg, devc->analog_groups, model->analog_channels) >= 0)
+ return CG_ANALOG;
- for (i = 0; i < model->pods; ++i)
- if (cg == devc->digital_groups[i])
- return CG_DIGITAL;
+ if (std_cg_idx(cg, devc->digital_groups, model->pods) >= 0)
+ return CG_DIGITAL;
sr_err("Invalid channel group specified.");
+
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;
+ int ret, cg_type, idx;
struct dev_context *devc;
- struct scope_config *model;
+ const struct scope_config *model;
struct scope_state *state;
- if (!sdi || !(devc = sdi->priv))
+ if (!sdi)
return SR_ERR_ARG;
+ devc = sdi->priv;
+
if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
return SR_ERR;
- ret = SR_ERR_NA;
model = devc->model_config;
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:
- if (cg_type == CG_NONE) {
- sr_err("No channel group specified.");
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- } else if (cg_type == CG_ANALOG) {
- *data = g_variant_new_int32(model->num_ydivs);
- ret = SR_OK;
- break;
- } else {
- ret = SR_ERR_NA;
- }
+ if (cg_type != CG_ANALOG)
+ return SR_ERR_NA;
+ *data = g_variant_new_int32(model->num_ydivs);
+ ret = SR_OK;
break;
case SR_CONF_VDIV:
- ret = SR_ERR_NA;
- if (cg_type == CG_NONE) {
- sr_err("No channel group specified.");
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- } else if (cg_type != CG_ANALOG)
- break;
-
- for (i = 0; i < model->analog_channels; ++i) {
- 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]);
- ret = SR_OK;
- break;
- }
+ if (cg_type != CG_ANALOG)
+ return SR_ERR_NA;
+ if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
+ return SR_ERR_ARG;
+ *data = g_variant_new("(tt)",
+ dlm_vdivs[state->analog_states[idx].vdiv][0],
+ dlm_vdivs[state->analog_states[idx].vdiv][1]);
+ ret = SR_OK;
break;
case SR_CONF_TRIGGER_SOURCE:
*data = g_variant_new_string((*model->trigger_sources)[state->trigger_source]);
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:
@@ -263,20 +245,14 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
ret = SR_OK;
break;
case SR_CONF_COUPLING:
- ret = SR_ERR_NA;
- if (cg_type == CG_NONE) {
- sr_err("No channel group specified.");
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- } else if (cg_type != CG_ANALOG)
- break;
-
- for (i = 0; i < model->analog_channels; ++i) {
- if (cg != devc->analog_groups[i])
- continue;
- *data = g_variant_new_string((*model->coupling_options)[state->analog_states[i].coupling]);
- ret = SR_OK;
- break;
- }
+ if (cg_type != CG_ANALOG)
+ return SR_ERR_NA;
+ if ((idx = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
+ return SR_ERR_ARG;
+ *data = g_variant_new_string((*model->coupling_options)[state->analog_states[idx].coupling]);
+ ret = SR_OK;
break;
case SR_CONF_SAMPLERATE:
*data = g_variant_new_uint64(state->sample_rate);
@@ -289,36 +265,14 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
return ret;
}
-static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n)
+static int config_set(uint32_t key, GVariant *data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
- 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(int key, GVariant *data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
-{
- int ret, cg_type;
- unsigned int i, j;
+ int ret, cg_type, idx, 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;
double tmp_d;
gboolean update_sample_rate;
@@ -332,67 +286,41 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
state = devc->model_state;
update_sample_rate = FALSE;
- ret = SR_ERR_NA;
-
switch (key) {
case SR_CONF_LIMIT_FRAMES:
devc->frame_limit = g_variant_get_uint64(data);
ret = SR_OK;
break;
case SR_CONF_TRIGGER_SOURCE:
- tmp = g_variant_get_string(data, NULL);
- for (i = 0; (*model->trigger_sources)[i]; i++) {
- if (g_strcmp0(tmp, (*model->trigger_sources)[i]) != 0)
- continue;
- state->trigger_source = i;
- /* TODO: A and B trigger support possible? */
- ret = dlm_trigger_source_set(sdi->conn, (*model->trigger_sources)[i]);
- break;
- }
+ if ((idx = std_str_idx(data, *model->trigger_sources, model->num_trigger_sources)) < 0)
+ return SR_ERR_ARG;
+ state->trigger_source = idx;
+ /* TODO: A and B trigger support possible? */
+ ret = dlm_trigger_source_set(sdi->conn, (*model->trigger_sources)[idx]);
break;
case SR_CONF_VDIV:
- if (cg_type == CG_NONE) {
- sr_err("No channel group specified.");
+ if (!cg)
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])
- continue;
- for (j = 1; j <= model->analog_channels; ++j) {
- if (cg != devc->analog_groups[j - 1])
- continue;
- state->analog_states[j - 1].vdiv = i;
- 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)
- return SR_ERR;
-
- break;
- }
-
- ret = SR_OK;
- break;
- }
+ if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(dlm_vdivs))) < 0)
+ return SR_ERR_ARG;
+ if ((j = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
+ return SR_ERR_ARG;
+ state->analog_states[j].vdiv = idx;
+ g_ascii_formatd(float_str, sizeof(float_str),
+ "%E", (float) dlm_vdivs[idx][0] / dlm_vdivs[idx][1]);
+ if (dlm_analog_chan_vdiv_set(sdi->conn, j + 1, float_str) != SR_OK ||
+ sr_scpi_get_opc(sdi->conn) != SR_OK)
+ return SR_ERR;
+ 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);
- ret = dlm_timebase_set(sdi->conn, float_str);
- update_sample_rate = TRUE;
- break;
- }
+ if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(dlm_timebases))) < 0)
+ return SR_ERR_ARG;
+ state->timebase = idx;
+ g_ascii_formatd(float_str, sizeof(float_str),
+ "%E", (float) dlm_timebases[idx][0] / dlm_timebases[idx][1]);
+ ret = dlm_timebase_set(sdi->conn, float_str);
+ update_sample_rate = TRUE;
break;
case SR_CONF_HORIZ_TRIGGERPOS:
tmp_d = g_variant_get_double(data);
@@ -403,50 +331,32 @@ 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) dlm_timebases[state->timebase][0] /
+ dlm_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);
break;
case SR_CONF_TRIGGER_SLOPE:
- tmp = g_variant_get_string(data, NULL);
-
- if (!tmp || !(tmp[0] == 'f' || tmp[0] == 'r'))
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(dlm_trigger_slopes))) < 0)
return SR_ERR_ARG;
-
/* Note: See dlm_trigger_slopes[] in protocol.c. */
- state->trigger_slope = (tmp[0] == 'r') ?
- SLOPE_POSITIVE : SLOPE_NEGATIVE;
-
+ state->trigger_slope = idx;
ret = dlm_trigger_slope_set(sdi->conn, state->trigger_slope);
break;
case SR_CONF_COUPLING:
- if (cg_type == CG_NONE) {
- sr_err("No channel group specified.");
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- }
-
- tmp = g_variant_get_string(data, NULL);
-
- for (i = 0; (*model->coupling_options)[i]; i++) {
- if (strcmp(tmp, (*model->coupling_options)[i]) != 0)
- continue;
- for (j = 1; j <= model->analog_channels; ++j) {
- if (cg != devc->analog_groups[j - 1])
- continue;
- 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)
- return SR_ERR;
- break;
- }
-
- ret = SR_OK;
- break;
- }
+ if ((idx = std_str_idx(data, *model->coupling_options, model->num_coupling_options)) < 0)
+ return SR_ERR_ARG;
+ if ((j = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
+ return SR_ERR_ARG;
+ state->analog_states[j].coupling = idx;
+ if (dlm_analog_chan_coupl_set(sdi->conn, j + 1, (*model->coupling_options)[idx]) != SR_OK ||
+ sr_scpi_get_opc(sdi->conn) != SR_OK)
+ return SR_ERR;
+ ret = SR_OK;
break;
default:
ret = SR_ERR_NA;
@@ -462,58 +372,73 @@ 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_channel_set(const struct sr_dev_inst *sdi,
+ struct sr_channel *ch, unsigned int changes)
{
- int cg_type;
- struct dev_context *devc;
- struct scope_config *model;
+ /* Currently we only handle SR_CHANNEL_SET_ENABLED. */
+ if (changes != SR_CHANNEL_SET_ENABLED)
+ return SR_ERR_NA;
- if (!sdi || !(devc = sdi->priv))
- return SR_ERR_ARG;
+ return dlm_channel_state_set(sdi, ch->index, ch->enabled);
+}
+
+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;
+ const struct scope_config *model;
+
+ devc = (sdi) ? sdi->priv : NULL;
+ model = (devc) ? devc->model_config : NULL;
+
+ if (!cg) {
+ switch (key) {
+ case SR_CONF_SCAN_OPTIONS:
+ case SR_CONF_DEVICE_OPTIONS:
+ return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
+ case SR_CONF_TIMEBASE:
+ *data = std_gvar_tuple_array(ARRAY_AND_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, model->num_trigger_sources);
+ return SR_OK;
+ case SR_CONF_TRIGGER_SLOPE:
+ *data = g_variant_new_strv(ARRAY_AND_SIZE(dlm_trigger_slopes));
+ return SR_OK;
+ case SR_CONF_NUM_HDIV:
+ if (!model)
+ return SR_ERR_ARG;
+ *data = g_variant_new_uint32(model->num_xdivs);
+ return SR_OK;
+ default:
+ return SR_ERR_NA;
+ }
+ }
if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
return SR_ERR;
- 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));
- } 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));
- } else {
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
- NULL, 0, sizeof(int32_t));
- }
+ if (cg_type == CG_ANALOG)
+ *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_analog));
+ else if (cg_type == CG_DIGITAL)
+ *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg_digital));
+ else
+ *data = std_gvar_array_u32(NULL, 0);
break;
case SR_CONF_COUPLING:
- if (cg_type == CG_NONE)
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- *data = g_variant_new_strv(*model->coupling_options,
- g_strv_length((char **)*model->coupling_options));
- break;
- case SR_CONF_TRIGGER_SOURCE:
- *data = g_variant_new_strv(*model->trigger_sources,
- g_strv_length((char **)*model->trigger_sources));
- break;
- case SR_CONF_TRIGGER_SLOPE:
- *data = g_variant_new_strv(*model->trigger_slopes,
- g_strv_length((char **)*model->trigger_slopes));
- break;
- case SR_CONF_TIMEBASE:
- *data = build_tuples(model->timebases, model->num_timebases);
+ *data = g_variant_new_strv(*model->coupling_options, model->num_coupling_options);
break;
case SR_CONF_VDIV:
- if (cg_type == CG_NONE)
+ if (!cg)
return SR_ERR_CHANNEL_GROUP;
- *data = build_tuples(model->vdivs, model->num_vdivs);
+ *data = std_gvar_tuple_array(ARRAY_AND_SIZE(dlm_vdivs));
break;
default:
return SR_ERR_NA;
@@ -553,79 +478,7 @@ static int dlm_check_channels(GSList *channels)
return SR_OK;
}
-static int dlm_setup_channels(const struct sr_dev_inst *sdi)
-{
- GSList *l;
- unsigned int i;
- gboolean *pod_enabled, setup_changed;
- struct scope_state *state;
- struct scope_config *model;
- struct sr_channel *ch;
- struct dev_context *devc;
- struct sr_scpi_dev_inst *scpi;
-
- devc = sdi->priv;
- scpi = sdi->conn;
- state = devc->model_state;
- model = devc->model_config;
- setup_changed = FALSE;
-
- pod_enabled = g_try_malloc0(sizeof(gboolean) * model->pods);
-
- for (l = sdi->channels; l; l = l->next) {
- ch = l->data;
- switch (ch->type) {
- case SR_CHANNEL_ANALOG:
- if (ch->enabled == state->analog_states[ch->index].state)
- break;
-
- if (dlm_analog_chan_state_set(scpi, ch->index + 1,
- ch->enabled) != SR_OK)
- return SR_ERR;
-
- state->analog_states[ch->index].state = ch->enabled;
- setup_changed = TRUE;
- break;
- case SR_CHANNEL_LOGIC:
- if (ch->enabled)
- pod_enabled[ch->index / 8] = TRUE;
-
- if (ch->enabled == state->digital_states[ch->index])
- break;
-
- if (dlm_digital_chan_state_set(scpi, ch->index + 1,
- ch->enabled) != SR_OK)
- return SR_ERR;
-
- state->digital_states[ch->index] = ch->enabled;
- setup_changed = TRUE;
- break;
- default:
- return SR_ERR;
- }
- }
-
- for (i = 1; i <= model->pods; ++i) {
- if (state->pod_states[i - 1] == pod_enabled[i - 1])
- continue;
-
- if (dlm_digital_pod_state_set(scpi, i,
- pod_enabled[i - 1]) != SR_OK)
- return SR_ERR;
-
- state->pod_states[i - 1] = pod_enabled[i - 1];
- setup_changed = TRUE;
- }
-
- g_free(pod_enabled);
-
- if (setup_changed && dlm_sample_rate_query(sdi) != SR_OK)
- return SR_ERR;
-
- return SR_OK;
-}
-
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
{
GSList *l;
gboolean digital_added;
@@ -633,10 +486,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
struct dev_context *devc;
struct sr_scpi_dev_inst *scpi;
- (void)cb_data;
-
- if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED;
-
scpi = sdi->conn;
devc = sdi->priv;
digital_added = FALSE;
@@ -651,9 +500,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;
}
}
@@ -665,35 +514,21 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
return SR_ERR_NA;
}
- if (dlm_setup_channels(sdi) != SR_OK) {
- sr_err("Failed to setup channel configuration!");
- return SR_ERR;
- }
-
/* Request data for the first enabled channel. */
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,
+ sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 5,
dlm_data_receive, (void *)sdi);
return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- struct sr_datafeed_packet packet;
-
- (void)cb_data;
-
- packet.type = SR_DF_END;
- packet.payload = NULL;
- sr_session_send(sdi, &packet);
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
+ std_session_send_df_end(sdi);
devc = sdi->priv;
@@ -706,21 +541,23 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
return SR_OK;
}
-SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info = {
+static 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,
+ .init = std_init,
+ .cleanup = std_cleanup,
.scan = scan,
- .dev_list = dev_list,
+ .dev_list = std_dev_list,
.dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
+ .config_channel_set = config_channel_set,
.config_list = config_list,
.dev_open = dev_open,
.dev_close = dev_close,
.dev_acquisition_start = dev_acquisition_start,
.dev_acquisition_stop = dev_acquisition_stop,
- .priv = NULL,
+ .context = NULL,
};
+SR_REGISTER_DEV_DRIVER(yokogawa_dlm_driver_info);