drivers: Use NUM_CHANNELS in favor of hardcoded values.

diff --git a/src/hardware/dreamsourcelab-dslogic/api.c b/src/hardware/dreamsourcelab-dslogic/api.c
index 25fa6fe40ea04ddbb9422e52ebb4d2568a7fb515..f7dd72565e608967a81465c59f7cd404ad7347af 100644 (file)
--- a/src/hardware/dreamsourcelab-dslogic/api.c
+++ b/src/hardware/dreamsourcelab-dslogic/api.c
@@ -233,7 +233,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                /* Logic channels, all in one channel group. */
                cg = g_malloc0(sizeof(struct sr_channel_group));
                cg->name = g_strdup("Logic");
-               for (j = 0; j < 16; j++) {
+               for (j = 0; j < NUM_CHANNELS; j++) {
                        sprintf(channel_name, "%d", j);
                        ch = sr_channel_new(sdi, j, SR_CHANNEL_LOGIC,
                                                TRUE, channel_name);

diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c
index 8d0d280d6ab2434e0f9ec49deeecc900715aa450..4e64808932e5af1d2e189ee14d1fa069cf58bf38 100644 (file)
--- a/src/hardware/hantek-6xxx/api.c
+++ b/src/hardware/hantek-6xxx/api.c
@@ -530,7 +530,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
                return;
        }
 
-       for (int ch = 0; ch < 2; ch++) {
+       for (int ch = 0; ch < NUM_CHANNELS; ch++) {
                if (!devc->ch_enabled[ch])
                        continue;
 

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index cdc4360e9a40b440099ae86e7ada37b46b63edcf..bc10f39e5e1668ccd76ff37ff8363e199e13cc9f 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -613,7 +613,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
        /* TODO: Check malloc return value. */
        analog.data = g_try_malloc(num_samples * sizeof(float));
 
-       for (int ch = 0; ch < 2; ch++) {
+       for (int ch = 0; ch < NUM_CHANNELS; ch++) {
                if (!devc->ch_enabled[ch])
                        continue;
 

diff --git a/src/hardware/hantek-dso/protocol.c b/src/hardware/hantek-dso/protocol.c
index b1a56ebdeb482f46091c5d68f1a44978b6206277..644ac0d24dc913a636be63943f24db67072ee26e 100644 (file)
--- a/src/hardware/hantek-dso/protocol.c
+++ b/src/hardware/hantek-dso/protocol.c
@@ -27,8 +27,6 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
-#define NUM_CHANNELS 2
-
 static int send_begin(const struct sr_dev_inst *sdi)
 {
        struct sr_usb_dev_inst *usb;

diff --git a/src/hardware/hantek-dso/protocol.h b/src/hardware/hantek-dso/protocol.h
index 9cab61b351d533b0f2c1031d73a2fabad65bd553..20aaebdce89a40595d20c5eec744e893f8ffd782 100644 (file)
--- a/src/hardware/hantek-dso/protocol.h
+++ b/src/hardware/hantek-dso/protocol.h
@@ -51,6 +51,8 @@
 /* All models have this for their "fast" mode. */
 #define FRAMESIZE_SMALL         (10 * 1024)
 
+#define NUM_CHANNELS           2
+
 enum control_requests {
        CTRL_READ_EEPROM = 0xa2,
        CTRL_GETSPEED = 0xb2,

diff --git a/src/hardware/lecroy-logicstudio/api.c b/src/hardware/lecroy-logicstudio/api.c
index 3d16f3a2dd4dbf6f8328bddd3fcdaa37e62a403d..6dd0bd0179fa7f8354567f24eb537f240fec60e9 100644 (file)
--- a/src/hardware/lecroy-logicstudio/api.c
+++ b/src/hardware/lecroy-logicstudio/api.c
@@ -35,6 +35,8 @@
 #define UNKNOWN_ADDRESS 0xff
 #define MAX_RENUM_DELAY_MS 3000
 
+#define NUM_CHANNELS 16
+
 static const uint32_t drvopts[] = {
        SR_CONF_LOGIC_ANALYZER,
 };
@@ -89,7 +91,7 @@ static struct sr_dev_inst *create_device(struct sr_usb_dev_inst *usb,
        sdi->inst_type = SR_INST_USB;
        sdi->conn = usb;
 
-       for (i = 0; i < 16; i++) {
+       for (i = 0; i < NUM_CHANNELS; i++) {
                snprintf(channel_name, sizeof(channel_name), "D%i", i);
                sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name);
        }