Minor cosmetics and consistency fixes.

[libsigrok.git] / src / hardware / link-mso19 / api.c

diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index 634d3f97859a962138a05faef7bb1bb17a104110..d75debb84420510dafdd0dda68e52941eff2e81f 100644 (file)
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -38,9 +38,9 @@ static const uint32_t devopts[] = {
  *
  * See also: http://www.linkinstruments.com/images/mso19_1113.gif
  */
-SR_PRIV const char *mso19_channel_names[] = {
+static const char *channel_names[] = {
        /* Note: DSO needs to be first. */
-       "DSO", "0", "1", "2", "3", "4", "5", "6", "7", NULL,
+       "DSO", "0", "1", "2", "3", "4", "5", "6", "7",
 };
 
 static const uint64_t samplerates[] = {
@@ -116,7 +116,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        }
        if (!conn)
                conn = SERIALCONN;
-       if (serialcomm == NULL)
+       if (!serialcomm)
                serialcomm = SERIALCOMM;
 
        udev = udev_new();
@@ -215,8 +215,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
                for (i = 0; i < NUM_CHANNELS; i++) {
                        chtype = (i == 0) ? SR_CHANNEL_ANALOG : SR_CHANNEL_LOGIC;
-                       sr_channel_new(sdi, i, chtype, TRUE,
-                                           mso19_channel_names[i]);
+                       sr_channel_new(sdi, i, chtype, TRUE, channel_names[i]);
                }
 
                //Add the driver
@@ -269,14 +268,14 @@ static int cleanup(const struct sr_dev_driver *di)
        return dev_clear();
 }
 
-static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
+static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
        (void)cg;
 
-       switch (id) {
+       switch (key) {
        case SR_CONF_SAMPLERATE:
                if (sdi) {
                        devc = sdi->priv;
@@ -291,7 +290,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
        return SR_OK;
 }
 
-static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
+static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
        int ret;
@@ -307,7 +306,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       switch (id) {
+       switch (key) {
        case SR_CONF_SAMPLERATE:
                // FIXME
                return mso_configure_rate(sdi, g_variant_get_uint64(data));
@@ -320,8 +319,6 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
                        ret = SR_ERR_ARG;
                } else {
                        devc->limit_samples = num_samples;
-                       sr_dbg("setting limit_samples to %i\n",
-                              num_samples);
                        ret = SR_OK;
                }
                break;