rdtech-um: alpha-sort and group include directives

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

diff --git a/src/hardware/rdtech-um/api.c b/src/hardware/rdtech-um/api.c
index fbc38b1aadcbd1570608a7456bcb8d1fdce61367..31c77071301f16115bb564a598d5b53a7023705d 100644 (file)
--- a/src/hardware/rdtech-um/api.c
+++ b/src/hardware/rdtech-um/api.c
@@ -17,17 +17,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <config.h>
+
 #include <glib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
+#include <libsigrok/libsigrok.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
-#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
-
 #include "protocol.h"
 
 #define RDTECH_UM_SERIALCOMM "115200/8n1"
@@ -47,14 +46,16 @@ static const uint32_t devopts[] = {
        SR_CONF_LIMIT_MSEC | SR_CONF_SET,
 };
 
-static GSList *rdtech_um_scan(struct sr_dev_driver *di, const char *conn,
-                             const char *serialcomm)
+static GSList *rdtech_um_scan(struct sr_dev_driver *di,
+       const char *conn, const char *serialcomm)
 {
        struct sr_serial_dev_inst *serial;
        const struct rdtech_um_profile *p = NULL;
        GSList *devices = NULL;
        struct dev_context *devc = NULL;
        struct sr_dev_inst *sdi = NULL;
+       size_t ch_idx;
+       const char *name;
 
        serial = sr_serial_dev_inst_new(conn, serialcomm);
        if (serial_open(serial, SERIAL_RDWR) != SR_OK)
@@ -80,9 +81,8 @@ static GSList *rdtech_um_scan(struct sr_dev_driver *di, const char *conn,
        sdi->conn = serial;
        sdi->priv = devc;
 
-       for (int i = 0; p->channels[i].name; i++)
-               sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE,
-                              p->channels[i].name);
+       for (ch_idx = 0; (name = p->channels[ch_idx].name); ch_idx++)
+               sr_channel_new(sdi, ch_idx, SR_CHANNEL_ANALOG, TRUE, name);
 
        devices = g_slist_append(devices, sdi);
        serial_close(serial);
@@ -123,7 +123,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;
 
@@ -135,7 +135,7 @@ 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);
 }
@@ -149,7 +149,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        std_session_send_df_header(sdi);
 
        serial_source_add(sdi->session, serial, G_IO_IN, 50,
-                         rdtech_um_receive_data, (void *)sdi);
+               rdtech_um_receive_data, (void *)sdi);
 
        return rdtech_um_poll(sdi);
 }