projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f00fc2a
)
Use new probe_groups API
author
Bert Vermeulen
<bert@biot.com>
Sat, 20 Apr 2013 23:56:28 +0000
(
01:56
+0200)
committer
Bert Vermeulen
<bert@biot.com>
Fri, 1 Nov 2013 22:35:49 +0000
(23:35 +0100)
pv/dialogs/connect.cpp
patch
|
blob
|
history
pv/prop/binding/deviceoptions.cpp
patch
|
blob
|
history
pv/sigsession.cpp
patch
|
blob
|
history
pv/toolbars/samplingbar.cpp
patch
|
blob
|
history
pv/view/logicsignal.cpp
patch
|
blob
|
history
diff --git
a/pv/dialogs/connect.cpp
b/pv/dialogs/connect.cpp
index ea411f156cf33b52f4f86ed61db2ed017a7418f4..f8fbe67f79bb1bf2260f7e3749e0044c2b139abd 100644
(file)
--- a/
pv/dialogs/connect.cpp
+++ b/
pv/dialogs/connect.cpp
@@
-102,8
+102,8
@@
void Connect::populate_drivers()
* and sensors.
*/
bool supported_device = false;
* and sensors.
*/
bool supported_device = false;
- if ((sr_config_list(drivers[i],
SR_CONF_DEVICE_OPTIONS
,
-
&gvar_opts, NULL
) == SR_OK)) {
+ if ((sr_config_list(drivers[i],
NULL, NULL
,
+
SR_CONF_DEVICE_OPTIONS, &gvar_opts
) == SR_OK)) {
hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_opts,
&num_opts, sizeof(int32_t));
for (unsigned int j = 0; j < num_opts; j++)
hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_opts,
&num_opts, sizeof(int32_t));
for (unsigned int j = 0; j < num_opts; j++)
@@
-189,8
+189,8
@@
void Connect::device_selected(int index)
unset_connection();
unset_connection();
- if ((sr_config_list(driver,
SR_CONF_SCAN_OPTIONS
,
-
&gvar_list, NULL
) == SR_OK)) {
+ if ((sr_config_list(driver,
NULL, NULL
,
+
SR_CONF_SCAN_OPTIONS, &gvar_list
) == SR_OK)) {
hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_list,
&num_opts, sizeof(int32_t));
hwopts = (const int32_t *)g_variant_get_fixed_array(gvar_list,
&num_opts, sizeof(int32_t));
diff --git
a/pv/prop/binding/deviceoptions.cpp
b/pv/prop/binding/deviceoptions.cpp
index 513fe856599682411a552c5345fde38384b1255c..3fe63940cc2efe6508313647893af740353f9faf 100644
(file)
--- a/
pv/prop/binding/deviceoptions.cpp
+++ b/
pv/prop/binding/deviceoptions.cpp
@@
-47,8
+47,8
@@
DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) :
GVariant *gvar_opts, *gvar_list;
gsize num_opts;
GVariant *gvar_opts, *gvar_list;
gsize num_opts;
- if ((sr_config_list(sdi->driver, SR_CONF_DEVICE_OPTIONS,
- &gvar_opts
, sdi
) != SR_OK))
+ if ((sr_config_list(sdi->driver,
sdi, NULL,
SR_CONF_DEVICE_OPTIONS,
+ &gvar_opts) != SR_OK))
/* Driver supports no device instance options. */
return;
/* Driver supports no device instance options. */
return;
@@
-63,7
+63,7
@@
DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) :
const int key = info->key;
const int key = info->key;
- if
(sr_config_list(_sdi->driver, key, &gvar_list, _sdi
) != SR_OK)
+ if
(sr_config_list(_sdi->driver, _sdi, NULL, key, &gvar_list
) != SR_OK)
gvar_list = NULL;
const QString name(info->name);
gvar_list = NULL;
const QString name(info->name);
@@
-113,7
+113,7
@@
GVariant* DeviceOptions::config_getter(
const struct sr_dev_inst *sdi, int key)
{
GVariant *data = NULL;
const struct sr_dev_inst *sdi, int key)
{
GVariant *data = NULL;
- if (sr_config_get(sdi->driver,
key, &data, sdi
) != SR_OK) {
+ if (sr_config_get(sdi->driver,
sdi, NULL, key, &data
) != SR_OK) {
qDebug() <<
"WARNING: Failed to get value of config id" << key;
return NULL;
qDebug() <<
"WARNING: Failed to get value of config id" << key;
return NULL;
@@
-124,7
+124,7
@@
GVariant* DeviceOptions::config_getter(
void DeviceOptions::config_setter(
const struct sr_dev_inst *sdi, int key, GVariant* value)
{
void DeviceOptions::config_setter(
const struct sr_dev_inst *sdi, int key, GVariant* value)
{
- if (sr_config_set(sdi, key, value) != SR_OK)
+ if (sr_config_set(sdi,
NULL,
key, value) != SR_OK)
qDebug() << "WARNING: Failed to set value of sample rate";
}
qDebug() << "WARNING: Failed to set value of sample rate";
}
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index aadaf45011451bc21bad01045f7781347cd1aaaa..b27fd6ec7f80e8d77635e4219a2fed65c4cfde63 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-428,8
+428,8
@@
void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
// Read out the sample rate
if(sdi->driver)
{
// Read out the sample rate
if(sdi->driver)
{
- const int ret = sr_config_get(sdi->driver,
- SR_CONF_SAMPLERATE, &gvar
, sdi
);
+ const int ret = sr_config_get(sdi->driver,
sdi, NULL,
+ SR_CONF_SAMPLERATE, &gvar);
if (ret != SR_OK) {
qDebug("Failed to get samplerate\n");
return;
if (ret != SR_OK) {
qDebug("Failed to get samplerate\n");
return;
@@
-505,7
+505,7
@@
void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
}
// Set the sample limit
}
// Set the sample limit
- if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
+ if (sr_config_set(sdi,
NULL,
SR_CONF_LIMIT_SAMPLES,
g_variant_new_uint64(record_length)) != SR_OK) {
error_handler(tr("Failed to configure "
"time-based sample limit."));
g_variant_new_uint64(record_length)) != SR_OK) {
error_handler(tr("Failed to configure "
"time-based sample limit."));
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index b80d6f80f0df737811aeb6c24c2132b11b77d613..2fa2d3919af81048b6783ff91eb08bef9179007e 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-192,8
+192,8
@@
void SamplingBar::update_sample_rate_selector()
if (!sdi)
return;
if (!sdi)
return;
- if (sr_config_list(sdi->driver,
SR_CONF_SAMPLERATE
,
-
&gvar_dict, sdi
) != SR_OK)
+ if (sr_config_list(sdi->driver,
sdi, NULL
,
+
SR_CONF_SAMPLERATE, &gvar_dict
) != SR_OK)
return;
_sample_rate_list_action->setVisible(false);
return;
_sample_rate_list_action->setVisible(false);
@@
-247,8
+247,8
@@
void SamplingBar::update_sample_rate_selector_value()
assert(sdi);
assert(sdi);
- if (sr_config_get(sdi->driver,
SR_CONF_SAMPLERATE
,
-
&gvar, sdi
) != SR_OK) {
+ if (sr_config_get(sdi->driver,
sdi, NULL
,
+
SR_CONF_SAMPLERATE, &gvar
) != SR_OK) {
qDebug() <<
"WARNING: Failed to get value of sample rate";
return;
qDebug() <<
"WARNING: Failed to get value of sample rate";
return;
@@
-294,7
+294,7
@@
void SamplingBar::commit_sample_rate()
return;
// Set the samplerate
return;
// Set the samplerate
- if (sr_config_set(sdi, SR_CONF_SAMPLERATE,
+ if (sr_config_set(sdi,
NULL,
SR_CONF_SAMPLERATE,
g_variant_new_uint64(sample_rate)) != SR_OK) {
qDebug() << "Failed to configure samplerate.";
return;
g_variant_new_uint64(sample_rate)) != SR_OK) {
qDebug() << "Failed to configure samplerate.";
return;
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 31b8f0a2f03a5907656c910cbcd70cbc2be4a427..b1d0037adf949516d0ec5fcdef64c96eebe615e0 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-238,8
+238,8
@@
void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
// Add the trigger actions
const sr_dev_inst *const sdi = _session.get_device();
// Add the trigger actions
const sr_dev_inst *const sdi = _session.get_device();
- if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_TYPE,
- &gvar
, sdi
) == SR_OK)
+ if (sr_config_list(sdi->driver,
sdi, NULL,
SR_CONF_TRIGGER_TYPE,
+ &gvar) == SR_OK)
{
const char *const trig_types =
g_variant_get_string(gvar, NULL);
{
const char *const trig_types =
g_variant_get_string(gvar, NULL);