rdtech-tc: move assignments out of declarations

[libsigrok.git] / src / hardware / rdtech-tc / api.c

diff --git a/src/hardware/rdtech-tc/api.c b/src/hardware/rdtech-tc/api.c
index eacd17d3bb104f0af15992b86850b8322dbf192b..2bb2cab520a5be39e3f7338878d34103016fb6fc 100644 (file)
--- a/src/hardware/rdtech-tc/api.c
+++ b/src/hardware/rdtech-tc/api.c
@@ -18,12 +18,14 @@
  */
 
 #include <config.h>
+
+#include <fcntl.h>
 #include <glib.h>
+#include <libsigrok/libsigrok.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <libsigrok/libsigrok.h>
+
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -44,13 +46,14 @@ static const uint32_t devopts[] = {
        SR_CONF_LIMIT_MSEC | SR_CONF_SET,
 };
 
-static GSList *rdtech_tc_scan(struct sr_dev_driver *di, const char *conn,
-                             const char *serialcomm)
+static GSList *rdtech_tc_scan(struct sr_dev_driver *di,
+       const char *conn, const char *serialcomm)
 {
        struct sr_serial_dev_inst *serial;
-       GSList *devices = NULL;
-       struct dev_context *devc = NULL;
-       struct sr_dev_inst *sdi = NULL;
+       GSList *devices;
+       struct dev_context *devc;
+       struct sr_dev_inst *sdi;
+       size_t i;
 
        serial = sr_serial_dev_inst_new(conn, serialcomm);
        if (serial_open(serial, SERIAL_RDWR) != SR_OK)
@@ -74,10 +77,12 @@ static GSList *rdtech_tc_scan(struct sr_dev_driver *di, const char *conn,
        sdi->conn = serial;
        sdi->priv = devc;
 
-       for (int i = 0; devc->channels[i].name; i++)
-               sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, devc->channels[i].name);
+       for (i = 0; devc->channels[i].name; i++) {
+               sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE,
+                       devc->channels[i].name);
+       }
 
-       devices = g_slist_append(devices, sdi);
+       devices = g_slist_append(NULL, sdi);
        serial_close(serial);
        if (!devices)
                sr_serial_dev_inst_free(serial);
@@ -96,9 +101,11 @@ err_out:
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct sr_config *src;
-       const char *conn = NULL;
-       const char *serialcomm = RDTECH_TC_SERIALCOMM;
+       const char *conn;
+       const char *serialcomm;
 
+       conn = NULL;
+       serialcomm = RDTECH_TC_SERIALCOMM;
        for (GSList *l = options; l; l = l->next) {
                src = l->data;
                switch (src->key) {
@@ -117,7 +124,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 }
 
 static int config_set(uint32_t key, GVariant *data,
-                     const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
@@ -129,21 +136,23 @@ static int config_set(uint32_t key, GVariant *data,
 }
 
 static int config_list(uint32_t key, GVariant **data,
-                      const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
-       struct dev_context *devc = sdi->priv;
-       struct sr_serial_dev_inst *serial = sdi->conn;
+       struct dev_context *devc;
+       struct sr_serial_dev_inst *serial;
 
+       devc = sdi->priv;
        sr_sw_limits_acquisition_start(&devc->limits);
        std_session_send_df_header(sdi);
 
+       serial = sdi->conn;
        serial_source_add(sdi->session, serial, G_IO_IN, 50,
-                         rdtech_tc_receive_data, (void *)sdi);
+               rdtech_tc_receive_data, (void *)sdi);
 
        return rdtech_tc_poll(sdi);
 }