Channel names consistency fixes and simplifications.

[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 98e253fee3e77593d7b6f44e447960d546f799c5..89718894e7fab93be6de47d585d735c03be649ad 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[] = {
@@ -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