drivers: Use NUM_CHANNELS in favor of hardcoded values.

[libsigrok.git] / src / hardware / lecroy-logicstudio / api.c

diff --git a/src/hardware/lecroy-logicstudio/api.c b/src/hardware/lecroy-logicstudio/api.c
index 2682f7bdb82407b24a53595f04865292c0b3132f..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);
        }
@@ -393,8 +395,6 @@ static int config_set(uint32_t key, GVariant *data,
                return lls_set_samplerate(sdi, g_variant_get_uint64(data));
        case SR_CONF_CAPTURE_RATIO:
                devc->capture_ratio = g_variant_get_uint64(data);
-               if (devc->capture_ratio > 100)
-                       return SR_ERR;
                break;
        default:
                return SR_ERR_NA;
@@ -410,10 +410,10 @@ static int config_list(uint32_t key, GVariant **data,
        case SR_CONF_DEVICE_OPTIONS:
                return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
        case SR_CONF_SAMPLERATE:
-               *data = std_gvar_samplerates(samplerates, ARRAY_SIZE(samplerates));
+               *data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates));
                break;
        case SR_CONF_TRIGGER_MATCH:
-               *data = std_gvar_array_i32(trigger_matches, ARRAY_SIZE(trigger_matches));
+               *data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
                break;
        default:
                return SR_ERR_NA;