serial: use timeout API in stream detect, obsoletes bitrate param

[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 c127000de6210457a14cd08adee4aa3de6dbb0a7..f237bb2ad6e328ca5321d29e27a3d1b33d0a07f6 100644 (file)
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -106,8 +106,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        /* Let's get a bit of data and see if we can find a packet. */
        len = sizeof(buf);
        ret = serial_stream_detect(serial, buf, &len, dmm->packet_size,
-                                  dmm->packet_valid, 3000,
-                                  dmm->baudrate);
+                                  dmm->packet_valid, 3000);
        if (ret != SR_OK)
                goto scan_cleanup;
 
@@ -136,6 +135,14 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        dmm->channel_count = 1;
        if (dmm->packet_parse == sr_metex14_4packets_parse)
                dmm->channel_count = 4;
+       if (dmm->packet_parse == sr_eev121gw_3displays_parse) {
+               dmm->channel_count = EEV121GW_DISPLAY_COUNT;
+               dmm->channel_formats = eev121gw_channel_formats;
+       }
+       if (dmm->packet_parse == sr_ms2115b_parse) {
+               dmm->channel_count = MS2115B_DISPLAY_COUNT;
+               dmm->channel_formats = ms2115b_channel_formats;
+       }
        for (ch_idx = 0; ch_idx < dmm->channel_count; ch_idx++) {
                size_t ch_num;
                const char *fmt;
@@ -257,6 +264,13 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_dtm0660_packet_valid, sr_dtm0660_parse, NULL
        ),
        /* }}} */
+       /* eev121gw based meters {{{ */
+       DMM(
+               "eevblog-121gw", eev121gw, "EEVblog", "121GW",
+               "115200/8n1", 115200, EEV121GW_PACKET_SIZE, 0, 0, NULL,
+               sr_eev121gw_packet_valid, sr_eev121gw_3displays_parse, NULL
+       ),
+       /* }}} */
        /* es519xx based meters {{{ */
        DMM(
                "iso-tech-idm103n", es519xx,
@@ -414,6 +428,12 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                2400, FS9922_PACKET_SIZE, 0, 0, NULL,
                sr_fs9922_packet_valid, sr_fs9922_parse, NULL
        ),
+       DMM(
+               "victor-dmm-ser", fs9922,
+               "Victor", "Victor DMMs (Mini-USB cable)", "2400/8n1",
+               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
@@ -436,6 +456,15 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                NULL
        ),
        /* }}} */
+       /* ms2115b based meters {{{ */
+       DMM(
+               "mastech-ms2115b", ms2115b,
+               "MASTECH", "MS2115B", "1200/8n1",
+               1200, MS2115B_PACKET_SIZE, 0, 0, NULL,
+               sr_ms2115b_packet_valid, sr_ms2115b_parse,
+               NULL
+       ),
+       /* }}} */
        /* ms8250d based meters {{{ */
        DMM(
                "mastech-ms8250d", ms8250d,