]> sigrok.org Git - libsigrok.git/commitdiff
serial-dmm: sort the list of device drivers (part 5, sort fs9721)
authorGerhard Sittig <redacted>
Sat, 5 Nov 2016 16:23:34 +0000 (17:23 +0100)
committerUwe Hermann <redacted>
Sun, 6 Nov 2016 13:43:35 +0000 (14:43 +0100)
This commit sorts items in the 'fs9721' group. This is separated from
collecting the group to reduce the diff size and simplify verification.

src/hardware/serial-dmm/api.c

index 73dd66ea48e9ef236f1a96eca6c5edcfe8ef3a36..19bc6431454ed1713d25a42c5a4034fae6aa110a 100644 (file)
@@ -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,32 @@ 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
        ),
        /* }}} */
        /* meters based on other chips (to get sorted) */