runtc, pdtest: Fixup minor style nits

[sigrok-test.git] / decoder / runtc.c

diff --git a/decoder/runtc.c b/decoder/runtc.c
index a3ea67258bedaa1ae9df844c2007f0d375a588b4..bbeb40ef04ecc3929ce86707b73685f2c4eb5d02 100644 (file)
--- a/decoder/runtc.c
+++ b/decoder/runtc.c
@@ -279,12 +279,12 @@ static void srd_cb_ann(struct srd_proto_data *pdata, void *cb_data)
 static void sr_cb(const struct sr_dev_inst *sdi,
                const struct sr_datafeed_packet *packet, void *cb_data)
 {
+       static int samplecnt = 0;
        const struct sr_datafeed_logic *logic;
        struct srd_session *sess;
        GVariant *gvar;
        uint64_t samplerate;
        int num_samples;
-       static int samplecnt = 0;
        struct sr_dev_driver *driver;
 
        sess = cb_data;
@@ -317,8 +317,8 @@ static void sr_cb(const struct sr_dev_inst *sdi,
                DBG("Received SR_DF_LOGIC (%"PRIu64" bytes, unitsize = %d).",
                        logic->length, logic->unitsize);
                srd_session_send(sess, samplecnt, samplecnt + num_samples,
-                               logic->data, logic->length);
-               samplecnt += logic->length / logic->unitsize;
+                               logic->data, logic->length, logic->unitsize);
+               samplecnt += num_samples;
                break;
        case SR_DF_END:
                DBG("Received SR_DF_END");
@@ -345,14 +345,11 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op)
        struct sr_session *sr_sess;
        gboolean is_number;
        const char *s;
-       struct sr_dev_inst *sdi;
-       uint64_t unitsize;
-       struct sr_dev_driver *driver;
 
        if (op->outfile) {
                if ((op->outfd = open(op->outfile, O_CREAT|O_WRONLY, 0600)) == -1) {
                        ERR("Unable to open %s for writing: %s", op->outfile,
-                                       strerror(errno));
+                                       g_strerror(errno));
                        return FALSE;
                }
        }
@@ -361,11 +358,6 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op)
                return FALSE;
 
        sr_session_dev_list(sr_sess, &devices);
-       sdi = devices->data;
-       driver = sr_dev_inst_driver_get(sdi);
-       sr_config_get(driver, sdi, NULL, SR_CONF_CAPTURE_UNITSIZE, &gvar);
-       unitsize = g_variant_get_uint64(gvar);
-       g_variant_unref(gvar);
 
        if (srd_session_new(&sess) != SRD_OK)
                return FALSE;
@@ -432,7 +424,7 @@ static int run_testcase(const char *infile, GSList *pdlist, struct output *op)
                                g_hash_table_insert(channels, channel->name, gvar);
                        }
 
-                       if (srd_inst_channel_set_all(di, channels, unitsize) != SRD_OK)
+                       if (srd_inst_channel_set_all(di, channels) != SRD_OK)
                                return FALSE;
                        g_hash_table_destroy(channels);
                }