summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2014-07-20 13:16:30 +0200
committerUwe Hermann <uwe@hermann-uwe.de>2014-07-20 13:16:30 +0200
commit7149b578a48e90a8b34d70174f8c3ce51de1e282 (patch)
treee7773ac36054e0f7b23f726fe30f74ea9e837470 /tests
parent3a1501e9e07a93a9b157fcce53aa070c5a0bf3d8 (diff)
downloadlibsigrokdecode-7149b578a48e90a8b34d70174f8c3ce51de1e282.tar.gz
libsigrokdecode-7149b578a48e90a8b34d70174f8c3ce51de1e282.zip
runtc: Update to the new libsigrok session API.
(also fixes the build for libsigrokdecode)
Diffstat (limited to 'tests')
-rw-r--r--tests/runtc.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/runtc.c b/tests/runtc.c
index 096ff16..11ae560 100644
--- a/tests/runtc.c
+++ b/tests/runtc.c
@@ -338,6 +338,7 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op)
int idx;
int max_channel;
char **decoder_class;
+ struct sr_session *sr_sess;
if (op->outfile) {
if ((op->outfd = open(op->outfile, O_CREAT|O_WRONLY, 0600)) == -1) {
@@ -347,12 +348,12 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op)
}
}
- if (sr_session_load(infile) != SR_OK)
+ if (sr_session_load(infile, &sr_sess) != SR_OK)
return FALSE;
if (srd_session_new(&sess) != SRD_OK)
return FALSE;
- sr_session_datafeed_callback_add(sr_cb, sess);
+ sr_session_datafeed_callback_add(sr_sess, sr_cb, sess);
switch (op->type) {
case SRD_OUTPUT_ANN:
cb = srd_cb_ann;
@@ -444,9 +445,9 @@ static int run_testcase(char *infile, GSList *pdlist, struct output *op)
DBG("Class %s index is %d", op->class, op->class_idx);
}
- sr_session_start();
- sr_session_run();
- sr_session_stop();
+ sr_session_start(sr_sess);
+ sr_session_run(sr_sess);
+ sr_session_stop(sr_sess);
srd_session_destroy(sess);