drivers: Always use same scanopts/drvopts/devopts/devopts_cg* order.

diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index d9913adbc619244c8381eedbc83ec011387ae00e..d02ef3ef587fa9a4039a7e940e852972f6ca9886 100644 (file)
--- a/src/hardware/chronovu-la/api.c
+++ b/src/hardware/chronovu-la/api.c
@@ -20,14 +20,14 @@
 #include <config.h>
 #include "protocol.h"
 
-static const uint32_t drvopts[] = {
-       SR_CONF_LOGIC_ANALYZER,
-};
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 };
 
+static const uint32_t drvopts[] = {
+       SR_CONF_LOGIC_ANALYZER,
+};
+
 static const uint32_t devopts[] = {
        SR_CONF_LIMIT_MSEC | SR_CONF_SET,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_SET | SR_CONF_LIST,

diff --git a/src/hardware/demo/api.c b/src/hardware/demo/api.c
index 55e342d81d01063c4f5e93b104229d491fed4097..ed3d0c352398f359e30e8e36180c5cd0a74820ee 100644 (file)
--- a/src/hardware/demo/api.c
+++ b/src/hardware/demo/api.c
@@ -46,17 +46,17 @@ static const char *logic_pattern_str[] = {
        "squid",
 };
 
+static const uint32_t scanopts[] = {
+       SR_CONF_NUM_LOGIC_CHANNELS,
+       SR_CONF_NUM_ANALOG_CHANNELS,
+};
+
 static const uint32_t drvopts[] = {
        SR_CONF_DEMO_DEV,
        SR_CONF_LOGIC_ANALYZER,
        SR_CONF_OSCILLOSCOPE,
 };
 
-static const uint32_t scanopts[] = {
-       SR_CONF_NUM_LOGIC_CHANNELS,
-       SR_CONF_NUM_ANALOG_CHANNELS,
-};
-
 static const uint32_t devopts[] = {
        SR_CONF_CONTINUOUS,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,

diff --git a/src/hardware/dreamsourcelab-dslogic/api.c b/src/hardware/dreamsourcelab-dslogic/api.c
index d37768e4ea50698388ad5f3a826b17ef1bc77fda..08dded0140364826bd61bf73d45b4affc8c06ab9 100644 (file)
--- a/src/hardware/dreamsourcelab-dslogic/api.c
+++ b/src/hardware/dreamsourcelab-dslogic/api.c
@@ -47,14 +47,14 @@ static const struct dslogic_profile supported_device[] = {
        ALL_ZERO
 };
 
-static const uint32_t drvopts[] = {
-       SR_CONF_LOGIC_ANALYZER,
-};
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 };
 
+static const uint32_t drvopts[] = {
+       SR_CONF_LOGIC_ANALYZER,
+};
+
 static const uint32_t devopts[] = {
        SR_CONF_CONTINUOUS | SR_CONF_SET | SR_CONF_GET,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index cc1a7c499ededf8d5073f47470b4dfb3024e324b..b9d43428799cdf35cfac164c5bc6cc9efdd188b7 100644 (file)
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -96,14 +96,14 @@ static const struct fx2lafw_profile supported_fx2[] = {
        ALL_ZERO
 };
 
-static const uint32_t drvopts[] = {
-       SR_CONF_LOGIC_ANALYZER,
-};
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 };
 
+static const uint32_t drvopts[] = {
+       SR_CONF_LOGIC_ANALYZER,
+};
+
 static const uint32_t devopts[] = {
        SR_CONF_CONTINUOUS,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index 22fcbc54b3c07472689c18bd61a3c16ed86870d4..5f192a842234d681aee4159a76a7fa2592f64c0e 100644 (file)
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -31,15 +31,15 @@ static const char *manufacturers[] = {
        "Rohde&Schwarz",
 };
 
-static const uint32_t drvopts[] = {
-       SR_CONF_OSCILLOSCOPE,
-};
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
        SR_CONF_SERIALCOMM,
 };
 
+static const uint32_t drvopts[] = {
+       SR_CONF_OSCILLOSCOPE,
+};
+
 enum {
        CG_INVALID = -1,
        CG_NONE,

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index a28bc1e234dd9214cfa9192851c72d7a3ff1c3bd..35c16bd10a81d5a8692dc0940ec87e073954777a 100644 (file)
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -20,16 +20,16 @@
 #include <config.h>
 #include "protocol.h"
 
-static const uint32_t drvopts[] = {
-       /* Device class */
-       SR_CONF_POWER_SUPPLY,
-};
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
        SR_CONF_SERIALCOMM,
 };
 
+static const uint32_t drvopts[] = {
+       /* Device class */
+       SR_CONF_POWER_SUPPLY,
+};
+
 static const uint32_t devopts[] = {
        /* Device class */
        SR_CONF_POWER_SUPPLY,

diff --git a/src/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c
index 8102ba9aaca3c2022d185f6a4085cace2212bdca..a2f1feca229152993322b4502f3cd71cccb09079 100644 (file)
--- a/src/hardware/manson-hcs-3xxx/api.c
+++ b/src/hardware/manson-hcs-3xxx/api.c
@@ -29,16 +29,16 @@
 #include <config.h>
 #include "protocol.h"
 
-static const uint32_t drvopts[] = {
-       /* Device class */
-       SR_CONF_POWER_SUPPLY,
-};
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
        SR_CONF_SERIALCOMM,
 };
 
+static const uint32_t drvopts[] = {
+       /* Device class */
+       SR_CONF_POWER_SUPPLY,
+};
+
 static const uint32_t devopts[] = {
        /* Device class */
        SR_CONF_POWER_SUPPLY,

diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index effa1b0bede4cc2c9424daf7dbe7f70b67aa3ebe..08bc16159820b0902921e84683812727ab54007c 100644 (file)
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -23,7 +23,7 @@
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
        SR_CONF_SERIALCOMM,
-       SR_CONF_MODBUSADDR
+       SR_CONF_MODBUSADDR,
 };
 
 static const uint32_t drvopts[] = {

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index 45677b42d967ca5fabb6a9be4b56595ca3405c43..a465c3295b27f0ae14ec6d648a4bd1c40db6cd56 100644 (file)
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -42,18 +42,18 @@ SR_PRIV int lps_query_status(struct sr_dev_inst *sdi);
 
 #define VENDOR_MOTECH "Motech"
 
-/** Driver capabilities generic. */
-static const uint32_t drvopts[] = {
-       /* Device class */
-       SR_CONF_POWER_SUPPLY,
-};
-
 /** Driver scanning options. */
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
        SR_CONF_SERIALCOMM,
 };
 
+/** Driver capabilities generic. */
+static const uint32_t drvopts[] = {
+       /* Device class */
+       SR_CONF_POWER_SUPPLY,
+};
+
 /** Hardware capabilities generic. */
 static const uint32_t devopts[] = {
        /* Device class */

diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c
index ec22fd4572d0e12e4996ba4db6bda00fd09ecf9e..a3fb54e8027641fc78e36e22c3e8f7ca78ac1505 100644 (file)
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -22,15 +22,15 @@
 
 #define SERIALCOMM "115200/8n1"
 
-static const uint32_t drvopts[] = {
-       SR_CONF_LOGIC_ANALYZER,
-};
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
        SR_CONF_SERIALCOMM,
 };
 
+static const uint32_t drvopts[] = {
+       SR_CONF_LOGIC_ANALYZER,
+};
+
 static const uint32_t devopts[] = {
        SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,

diff --git a/src/hardware/saleae-logic-pro/api.c b/src/hardware/saleae-logic-pro/api.c
index 9c257d2c6060d28f7664a04ed66b1988768ce128..269ca5e9e7ead7b5b870282db308c3aaa1ccc403 100644 (file)
--- a/src/hardware/saleae-logic-pro/api.c
+++ b/src/hardware/saleae-logic-pro/api.c
@@ -28,14 +28,14 @@
 
 SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info;
 
-static const uint32_t drvopts[] = {
-       SR_CONF_LOGIC_ANALYZER,
-};
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 };
 
+static const uint32_t drvopts[] = {
+       SR_CONF_LOGIC_ANALYZER,
+};
+
 static const uint32_t devopts[] = {
        SR_CONF_CONTINUOUS,
        SR_CONF_CONN | SR_CONF_GET,

diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c
index 5ed70c80faaa2476e6edd30847d725c4099ad5b4..d5d7e4a7d079b0386a13dd738d7f71fa52198f12 100644 (file)
--- a/src/hardware/victor-dmm/api.c
+++ b/src/hardware/victor-dmm/api.c
@@ -32,14 +32,14 @@
 #define VICTOR_INTERFACE 0
 #define VICTOR_ENDPOINT (LIBUSB_ENDPOINT_IN | 1)
 
-static const uint32_t drvopts[] = {
-       SR_CONF_MULTIMETER,
-};
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 };
 
+static const uint32_t drvopts[] = {
+       SR_CONF_MULTIMETER,
+};
+
 static const uint32_t devopts[] = {
        SR_CONF_CONTINUOUS,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,