X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=61c71ea8320d0101992180d6fd5970d656d4360b;hb=e57057aee778e723da572a6b5e2bd01526cc7beb;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..61c71ea8 100644
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -18,20 +18,44 @@
* 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 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 +63,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 +91,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 +104,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,20 +122,19 @@ 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);
+ return sr_scpi_scan(di->context, 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;
+ return ((struct drv_context *)(di->context))->instances;
}
static void clear_helper(void *priv)
@@ -127,7 +150,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 +180,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 +191,10 @@ static int cleanup(void)
* 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
*/
@@ -179,18 +202,18 @@ 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;
if (!cg)
return CG_NONE;
- for (i = 0; i < model->analog_channels; ++i)
+ for (i = 0; i < model->analog_channels; i++)
if (cg == devc->analog_groups[i])
return CG_ANALOG;
- for (i = 0; i < model->pods; ++i)
+ for (i = 0; i < model->pods; i++)
if (cg == devc->digital_groups[i])
return CG_DIGITAL;
@@ -204,7 +227,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))
@@ -213,19 +236,18 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
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:
@@ -248,12 +270,12 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
} else if (cg_type != CG_ANALOG)
break;
- for (i = 0; i < model->analog_channels; ++i) {
+ 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]);
+ dlm_vdivs[state->analog_states[i].vdiv][0],
+ dlm_vdivs[state->analog_states[i].vdiv][1]);
ret = SR_OK;
break;
}
@@ -263,7 +285,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:
@@ -278,7 +300,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
} else if (cg_type != CG_ANALOG)
break;
- for (i = 0; i < model->analog_channels; ++i) {
+ 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]);
@@ -323,7 +345,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,11 +388,11 @@ 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) {
+ for (j = 1; j <= model->analog_channels; j++) {
if (cg != devc->analog_groups[j - 1])
continue;
state->analog_states[j - 1].vdiv = i;
@@ -390,9 +412,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 +433,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);
@@ -441,7 +463,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
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) {
+ for (j = 1; j <= model->analog_channels; j++) {
if (cg != devc->analog_groups[j - 1])
continue;
state->analog_states[j-1].coupling = i;
@@ -470,32 +492,85 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
return ret;
}
+static int config_channel_set(const struct sr_dev_inst *sdi,
+ struct sr_channel *ch, unsigned int changes)
+{
+ /* Currently we only handle SR_CHANNEL_SET_ENABLED. */
+ if (changes != SR_CHANNEL_SET_ENABLED)
+ return SR_ERR_NA;
+
+ 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 = 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;
- model = devc->model_config;
+ devc = sdi->priv;
+ 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(model->num_xdivs);
+ 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 +582,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;
@@ -567,78 +625,6 @@ 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_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)
{
GSList *l;
@@ -680,11 +666,6 @@ 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);
@@ -732,10 +713,11 @@ SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info = {
.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,
};