struct dev_context *devc;
struct sr_dev_inst *sdi;
struct sr_scpi_hw_info *hw_info;
- struct sr_channel *probe;
+ struct sr_channel *ch;
long n[3];
unsigned int i;
const struct rigol_ds_model *model = NULL;
for (i = 0; i < model->analog_channels; i++) {
if (!(channel_name = g_strdup_printf("CH%d", i + 1)))
return NULL;
- probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, channel_name);
- sdi->probes = g_slist_append(sdi->probes, probe);
+ ch = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, channel_name);
+ sdi->channels = g_slist_append(sdi->channels, ch);
devc->analog_groups[i].name = channel_name;
- devc->analog_groups[i].channels = g_slist_append(NULL, probe);
+ devc->analog_groups[i].channels = g_slist_append(NULL, ch);
sdi->channel_groups = g_slist_append(sdi->channel_groups,
&devc->analog_groups[i]);
}
for (i = 0; i < 16; i++) {
if (!(channel_name = g_strdup_printf("D%d", i)))
return NULL;
- probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, channel_name);
+ ch = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, channel_name);
g_free(channel_name);
- if (!probe)
+ if (!ch)
return NULL;
- sdi->probes = g_slist_append(sdi->probes, probe);
+ sdi->channels = g_slist_append(sdi->channels, ch);
devc->digital_group.channels = g_slist_append(
- devc->digital_group.channels, probe);
+ devc->digital_group.channels, ch);
}
devc->digital_group.name = "LA";
sdi->channel_groups = g_slist_append(sdi->channel_groups,
static int analog_frame_size(const struct sr_dev_inst *sdi)
{
struct dev_context *devc = sdi->priv;
- struct sr_channel *probe;
- int analog_probes = 0;
+ struct sr_channel *ch;
+ int analog_channels = 0;
GSList *l;
- for (l = sdi->probes; l; l = l->next) {
- probe = l->data;
- if (probe->type == SR_PROBE_ANALOG && probe->enabled)
- analog_probes++;
+ for (l = sdi->channels; l; l = l->next) {
+ ch = l->data;
+ if (ch->type == SR_PROBE_ANALOG && ch->enabled)
+ analog_channels++;
}
- if (analog_probes == 0)
+ if (analog_channels == 0)
return 0;
switch (devc->data_source) {
case DATA_SOURCE_LIVE:
return devc->model->series->live_samples;
case DATA_SOURCE_MEMORY:
- return devc->model->series->buffer_samples / analog_probes;
+ return devc->model->series->buffer_samples / analog_channels;
default:
return 0;
}
const struct sr_channel_group *cg)
{
struct dev_context *devc;
- struct sr_channel *probe;
+ struct sr_channel *ch;
const char *tmp_str;
uint64_t samplerate;
int analog_channel = -1;
}
if (cg) {
- probe = g_slist_nth_data(cg->channels, 0);
- if (!probe)
+ ch = g_slist_nth_data(cg->channels, 0);
+ if (!ch)
return SR_ERR;
- if (probe->type == SR_PROBE_ANALOG) {
- if (probe->name[2] < '1' || probe->name[2] > '4')
+ if (ch->type == SR_PROBE_ANALOG) {
+ if (ch->name[2] < '1' || ch->name[2] > '4')
return SR_ERR;
- analog_channel = probe->name[2] - '1';
+ analog_channel = ch->name[2] - '1';
}
}
{
struct sr_scpi_dev_inst *scpi;
struct dev_context *devc;
- struct sr_channel *probe;
+ struct sr_channel *ch;
struct sr_datafeed_packet packet;
GSList *l;
devc->num_frames = 0;
- for (l = sdi->probes; l; l = l->next) {
- probe = l->data;
- sr_dbg("handling probe %s", probe->name);
- if (probe->type == SR_PROBE_ANALOG) {
- if (probe->enabled)
- devc->enabled_analog_probes = g_slist_append(
- devc->enabled_analog_probes, probe);
- if (probe->enabled != devc->analog_channels[probe->index]) {
+ for (l = sdi->channels; l; l = l->next) {
+ ch = l->data;
+ sr_dbg("handling channel %s", ch->name);
+ if (ch->type == SR_PROBE_ANALOG) {
+ if (ch->enabled)
+ devc->enabled_analog_channels = g_slist_append(
+ devc->enabled_analog_channels, ch);
+ if (ch->enabled != devc->analog_channels[ch->index]) {
/* Enabled channel is currently disabled, or vice versa. */
- if (rigol_ds_config_set(sdi, ":CHAN%d:DISP %s", probe->index + 1,
- probe->enabled ? "ON" : "OFF") != SR_OK)
+ if (rigol_ds_config_set(sdi, ":CHAN%d:DISP %s", ch->index + 1,
+ ch->enabled ? "ON" : "OFF") != SR_OK)
return SR_ERR;
- devc->analog_channels[probe->index] = probe->enabled;
+ devc->analog_channels[ch->index] = ch->enabled;
}
- } else if (probe->type == SR_PROBE_LOGIC) {
- if (probe->enabled) {
- devc->enabled_digital_probes = g_slist_append(
- devc->enabled_digital_probes, probe);
+ } else if (ch->type == SR_PROBE_LOGIC) {
+ if (ch->enabled) {
+ devc->enabled_digital_channels = g_slist_append(
+ devc->enabled_digital_channels, ch);
/* Turn on LA module if currently off. */
if (!devc->la_enabled) {
if (rigol_ds_config_set(sdi, ":LA:DISP ON") != SR_OK)
devc->la_enabled = TRUE;
}
}
- if (probe->enabled != devc->digital_channels[probe->index]) {
+ if (ch->enabled != devc->digital_channels[ch->index]) {
/* Enabled channel is currently disabled, or vice versa. */
- if (rigol_ds_config_set(sdi, ":DIG%d:TURN %s", probe->index,
- probe->enabled ? "ON" : "OFF") != SR_OK)
+ if (rigol_ds_config_set(sdi, ":DIG%d:TURN %s", ch->index,
+ ch->enabled ? "ON" : "OFF") != SR_OK)
return SR_ERR;
- devc->digital_channels[probe->index] = probe->enabled;
+ devc->digital_channels[ch->index] = ch->enabled;
}
}
}
- if (!devc->enabled_analog_probes && !devc->enabled_digital_probes)
+ if (!devc->enabled_analog_channels && !devc->enabled_digital_channels)
return SR_ERR;
- /* Turn off LA module if on and no digital probes selected. */
- if (devc->la_enabled && !devc->enabled_digital_probes)
+ /* Turn off LA module if on and no digital channels selected. */
+ if (devc->la_enabled && !devc->enabled_digital_channels)
if (rigol_ds_config_set(sdi, ":LA:DISP OFF") != SR_OK)
return SR_ERR;
/* Send header packet to the session bus. */
std_session_send_df_header(cb_data, LOG_PREFIX);
- if (devc->enabled_analog_probes)
- devc->channel_entry = devc->enabled_analog_probes;
+ if (devc->enabled_analog_channels)
+ devc->channel_entry = devc->enabled_analog_channels;
else
- devc->channel_entry = devc->enabled_digital_probes;
+ devc->channel_entry = devc->enabled_digital_channels;
if (rigol_ds_capture_start(sdi) != SR_OK)
return SR_ERR;
packet.type = SR_DF_END;
sr_session_send(sdi, &packet);
- g_slist_free(devc->enabled_analog_probes);
- g_slist_free(devc->enabled_digital_probes);
- devc->enabled_analog_probes = NULL;
- devc->enabled_digital_probes = NULL;
+ g_slist_free(devc->enabled_analog_channels);
+ g_slist_free(devc->enabled_digital_channels);
+ devc->enabled_analog_channels = NULL;
+ devc->enabled_digital_channels = NULL;
scpi = sdi->conn;
sr_scpi_source_remove(scpi);
projects / libsigrok.git / blobdiff