uni-t-dmm: sort supported devices, collect the fs9922 group

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index f3180e79a3a395d94868840b49f91595cd8e230b..4e592aba5b76006c2dd81da604d7e283b0cf8a37 100644 (file)
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -247,6 +247,41 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
                sr_fs9721_00_temp_c
        ),
        /* }}} */
                sr_fs9721_00_temp_c
        ),
        /* }}} */

+       /* {{{ fs9922 */
+       DMM(
+               "uni-t-ut61b", fs9922,
+               "UNI-T", "UT61B", 2400,
+               FS9922_PACKET_SIZE,
+               sr_fs9922_packet_valid, sr_fs9922_parse,
+               NULL
+       ),
+       DMM(
+               "uni-t-ut61c", fs9922,
+               "UNI-T", "UT61C", 2400,
+               FS9922_PACKET_SIZE,
+               sr_fs9922_packet_valid, sr_fs9922_parse,
+               NULL
+       ),
+       DMM(
+               "uni-t-ut61d", fs9922,
+               "UNI-T", "UT61D", 2400,
+               FS9922_PACKET_SIZE,
+               sr_fs9922_packet_valid, sr_fs9922_parse,
+               NULL
+       ),
+       DMM(
+               "voltcraft-vc830", fs9922,
+               /*
+                * Note: The VC830 doesn't set the 'volt' and 'diode' bits of
+                * the FS9922 protocol. Instead, it only sets the user-defined
+                * bit "z1" to indicate "diode mode" and "voltage".
+                */
+               "Voltcraft", "VC-830", 2400,
+               FS9922_PACKET_SIZE,
+               sr_fs9922_packet_valid, sr_fs9922_parse,
+               &sr_fs9922_z1_diode
+       ),
+       /* }}} */

        /* {{{ ut372 */
        DMM(
                "uni-t-ut372", ut372,
        /* {{{ ut372 */
        DMM(
                "uni-t-ut372", ut372,


@@ -321,39 +356,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
        /* }}} */
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
        /* }}} */

-       DMM(
-               "uni-t-ut61b", fs9922,
-               "UNI-T", "UT61B", 2400,
-               FS9922_PACKET_SIZE,
-               sr_fs9922_packet_valid, sr_fs9922_parse,
-               NULL
-       ),
-       DMM(
-               "uni-t-ut61c", fs9922,
-               "UNI-T", "UT61C", 2400,
-               FS9922_PACKET_SIZE,
-               sr_fs9922_packet_valid, sr_fs9922_parse,
-               NULL
-       ),
-       DMM(
-               "uni-t-ut61d", fs9922,
-               "UNI-T", "UT61D", 2400,
-               FS9922_PACKET_SIZE,
-               sr_fs9922_packet_valid, sr_fs9922_parse,
-               NULL
-       ),
-       DMM(
-               "voltcraft-vc830", fs9922,
-               /*
-                * Note: The VC830 doesn't set the 'volt' and 'diode' bits of
-                * the FS9922 protocol. Instead, it only sets the user-defined
-                * bit "z1" to indicate "diode mode" and "voltage".
-                */
-               "Voltcraft", "VC-830", 2400,
-               FS9922_PACKET_SIZE,
-               sr_fs9922_packet_valid, sr_fs9922_parse,
-               &sr_fs9922_z1_diode
-       ),

        DMM(
                "voltcraft-vc870", vc870,
                "Voltcraft", "VC-870", 9600, VC870_PACKET_SIZE,
        DMM(
                "voltcraft-vc870", vc870,
                "Voltcraft", "VC-870", 9600, VC870_PACKET_SIZE,