if (!session_driver_initialized) {
/* first device, init the driver */
session_driver_initialized = 1;
- sdi->driver->init(NULL);
+ sdi->driver->init(sdi->driver, NULL);
}
sr_dev_open(sdi);
sr_session_dev_add(*session, sdi);
g_variant_new_uint64(total_channels), sdi, NULL);
for (p = 0; p < total_channels; p++) {
snprintf(channelname, SR_MAX_CHANNELNAME_LEN, "%" PRIu64, p);
- ch = sr_channel_new(p, SR_CHANNEL_LOGIC, FALSE,
+ sr_channel_new(sdi, p, SR_CHANNEL_LOGIC, FALSE,
channelname);
- sdi->channels = g_slist_append(sdi->channels, ch);
}
} else if (!strncmp(keys[j], "probe", 5)) {
if (!sdi) {
ret = SR_ERR_DATA;
break;
}
- tmp_u64 = strtoul(keys[j]+5, NULL, 10);
+ tmp_u64 = strtoul(keys[j]+5, NULL, 10) - 1;
+ ch = g_slist_nth_data(sdi->channels, tmp_u64);
/* sr_session_save() */
- sr_dev_channel_name_set(sdi, tmp_u64 - 1, val);
- sr_dev_channel_enable(sdi, tmp_u64 - 1, TRUE);
+ sr_dev_channel_name_set(ch, val);
+ sr_dev_channel_enable(ch, TRUE);
}
}
g_strfreev(keys);