serial-dmm: sort the list of device drivers (part 6, fs9922)

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

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index 73dd66ea48e9ef236f1a96eca6c5edcfe8ef3a36..1f19c7d09fcf35fa856a3f18b3289d185d8f7cb5 100644 (file)
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -296,13 +296,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_fs9721_packet_valid, sr_fs9721_parse,
                sr_fs9721_10_temp_c
        ),
-       DMM(
-               "tekpower-tp4000ZC", fs9721,
-               "TekPower", "TP4000ZC", "2400/8n1/dtr=1", 2400,
-               FS9721_PACKET_SIZE, 0, 0, NULL,
-               sr_fs9721_packet_valid, sr_fs9721_parse,
-               sr_fs9721_10_temp_c
-       ),
        DMM(
                "mastech-ms8250b", fs9721,
                "MASTECH", "MS8250B", "2400/8n1/rts=0/dtr=1",
@@ -311,22 +304,15 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                NULL
        ),
        DMM(
-               "va-va18b", fs9721,
-               "V&A", "VA18B", "2400/8n1", 2400,
-               FS9721_PACKET_SIZE, 0, 0, NULL,
-               sr_fs9721_packet_valid, sr_fs9721_parse,
-               sr_fs9721_01_temp_c
-       ),
-       DMM(
-               "va-va40b", fs9721,
-               "V&A", "VA40B", "2400/8n1", 2400,
+               "pce-pce-dm32", fs9721,
+               "PCE", "PCE-DM32", "2400/8n1", 2400,
                FS9721_PACKET_SIZE, 0, 0, NULL,
                sr_fs9721_packet_valid, sr_fs9721_parse,
-               sr_fs9721_max_c_min
+               sr_fs9721_01_10_temp_f_c
        ),
        DMM(
-               "pce-pce-dm32", fs9721,
-               "PCE", "PCE-DM32", "2400/8n1", 2400,
+               "peaktech-3330", fs9721,
+               "Peaktech", "3330", "2400/8n1/dtr=1", 2400,
                FS9721_PACKET_SIZE, 0, 0, NULL,
                sr_fs9721_packet_valid, sr_fs9721_parse,
                sr_fs9721_01_10_temp_f_c
@@ -339,15 +325,15 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_fs9721_00_temp_c
        ),
        DMM(
-               "voltcraft-vc820-ser", fs9721,
-               "Voltcraft", "VC-820 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
-               2400, FS9721_PACKET_SIZE, 0, 0, NULL,
+               "tekpower-tp4000ZC", fs9721,
+               "TekPower", "TP4000ZC", "2400/8n1/dtr=1", 2400,
+               FS9721_PACKET_SIZE, 0, 0, NULL,
                sr_fs9721_packet_valid, sr_fs9721_parse,
-               NULL
+               sr_fs9721_10_temp_c
        ),
        DMM(
-               "voltcraft-vc840-ser", fs9721,
-               "Voltcraft", "VC-840 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               "tenma-72-7745-ser", fs9721,
+               "Tenma", "72-7745 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
                2400, FS9721_PACKET_SIZE, 0, 0, NULL,
                sr_fs9721_packet_valid, sr_fs9721_parse,
                sr_fs9721_00_temp_c
@@ -367,18 +353,64 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_fs9721_00_temp_c
        ),
        DMM(
-               "tenma-72-7745-ser", fs9721,
-               "Tenma", "72-7745 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
-               2400, FS9721_PACKET_SIZE, 0, 0, NULL,
+               "va-va18b", fs9721,
+               "V&A", "VA18B", "2400/8n1", 2400,
+               FS9721_PACKET_SIZE, 0, 0, NULL,
                sr_fs9721_packet_valid, sr_fs9721_parse,
-               sr_fs9721_00_temp_c
+               sr_fs9721_01_temp_c
        ),
        DMM(
-               "peaktech-3330", fs9721,
-               "Peaktech", "3330", "2400/8n1/dtr=1", 2400,
+               "va-va40b", fs9721,
+               "V&A", "VA40B", "2400/8n1", 2400,
                FS9721_PACKET_SIZE, 0, 0, NULL,
                sr_fs9721_packet_valid, sr_fs9721_parse,
-               sr_fs9721_01_10_temp_f_c
+               sr_fs9721_max_c_min
+       ),
+       DMM(
+               "voltcraft-vc820-ser", fs9721,
+               "Voltcraft", "VC-820 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               2400, FS9721_PACKET_SIZE, 0, 0, NULL,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               NULL
+       ),
+       DMM(
+               "voltcraft-vc840-ser", fs9721,
+               "Voltcraft", "VC-840 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               2400, FS9721_PACKET_SIZE, 0, 0, NULL,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               sr_fs9721_00_temp_c
+       ),
+       /* }}} */
+       /* fs9922 based meters {{{ */
+       DMM(
+               "uni-t-ut61b-ser", fs9922,
+               "UNI-T", "UT61B (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
+               sr_fs9922_packet_valid, sr_fs9922_parse, NULL
+       ),
+       DMM(
+               "uni-t-ut61c-ser", fs9922,
+               "UNI-T", "UT61C (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
+               sr_fs9922_packet_valid, sr_fs9922_parse, NULL
+       ),
+       DMM(
+               "uni-t-ut61d-ser", fs9922,
+               "UNI-T", "UT61D (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
+               sr_fs9922_packet_valid, sr_fs9922_parse, NULL
+       ),
+       DMM(
+               /*
+                * 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-vc830-ser", fs9922,
+               "Voltcraft", "VC-830 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
+               sr_fs9922_packet_valid, sr_fs9922_parse,
+               &sr_fs9922_z1_diode
        ),
        /* }}} */
        /* meters based on other chips (to get sorted) */
@@ -480,18 +512,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL
        ),
-       DMM(
-               /*
-                * 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-vc830-ser", fs9922,
-               "Voltcraft", "VC-830 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
-               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
-               sr_fs9922_packet_valid, sr_fs9922_parse,
-               &sr_fs9922_z1_diode
-       ),
        DMM(
                "voltcraft-vc870-ser", vc870,
                "Voltcraft", "VC-870 (UT-D02 cable)", "9600/8n1/rts=0/dtr=1",
@@ -516,24 +536,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                2400, UT71X_PACKET_SIZE, 0, 0, NULL,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
-       DMM(
-               "uni-t-ut61b-ser", fs9922,
-               "UNI-T", "UT61B (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
-               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
-               sr_fs9922_packet_valid, sr_fs9922_parse, NULL
-       ),
-       DMM(
-               "uni-t-ut61c-ser", fs9922,
-               "UNI-T", "UT61C (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
-               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
-               sr_fs9922_packet_valid, sr_fs9922_parse, NULL
-       ),
-       DMM(
-               "uni-t-ut61d-ser", fs9922,
-               "UNI-T", "UT61D (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
-               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
-               sr_fs9922_packet_valid, sr_fs9922_parse, NULL
-       ),
        DMM(
                "uni-t-ut71a-ser", ut71x,
                "UNI-T", "UT71A (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",