Consistently use 'cg' for channel group variables.

[libsigrok.git] / hardware / openbench-logic-sniffer / api.c

diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c
index a2d1f3a60bf3afb57fc12ff24c2adf02c7953929..76942437d9475d2a53b1df2c7ac05fe157ff8713 100644 (file)
--- a/hardware/openbench-logic-sniffer/api.c
+++ b/hardware/openbench-logic-sniffer/api.c
@@ -79,11 +79,6 @@ static const uint64_t samplerates[] = {
 SR_PRIV struct sr_dev_driver ols_driver_info;
 static struct sr_dev_driver *di = &ols_driver_info;
 
-static int dev_clear(void)
-{
-       return std_dev_clear(di, NULL);
-}
-
 static int init(struct sr_context *sr_ctx)
 {
        return std_init(sr_ctx, di, LOG_PREFIX);
@@ -214,15 +209,15 @@ static GSList *dev_list(void)
 
 static int cleanup(void)
 {
-       return dev_clear();
+       return std_dev_clear(di, NULL);
 }
 
 static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
-       (void)probe_group;
+       (void)cg;
 
        if (!sdi)
                return SR_ERR_ARG;
@@ -257,7 +252,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        uint16_t flag;
@@ -265,7 +260,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
        int ret;
        const char *stropt;
 
-       (void)probe_group;
+       (void)cg;
 
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
@@ -354,14 +349,14 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 }
 
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_probe_group *probe_group)
+               const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        GVariant *gvar, *grange[2];
        GVariantBuilder gvb;
        int num_channels, i;
 
-       (void)probe_group;
+       (void)cg;
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
@@ -537,11 +532,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
                return SR_ERR;
 
        /* Flag register. */
-       sr_dbg("Setting demux %s, noise_filter %s, extpat %s, intpat %s",
-                       devc->flag_reg & FLAG_DEMUX ? "on" : "off",
-                       devc->flag_reg & FLAG_FILTER ? "on": "off",
+       sr_dbg("Setting intpat %s, extpat %s, RLE %s, noise_filter %s, demux %s",
+                       devc->flag_reg & FLAG_INTERNAL_TEST_MODE ? "on": "off",
                        devc->flag_reg & FLAG_EXTERNAL_TEST_MODE ? "on": "off",
-                       devc->flag_reg & FLAG_INTERNAL_TEST_MODE ? "on": "off");
+                       devc->flag_reg & FLAG_RLE ? "on" : "off",
+                       devc->flag_reg & FLAG_FILTER ? "on": "off",
+                       devc->flag_reg & FLAG_DEMUX ? "on" : "off");
        /* 1 means "disable channel". */
        devc->flag_reg |= ~(changrp_mask << 2) & 0x3c;
        arg[0] = devc->flag_reg & 0xff;
@@ -557,6 +553,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
        /* Reset all operational states. */
        devc->rle_count = devc->num_transfers = 0;
        devc->num_samples = devc->num_bytes = 0;
+       devc->cnt_bytes = devc->cnt_samples = devc->cnt_samples_rle = 0;
        memset(devc->sample, 0, 4);
 
        /* Send header packet to the session bus. */
@@ -584,7 +581,7 @@ SR_PRIV struct sr_dev_driver ols_driver_info = {
        .cleanup = cleanup,
        .scan = scan,
        .dev_list = dev_list,
-       .dev_clear = dev_clear,
+       .dev_clear = NULL,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,