return sdi;
fail:
- if (hw_info)
- sr_scpi_hw_info_free(hw_info);
- if (sdi)
- sr_dev_inst_free(sdi);
+ sr_scpi_hw_info_free(hw_info);
+ sr_dev_inst_free(sdi);
g_free(devc);
return NULL;
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 (hmo_scope_state_get(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;
+ return sr_scpi_close(sdi->conn);
}
static int check_channel_group(struct dev_context *devc,
case SR_CHANNEL_ANALOG:
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_GET_ANALOG_DATA],
+#ifdef WORDS_BIGENDIAN
+ "MSBF",
+#else
+ "LSBF",
+#endif
ch->index + 1);
break;
case SR_CHANNEL_LOGIC:
{
GSList *l;
struct sr_channel *ch;
- gboolean enabled_pod1, enabled_pod2, enabled_chan3, enabled_chan4;
-
- enabled_pod1 = enabled_pod2 = enabled_chan3 = enabled_chan4 = FALSE;
-
+ gboolean enabled_chan[MAX_ANALOG_CHANNEL_COUNT];
+ gboolean enabled_pod[MAX_DIGITAL_GROUP_COUNT];
+ size_t idx;
+
+ /* Preset "not enabled" for all channels / pods. */
+ for (idx = 0; idx < ARRAY_SIZE(enabled_chan); idx++)
+ enabled_chan[idx] = FALSE;
+ for (idx = 0; idx < ARRAY_SIZE(enabled_pod); idx++)
+ enabled_pod[idx] = FALSE;
+
+ /*
+ * Determine which channels / pods are required for the caller's
+ * specified configuration.
+ */
for (l = channels; l; l = l->next) {
ch = l->data;
switch (ch->type) {
case SR_CHANNEL_ANALOG:
- if (ch->index == 2)
- enabled_chan3 = TRUE;
- else if (ch->index == 3)
- enabled_chan4 = TRUE;
+ idx = ch->index;
+ if (idx < ARRAY_SIZE(enabled_chan))
+ enabled_chan[idx] = TRUE;
break;
case SR_CHANNEL_LOGIC:
- if (ch->index < 8)
- enabled_pod1 = TRUE;
- else
- enabled_pod2 = TRUE;
+ idx = ch->index / 8;
+ if (idx < ARRAY_SIZE(enabled_pod))
+ enabled_pod[idx] = TRUE;
break;
default:
return SR_ERR;
}
}
- if ((enabled_pod1 && enabled_chan3) ||
- (enabled_pod2 && enabled_chan4))
+ /*
+ * Check for resource conflicts. Some channels can be either
+ * analog or digital, but never both at the same time.
+ *
+ * Note that the constraints might depend on the specific model.
+ * These tests might need some adjustment when support for more
+ * models gets added to the driver.
+ */
+ if (enabled_pod[0] && enabled_chan[2])
+ return SR_ERR;
+ if (enabled_pod[1] && enabled_chan[3])
return SR_ERR;
-
return SR_OK;
}
static int dev_acquisition_start(const struct sr_dev_inst *sdi)
{
GSList *l;
- gboolean digital_added;
+ gboolean digital_added[MAX_DIGITAL_GROUP_COUNT];
+ size_t group, pod_count;
struct sr_channel *ch;
struct dev_context *devc;
struct sr_scpi_dev_inst *scpi;
int ret;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
scpi = sdi->conn;
devc = sdi->priv;
- digital_added = FALSE;
+ /* Preset empty results. */
+ for (group = 0; group < ARRAY_SIZE(digital_added); group++)
+ digital_added[group] = FALSE;
g_slist_free(devc->enabled_channels);
devc->enabled_channels = NULL;
+ /*
+ * Contruct the list of enabled channels. Determine the highest
+ * number of digital pods involved in the acquisition.
+ */
+ pod_count = 0;
for (l = sdi->channels; l; l = l->next) {
ch = l->data;
if (!ch->enabled)
continue;
- /* Only add a single digital channel. */
- if (ch->type != SR_CHANNEL_LOGIC || !digital_added) {
+ /* Only add a single digital channel per group (pod). */
+ group = ch->index / 8;
+ if (ch->type != SR_CHANNEL_LOGIC || !digital_added[group]) {
devc->enabled_channels = g_slist_append(
devc->enabled_channels, ch);
- if (ch->type == SR_CHANNEL_LOGIC)
- digital_added = TRUE;
+ if (ch->type == SR_CHANNEL_LOGIC) {
+ digital_added[group] = TRUE;
+ if (pod_count < group + 1)
+ pod_count = group + 1;
+ }
}
}
-
if (!devc->enabled_channels)
return SR_ERR;
+ devc->pod_count = pod_count;
+ devc->logic_data = NULL;
+ /*
+ * Check constraints. Some channels can be either analog or
+ * digital, but not both at the same time.
+ */
if (hmo_check_channels(devc->enabled_channels) != SR_OK) {
sr_err("Invalid channel configuration specified!");
ret = SR_ERR_NA;
goto free_enabled;
}
+ /*
+ * Configure the analog and digital channels and the
+ * corresponding digital pods.
+ */
if (hmo_setup_channels(sdi) != SR_OK) {
sr_err("Failed to setup channel configuration!");
ret = SR_ERR;
goto free_enabled;
}
+ /*
+ * Start acquisition on the first enabled channel. The
+ * receive routine will continue driving the acquisition.
+ */
sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 50,
hmo_receive_data, (void *)sdi);
std_session_send_df_end(sdi);
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
devc = sdi->priv;
devc->num_frames = 0;
projects / libsigrok.git / blobdiff