struct drv_context *drvc;
struct dev_context *devc;
struct sr_config *src;
- struct sr_channel *probe;
+ struct sr_channel *ch;
struct sr_channel_group *cg;
struct sr_serial_dev_inst *serial;
GSList *l, *devices;
return NULL;
serial_flush(serial);
- /* This is how the vendor software probes for hardware. */
+ /* This is how the vendor software channels for hardware. */
memset(packet, 0, PACKET_SIZE);
packet[0] = 0xaa;
packet[1] = 0xaa;
sdi->conn = serial;
for (i = 0; i < MAX_CHANNELS; i++) {
snprintf(channel, 10, "CH%d", i + 1);
- probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, channel);
- sdi->probes = g_slist_append(sdi->probes, probe);
+ ch = sr_channel_new(i, SR_CHANNEL_ANALOG, TRUE, channel);
+ sdi->channels = g_slist_append(sdi->channels, ch);
cg = g_malloc(sizeof(struct sr_channel_group));
cg->name = g_strdup(channel);
- cg->channels = g_slist_append(NULL, probe);
+ cg->channels = g_slist_append(NULL, ch);
cg->priv = NULL;
sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
}
const struct sr_channel_group *cg)
{
struct dev_context *devc;
- struct sr_channel *probe;
+ struct sr_channel *ch;
int channel, ret;
if (!sdi)
}
} else {
/* We only ever have one channel per channel group in this driver. */
- probe = cg->channels->data;
- channel = probe->index;
+ ch = cg->channels->data;
+ channel = ch->index;
switch (key) {
case SR_CONF_OUTPUT_VOLTAGE:
const struct sr_channel_group *cg)
{
struct dev_context *devc;
- struct sr_channel *probe;
+ struct sr_channel *ch;
gdouble dval;
int channel, ret, ival;
const char *sval;
} else {
/* Channel group specified: per-channel options. */
/* We only ever have one channel per channel group in this driver. */
- probe = cg->channels->data;
- channel = probe->index;
+ ch = cg->channels->data;
+ channel = ch->index;
switch (key) {
case SR_CONF_OUTPUT_VOLTAGE_MAX:
const struct sr_channel_group *cg)
{
struct dev_context *devc;
- struct sr_channel *probe;
+ struct sr_channel *ch;
GVariant *gvar;
GVariantBuilder gvb;
int channel, ret, i;
if (!sdi)
return SR_ERR_ARG;
/* We only ever have one channel per channel group in this driver. */
- probe = cg->channels->data;
- channel = probe->index;
+ ch = cg->channels->data;
+ channel = ch->index;
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
devc->acquisition_running = TRUE;
serial = sdi->conn;
- serial_source_add(serial, G_IO_IN, 50, atten_pps3xxx_receive_data, (void *)sdi);
+ serial_source_add(sdi->session, serial, G_IO_IN, 50,
+ atten_pps3xxx_receive_data, (void *)sdi);
std_session_send_df_header(cb_data, LOG_PREFIX);
- /* Send a "probe" configuration packet now. */
+ /* Send a "channel" configuration packet now. */
memset(packet, 0, PACKET_SIZE);
packet[0] = 0xaa;
packet[1] = 0xaa;