Channel names consistency fixes and simplifications.

[libsigrok.git] / src / hardware / uni-t-ut32x / api.c

diff --git a/src/hardware/uni-t-ut32x/api.c b/src/hardware/uni-t-ut32x/api.c
index 3b33df9a6035dc14eac311b6f0867c7a9d9dcc20..4d963afb0c0cf8ff274283df557f410c51b798f9 100644 (file)
--- a/src/hardware/uni-t-ut32x/api.c
+++ b/src/hardware/uni-t-ut32x/api.c
@@ -28,10 +28,8 @@ static const uint32_t devopts[] = {
        SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
-static char *channels[] = {
-       "T1",
-       "T2",
-       "T1-T2",
+static const char *channel_names[] = {
+       "T1", "T2", "T1-T2",
 };
 
 static const char *data_sources[] = {
@@ -84,7 +82,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                        sdi->inst_type = SR_INST_USB;
                        sdi->conn = l->data;
                        for (i = 0; i < 3; i++)
-                               sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channels[i]);
+                               sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE,
+                                               channel_names[i]);
                        devc = g_malloc0(sizeof(struct dev_context));
                        sdi->priv = devc;
                        devc->limit_samples = 0;
@@ -217,7 +216,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 {
        struct sr_dev_driver *di = sdi->driver;
        struct dev_context *devc;
-       int ret;
        const char *tmp_str;
 
        (void)cg;
@@ -231,12 +229,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        }
 
        devc = sdi->priv;
-       ret = SR_OK;
+
        switch (key) {
        case SR_CONF_LIMIT_SAMPLES:
                devc->limit_samples = g_variant_get_uint64(data);
-               sr_dbg("Setting sample limit to %" PRIu64 ".",
-                      devc->limit_samples);
                break;
        case SR_CONF_DATA_SOURCE:
                tmp_str = g_variant_get_string(data, NULL);
@@ -248,16 +244,15 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                        return SR_ERR;
                break;
        default:
-               ret = SR_ERR_NA;
+               return SR_ERR_NA;
        }
 
-       return ret;
+       return SR_OK;
 }
 
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
-
        (void)sdi;
        (void)cg;