char **sections, **keys, *metafile, *val;
char channelname[SR_MAX_CHANNELNAME_LEN + 1];
char **sections, **keys, *metafile, *val;
char channelname[SR_MAX_CHANNELNAME_LEN + 1];
keys = g_key_file_get_keys(kf, sections[i], NULL, NULL);
for (j = 0; keys[j]; j++) {
val = g_key_file_get_string(kf, sections[i], keys[j], NULL);
if (!strcmp(keys[j], "capturefile")) {
keys = g_key_file_get_keys(kf, sections[i], NULL, NULL);
for (j = 0; keys[j]; j++) {
val = g_key_file_get_string(kf, sections[i], keys[j], NULL);
if (!strcmp(keys[j], "capturefile")) {
if (!session_driver_initialized) {
/* first device, init the driver */
session_driver_initialized = 1;
if (!session_driver_initialized) {
/* first device, init the driver */
session_driver_initialized = 1;
}
sr_dev_open(sdi);
sr_session_dev_add(*session, sdi);
(*session)->owned_devs = g_slist_append(
(*session)->owned_devs, sdi);
}
sr_dev_open(sdi);
sr_session_dev_add(*session, sdi);
(*session)->owned_devs = g_slist_append(
(*session)->owned_devs, sdi);
- sdi->driver->config_set(SR_CONF_SESSIONFILE,
- g_variant_new_string(filename), sdi, NULL);
- sdi->driver->config_set(SR_CONF_CAPTUREFILE,
- g_variant_new_string(val), sdi, NULL);
+
+ sr_config_set(sdi, NULL, SR_CONF_SESSIONFILE,
+ g_variant_new_string(filename));
+ sr_config_set(sdi, NULL, SR_CONF_CAPTUREFILE,
+ g_variant_new_string(val));
g_ptr_array_add(capturefiles, val);
} else if (!strcmp(keys[j], "samplerate")) {
if (!sdi) {
g_ptr_array_add(capturefiles, val);
} else if (!strcmp(keys[j], "samplerate")) {
if (!sdi) {
- sdi->driver->config_set(SR_CONF_SAMPLERATE,
- g_variant_new_uint64(tmp_u64), sdi, NULL);
+ sr_config_set(sdi, NULL, SR_CONF_SAMPLERATE,
+ g_variant_new_uint64(tmp_u64));
} else if (!strcmp(keys[j], "unitsize")) {
if (!sdi) {
ret = SR_ERR_DATA;
break;
}
tmp_u64 = strtoull(val, NULL, 10);
} else if (!strcmp(keys[j], "unitsize")) {
if (!sdi) {
ret = SR_ERR_DATA;
break;
}
tmp_u64 = strtoull(val, NULL, 10);
- sdi->driver->config_set(SR_CONF_CAPTURE_UNITSIZE,
- g_variant_new_uint64(tmp_u64), sdi, NULL);
+ sr_config_set(sdi, NULL, SR_CONF_CAPTURE_UNITSIZE,
+ g_variant_new_uint64(tmp_u64));
} else if (!strcmp(keys[j], "total probes")) {
if (!sdi) {
ret = SR_ERR_DATA;
break;
}
total_channels = strtoull(val, NULL, 10);
} else if (!strcmp(keys[j], "total probes")) {
if (!sdi) {
ret = SR_ERR_DATA;
break;
}
total_channels = strtoull(val, NULL, 10);
- sdi->driver->config_set(SR_CONF_NUM_LOGIC_CHANNELS,
- g_variant_new_uint64(total_channels), sdi, NULL);
+ sr_config_set(sdi, NULL, SR_CONF_NUM_LOGIC_CHANNELS,
+ g_variant_new_uint64(total_channels));
for (p = 0; p < total_channels; p++) {
snprintf(channelname, SR_MAX_CHANNELNAME_LEN, "%" PRIu64, p);
for (p = 0; p < total_channels; p++) {
snprintf(channelname, SR_MAX_CHANNELNAME_LEN, "%" PRIu64, p);
- if (!(ch = sr_channel_new(p, SR_CHANNEL_LOGIC, TRUE,
- channelname)))
- return SR_ERR;
- sdi->channels = g_slist_append(sdi->channels, ch);
+ sr_channel_new(sdi, p, SR_CHANNEL_LOGIC, FALSE,
+ channelname);
- enabled_channels++;
- 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_dev_channel_name_set(sdi, tmp_u64 - 1, val);
+ sr_dev_channel_name_set(ch, val);
+ sr_dev_channel_enable(ch, TRUE);