scpi-dmm: alpha-sort the list of supported devices (vendor/model list)

Any order is as arbitrary as any other. The alphabetical order of vendor
and model names might be the most robust during maintenance: easiest to
remember, easiest to use when checking for presence, and easiest to add
to or resolve conflicts during merges. Vendor renames (HP to Agilent to
Keysight, et al) are ugly but can't be helped easily.

diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c
index a8b46d027ebb31147d38fcca88cec4b69ceabd81..69f6fa2aef33debbaabddc3ed6d9dc6954b0c876 100644 (file)
--- a/src/hardware/scpi-dmm/api.c
+++ b/src/hardware/scpi-dmm/api.c
@@ -175,21 +175,6 @@ SR_PRIV const struct scpi_dmm_model models[] = {
                ARRAY_AND_SIZE(devopts_generic),
                0,
        },
-       {
-               "Keysight", "34465A",
-               1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a),
-               scpi_dmm_get_meas_agilent,
-               ARRAY_AND_SIZE(devopts_generic),
-               0,
-       },
-       {
-               "HP", "34401A",
-               1, 6, cmdset_hp, ARRAY_AND_SIZE(mqopts_agilent_34401a),
-               scpi_dmm_get_meas_agilent,
-               ARRAY_AND_SIZE(devopts_generic),
-               /* 34401A: typ. 1020ms for AC readings (default is 1000ms). */
-               1000 * 1500,
-       },
        {
                "GW", "GDM8251A",
                1, 6, cmdset_gwinstek, ARRAY_AND_SIZE(mqopts_gwinstek_gdm8200a),
@@ -218,6 +203,21 @@ SR_PRIV const struct scpi_dmm_model models[] = {
                ARRAY_AND_SIZE(devopts_generic),
                0,
        },
+       {
+               "HP", "34401A",
+               1, 6, cmdset_hp, ARRAY_AND_SIZE(mqopts_agilent_34401a),
+               scpi_dmm_get_meas_agilent,
+               ARRAY_AND_SIZE(devopts_generic),
+               /* 34401A: typ. 1020ms for AC readings (default is 1000ms). */
+               1000 * 1500,
+       },
+       {
+               "Keysight", "34465A",
+               1, 5, cmdset_agilent, ARRAY_AND_SIZE(mqopts_agilent_34405a),
+               scpi_dmm_get_meas_agilent,
+               ARRAY_AND_SIZE(devopts_generic),
+               0,
+       },
 };
 
 static const struct scpi_dmm_model *is_compatible(const char *vendor, const char *model)