ftdi-la: order the channels properly

[libsigrok.git] / src / hardware / ftdi-la / api.c

diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c
index a4309774c9e8c342a8c5ca83e71786b3b09a084e..d9936e7086b1954e8fc88fa2b1973181f7b4efd6 100644 (file)
--- a/src/hardware/ftdi-la/api.c
+++ b/src/hardware/ftdi-la/api.c
@@ -162,7 +162,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                sdi->priv = devc;
 
                for (char *const *chan = &(desc->channel_names[0]); *chan; chan++)
-                       sr_channel_new(sdi, &(desc->channel_names[0]) - chan,
+                       sr_channel_new(sdi, chan - &(desc->channel_names[0]),
                                        SR_CHANNEL_LOGIC, TRUE, *chan);
 
                devices = g_slist_append(devices, sdi);
@@ -298,20 +298,6 @@ static int config_get(uint32_t key, GVariant **data,
        return ret;
 }
 
-static int ftdi_la_set_samplerate(struct dev_context *devc)
-{
-       int ret;
-
-       ret = ftdi_set_baudrate(devc->ftdic,
-                       devc->cur_samplerate / devc->desc->samplerate_div);
-       if (ret < 0) {
-               sr_err("Failed to set baudrate (%d): %s.", devc->cur_samplerate,
-                      ftdi_get_error_string(devc->ftdic));
-               return SR_ERR;
-       }
-       return SR_OK;
-}
-
 static int config_set(uint32_t key, GVariant *data,
        const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {