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

[libsigrok.git] / src / hardware / uni-t-dmm / api.c

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index 61936c779006c3347cc528d6c89a6a880cbf3c61..e9a4417255e3f3085a8ebc9fea7e81e8e15fd7b7 100644 (file)
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -109,8 +109,8 @@ static int dev_open(struct sr_dev_inst *sdi)
        return sr_usb_open(drvc->sr_ctx->libusb_ctx, usb);
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
@@ -121,8 +121,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        return sr_sw_limits_config_set(&devc->limits, key, data);
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 }
@@ -177,6 +177,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        }).di
 
 SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
+       /* {{{ fs9721 */
        DMM(
                "tecpel-dmm-8061", fs9721,
                "Tecpel", "DMM-8061", 2400,
@@ -184,13 +185,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
                sr_fs9721_packet_valid, sr_fs9721_parse,
                sr_fs9721_00_temp_c
        ),
-       DMM(
-               "uni-t-ut372", ut372,
-               "UNI-T", "UT372", 2400,
-               UT372_PACKET_SIZE,
-               sr_ut372_packet_valid, sr_ut372_parse,
-               NULL
-       ),
        DMM(
                "uni-t-ut60a", fs9721,
                "UNI-T", "UT60A", 2400,
@@ -205,6 +199,35 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
                sr_fs9721_packet_valid, sr_fs9721_parse,
                sr_fs9721_00_temp_c
        ),
+       DMM(
+               "voltcraft-vc820", fs9721,
+               "Voltcraft", "VC-820", 2400,
+               FS9721_PACKET_SIZE,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               NULL
+       ),
+       DMM(
+               "voltcraft-vc840", fs9721,
+               "Voltcraft", "VC-840", 2400,
+               FS9721_PACKET_SIZE,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               sr_fs9721_00_temp_c
+       ),
+       DMM(
+               "tenma-72-7745", fs9721,
+               "Tenma", "72-7745", 2400,
+               FS9721_PACKET_SIZE,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               sr_fs9721_00_temp_c
+       ),
+       /* }}} */
+       DMM(
+               "uni-t-ut372", ut372,
+               "UNI-T", "UT372", 2400,
+               UT372_PACKET_SIZE,
+               sr_ut372_packet_valid, sr_ut372_parse,
+               NULL
+       ),
        DMM(
                "uni-t-ut60g", es519xx,
                /* The baudrate is actually 19230, see "Note 1" below. */
@@ -268,11 +291,9 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
        DMM(
-               "voltcraft-vc820", fs9721,
-               "Voltcraft", "VC-820", 2400,
-               FS9721_PACKET_SIZE,
-               sr_fs9721_packet_valid, sr_fs9721_parse,
-               NULL
+               "uni-t-ut804", ut71x,
+               "UNI-T", "UT804", 2400, UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
        DMM(
                "voltcraft-vc830", fs9922,
@@ -286,13 +307,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
                sr_fs9922_packet_valid, sr_fs9922_parse,
                &sr_fs9922_z1_diode
        ),
-       DMM(
-               "voltcraft-vc840", fs9721,
-               "Voltcraft", "VC-840", 2400,
-               FS9721_PACKET_SIZE,
-               sr_fs9721_packet_valid, sr_fs9721_parse,
-               sr_fs9721_00_temp_c
-       ),
        DMM(
                "voltcraft-vc870", vc870,
                "Voltcraft", "VC-870", 9600, VC870_PACKET_SIZE,
@@ -331,13 +345,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
                UT71X_PACKET_SIZE,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
-       DMM(
-               "tenma-72-7745", fs9721,
-               "Tenma", "72-7745", 2400,
-               FS9721_PACKET_SIZE,
-               sr_fs9721_packet_valid, sr_fs9721_parse,
-               sr_fs9721_00_temp_c
-       ),
        DMM(
                "tenma-72-7750", es519xx,
                /* The baudrate is actually 19230, see "Note 1" below. */