serial-dmm: sort the list of device drivers (part 12, vc870)

[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 19bc6431454ed1713d25a42c5a4034fae6aa110a..aaf0066c75b2d339a769f68305d11588751d139a 100644 (file)
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -381,7 +381,39 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_fs9721_00_temp_c
        ),
        /* }}} */
-       /* meters based on other chips (to get sorted) */
+       /* 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
+       ),
+       /* }}} */
+       /* metex14 based meters {{{ */
        DMM(
                "bbcgm-2010", metex14,
                "BBC Goertz Metrawatt", "M2110", "1200/7n2", 1200,
@@ -390,36 +422,36 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                NULL
        ),
        DMM(
-               "metex-me31", metex14,
-               "Metex", "ME-31", "600/7n2/rts=0/dtr=1", 600,
+               "mastech-mas345", metex14,
+               "MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600,
                METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL
        ),
        DMM(
-               "peaktech-3410", metex14,
-               "Peaktech", "3410", "600/7n2/rts=0/dtr=1", 600,
+               "metex-m3640d", metex14,
+               "Metex", "M-3640D", "1200/7n2/rts=0/dtr=1", 1200,
                METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL
        ),
        DMM(
-               "mastech-mas345", metex14,
-               "MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600,
+               "metex-m4650cr", metex14,
+               "Metex", "M-4650CR", "1200/7n2/rts=0/dtr=1", 1200,
                METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL
        ),
        DMM(
-               "metex-m3640d", metex14,
-               "Metex", "M-3640D", "1200/7n2/rts=0/dtr=1", 1200,
+               "metex-me31", metex14,
+               "Metex", "ME-31", "600/7n2/rts=0/dtr=1", 600,
                METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL
        ),
        DMM(
-               "metex-m4650cr", metex14,
-               "Metex", "M-4650CR", "1200/7n2/rts=0/dtr=1", 1200,
+               "peaktech-3410", metex14,
+               "Peaktech", "3410", "600/7n2/rts=0/dtr=1", 600,
                METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL
@@ -445,13 +477,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL
        ),
-       DMM(
-               "radioshack-22-812", rs9lcd,
-               "RadioShack", "22-812", "4800/8n1/rts=0/dtr=1", 4800,
-               RS9LCD_PACKET_SIZE, 0, 0, NULL,
-               sr_rs9lcd_packet_valid, sr_rs9lcd_parse,
-               NULL
-       ),
        DMM(
                "voltcraft-m3650cr", metex14,
                "Voltcraft", "M-3650CR", "1200/7n2/rts=0/dtr=1", 1200,
@@ -480,60 +505,35 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL
        ),
+       /* }}} */
+       /* rs9lcd based meters {{{ */
        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",
-               9600, VC870_PACKET_SIZE, 0, 0, NULL,
-               sr_vc870_packet_valid, sr_vc870_parse, NULL
+               "radioshack-22-812", rs9lcd,
+               "RadioShack", "22-812", "4800/8n1/rts=0/dtr=1", 4800,
+               RS9LCD_PACKET_SIZE, 0, 0, NULL,
+               sr_rs9lcd_packet_valid, sr_rs9lcd_parse,
+               NULL
        ),
+       /* }}} */
+       /* ut71x based meters {{{ */
        DMM(
-               "voltcraft-vc920-ser", ut71x,
-               "Voltcraft", "VC-920 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",
+               "tenma-72-7730-ser", ut71x,
+               "Tenma", "72-7730 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",
                2400, UT71X_PACKET_SIZE, 0, 0, NULL,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
        DMM(
-               "voltcraft-vc940-ser", ut71x,
-               "Voltcraft", "VC-940 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",
+               "tenma-72-7732-ser", ut71x,
+               "Tenma", "72-7732 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",
                2400, UT71X_PACKET_SIZE, 0, 0, NULL,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
        DMM(
-               "voltcraft-vc960-ser", ut71x, 
-               "Voltcraft", "VC-960 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",
+               "tenma-72-9380a-ser", ut71x,
+               "Tenma", "72-9380A (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",
                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",
@@ -565,21 +565,33 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
        DMM(
-               "tenma-72-7730-ser", ut71x,
-               "Tenma", "72-7730 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",
+               "voltcraft-vc920-ser", ut71x,
+               "Voltcraft", "VC-920 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",
                2400, UT71X_PACKET_SIZE, 0, 0, NULL,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
        DMM(
-               "tenma-72-7732-ser", ut71x,
-               "Tenma", "72-7732 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",
+               "voltcraft-vc940-ser", ut71x,
+               "Voltcraft", "VC-940 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",
                2400, UT71X_PACKET_SIZE, 0, 0, NULL,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
        DMM(
-               "tenma-72-9380a-ser", ut71x,
-               "Tenma", "72-9380A (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",
+               "voltcraft-vc960-ser", ut71x,
+               "Voltcraft", "VC-960 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",
                2400, UT71X_PACKET_SIZE, 0, 0, NULL,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
+       /* }}} */
+       /* vc870 based meters {{{ */
+       DMM(
+               "voltcraft-vc870-ser", vc870,
+               "Voltcraft", "VC-870 (UT-D02 cable)", "9600/8n1/rts=0/dtr=1",
+               9600, VC870_PACKET_SIZE, 0, 0, NULL,
+               sr_vc870_packet_valid, sr_vc870_parse, NULL
+       ),
+       /* }}} */
+       /*
+        * The list is sorted. Add new items in the respective chip's group.
+        */
 );