struct dev_context *devc;
struct sr_dev_inst *sdi;
struct sr_config *src;
- struct sr_probe *probe;
+ struct sr_channel *ch;
GSList *devices, *l;
const char *conn, *serialcomm;
struct sr_serial_dev_inst *serial;
sdi->priv = devc;
sdi->driver = di;
- probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1");
- if (!probe) {
- sr_err("Failed to create probe.");
+ ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1");
+ if (!ch) {
+ sr_err("Failed to create channel.");
return NULL;
}
- sdi->probes = g_slist_append(sdi->probes, probe);
+ sdi->channels = g_slist_append(sdi->channels, ch);
drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
}
static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *channel_group)
+ const struct sr_channel_group *cg)
{
struct dev_context *devc;
- (void)channel_group;
+ (void)cg;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
}
static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *channel_group)
+ const struct sr_channel_group *cg)
{
(void)sdi;
- (void)channel_group;
+ (void)cg;
switch (key) {
case SR_CONF_SCAN_OPTIONS: