static char *MANUFACTURER_ID = "YOKOGAWA";
static char *MANUFACTURER_NAME = "Yokogawa";
+static const uint32_t drvopts[] = {
+ SR_CONF_LOGIC_ANALYZER,
+ SR_CONF_OSCILLOSCOPE,
+};
+
enum {
CG_INVALID = -1,
CG_NONE,
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->priv = devc;
* @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;
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;
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:
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;
}
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;
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])
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;
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),
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);
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;
}
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;
-
- if (!sdi || !(devc = sdi->priv))
- return SR_ERR_ARG;
+ int cg_type = CG_NONE;
+ struct dev_context *devc = NULL;
+ 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_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:
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;
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;
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;
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];
(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;
/* 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;
}
}
return SR_ERR;
}
- /* Call our callback when data comes in or after 50ms. */
- sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 50,
+ /* 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 5ms. */
+ 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)
{
struct dev_context *devc;
- struct sr_scpi_dev_inst *scpi;
struct sr_datafeed_packet packet;
(void)cb_data;
devc->num_frames = 0;
g_slist_free(devc->enabled_channels);
devc->enabled_channels = NULL;
- scpi = sdi->conn;
- sr_scpi_source_remove(sdi->session, scpi);
+
+ sr_scpi_source_remove(sdi->session, sdi->conn);
return SR_OK;
}
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,
projects / libsigrok.git / blobdiff